From nobody@FreeBSD.org  Fri May 14 15:06:40 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D24B106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 15:06:40 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7282F8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 15:06:40 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4EF6e4Y008441
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 15:06:40 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o4EF6eej008440;
	Fri, 14 May 2010 15:06:40 GMT
	(envelope-from nobody)
Message-Id: <201005141506.o4EF6eej008440@www.freebsd.org>
Date: Fri, 14 May 2010 15:06:40 GMT
From: chris petrik <chris@officialunix.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] print/hplip3 options/configure fixups
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146584
>Category:       ports
>Synopsis:       [PATCH] print/hplip3 options/configure fixups
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 14 15:10:04 UTC 2010
>Closed-Date:    Sun May 16 09:15:04 UTC 2010
>Last-Modified:  Sun May 16 09:20:07 UTC 2010
>Originator:     chris petrik
>Release:        FreeBSD 8 AMD64
>Organization:
Officialunix
>Environment:
FreeBSD 8-STABLE 27th April AND64
>Description:

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: hplip3/Makefile
===================================================================
RCS file: /usr/local/freebsdcvs/ports/print/hplip3/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- hplip3/Makefile	14 May 2010 11:43:23 -0000	1.39
+++ hplip3/Makefile	14 May 2010 15:03:46 -0000
@@ -28,8 +28,6 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--disable-pp-build \
-		--disable-dbus-build \
-		--disable-fax-build \
 		--enable-foomatic-ppd-install \
 		--enable-foomatic-rip-hplip-install \
 		--enable-hpijs-install \
@@ -58,7 +56,7 @@
 OPTIONS=	GUI "build with Python QT" off \
 		DBUS "dbus support" off \
 		XSANE "build xsane scanner app" off \
-		NOSNMP "Build without snmp" on
+		NETBUILD "Build without network build (SNMP)" on
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800069
@@ -68,7 +66,7 @@
 .if !defined(WITHOUT_GUI)
 USE_QT_VER=	4
 QT_COMPONENTS=	gui
-CONFIGURE_ARGS+=--enable-qt4
+CONFIGURE_ARGS+=	--enable-qt4
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 LIB_DEPENDS+=	pyglib-2.0:${PORTSDIR}/devel/py-gobject
 .endif
@@ -77,10 +75,13 @@
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
+# fax added as, no dbus no fax
 CONFIGURE_ARGS+=	--enable-dbus-build \
 			--enable-fax-build
 PLIST_SUB+=	FAX=""
 .else
+CONFIGURE_ARGS+=	--disable-dbus-build \
+			--disable-fax-build
 PLIST_SUB+=	FAX="@comment "
 .endif
 
@@ -88,7 +89,7 @@
 RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
 .endif
 
-.if !defined(WITHOUT_NOSNMP)
+.if !defined(WITHOUT_NETBUILD)
 LIB_DEPENDS+=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
 CONFIGURE_ARGS+=	--enable-network-build
 .else


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sat May 15 16:40:55 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146584 

From: Max Brazhnikov <makc@freebsd.org>
To: bug-followup@freebsd.org, chris@officialunix.com
Cc:  
Subject: Re: ports/146584: [PATCH] print/hplip3 options/configure fixups
Date: Sat, 15 May 2010 21:34:31 +0400

 --Boundary-00=_ost7Lp6gDjNwK5v
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 Hi Chris,
 
 I suggest to rewrite options making them more clear.
 If you are agree I commit the patch.
 
 Max
 
 --Boundary-00=_ost7Lp6gDjNwK5v
 Content-Type: text/x-patch;
   charset="UTF-8";
   name="hplip3.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="hplip3.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/print/hplip3/Makefile,v
 retrieving revision 1.39
 diff -u -r1.39 Makefile
 --- Makefile	14 May 2010 11:43:23 -0000	1.39
 +++ Makefile	15 May 2010 17:27:46 -0000
 @@ -7,7 +7,7 @@
  
  PORTNAME=	hplip
  PORTVERSION=	3.10.2
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	print
  MASTER_SITES=	SF
  
 @@ -28,8 +28,6 @@
  GNU_CONFIGURE=	yes
  CONFIGURE_ARGS=	--disable-dependency-tracking \
  		--disable-pp-build \
 -		--disable-dbus-build \
 -		--disable-fax-build \
  		--enable-foomatic-ppd-install \
  		--enable-foomatic-rip-hplip-install \
  		--enable-hpijs-install \
 @@ -55,20 +53,21 @@
  
  CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
  
 -OPTIONS=	GUI "build with Python QT" off \
 -		DBUS "dbus support" off \
 -		XSANE "build xsane scanner app" off \
 -		NOSNMP "Build without snmp" on
 +OPTIONS=	QT "Build QT4 gui" off \
 +		DBUS "D-Bus support (required for fax tools)" off \
 +		XSANE "Scanning support via XSane" off \
 +		SNMP "Support for SNMP (broken on i386)" off
 +
  .include <bsd.port.options.mk>
  
  .if ${OSVERSION} < 800069
  LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
  .endif
  
 -.if !defined(WITHOUT_GUI)
 +.if !defined(WITHOUT_QT)
  USE_QT_VER=	4
  QT_COMPONENTS=	gui
 -CONFIGURE_ARGS+=--enable-qt4
 +CONFIGURE_ARGS+=	--enable-qt4
  RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
  LIB_DEPENDS+=	pyglib-2.0:${PORTSDIR}/devel/py-gobject
  .endif
 @@ -77,10 +76,13 @@
  RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus \
  		${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
  LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 +# fax added as, no dbus no fax
  CONFIGURE_ARGS+=	--enable-dbus-build \
  			--enable-fax-build
  PLIST_SUB+=	FAX=""
  .else
 +CONFIGURE_ARGS+=	--disable-dbus-build \
 +			--disable-fax-build
  PLIST_SUB+=	FAX="@comment "
  .endif
  
 @@ -88,7 +90,7 @@
  RUN_DEPENDS+=	xsane:${PORTSDIR}/graphics/xsane
  .endif
  
 -.if !defined(WITHOUT_NOSNMP)
 +.if defined(WITH_SNMP)
  LIB_DEPENDS+=	netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
  CONFIGURE_ARGS+=	--enable-network-build
  .else
 
 --Boundary-00=_ost7Lp6gDjNwK5v--

From: Chris Petrik <c.petrik.sosa@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146584: [PATCH] print/hplip3 options/configure fixups
Date: Sat, 15 May 2010 16:30:02 -0500

 Do as you wish, since I have no say in anything no point in trying to
 deny the change of option names.
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sun May 16 09:15:03 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146584 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146584: commit references a PR
Date: Sun, 16 May 2010 09:13:08 +0000 (UTC)

 makc        2010-05-16 09:13:00 UTC
 
   FreeBSD ports repository
 
   Modified files:
     print/hplip3         Makefile pkg-plist 
   Log:
   Fix configure args [1]
   While here:
   Rewrite options descriptions, rename GUI to QT, NOSNMP to SNMP
   Mark as broken on i386 with SNMP
   Fix NOPORTDOCS
   
   PR:                     ports/146584 [1]
   Submitted/approved by:  Christopher Petrik (maintainer)
   
   Revision  Changes    Path
   1.40      +17 -11    ports/print/hplip3/Makefile
   1.20      +4 -4      ports/print/hplip3/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
