From nobody@FreeBSD.org  Sat Oct  6 13:34:02 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8DC281065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  6 Oct 2012 13:34:02 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6CDF78FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  6 Oct 2012 13:34:02 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q96DY2OQ055520
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 6 Oct 2012 13:34:02 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q96DY247055517;
	Sat, 6 Oct 2012 13:34:02 GMT
	(envelope-from nobody)
Message-Id: <201210061334.q96DY247055517@red.freebsd.org>
Date: Sat, 6 Oct 2012 13:34:02 GMT
From: Oliver Heesakkers <dev2@heesakkers.info>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer patch] Convert graphics/zbar to OptionsNG
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: dev2@heesakkers.info

>Number:         172397
>Category:       ports
>Synopsis:       [maintainer patch] Convert graphics/zbar to OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 06 13:40:10 UTC 2012
>Closed-Date:    Sun Oct 07 13:03:41 UTC 2012
>Last-Modified:  Sun Oct 07 13:03:41 UTC 2012
>Originator:     Oliver Heesakkers
>Release:        9.0-RELEASE-p3
>Organization:
>Environment:
>Description:
The attached patch converts graphics/zbar to OptionsNG
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN zbar.orig/Makefile zbar/Makefile
--- zbar.orig/Makefile	2012-10-06 13:44:25.000000000 +0200
+++ zbar/Makefile	2012-10-06 14:40:25.000000000 +0200
@@ -21,32 +21,29 @@
 USE_LDCONFIG=	yes
 USE_ICONV=	yes
 
-OPTIONS=	X11         "Build with X support" on \
-		IMAGEMAGICK "ImageMagick graphics support" on \
-		V4L         "Build zbarcam video scanner" off \
-		PYTHON      "Build PyGTK widget" off \
-		GTK2        "Build GTK+2 widget" off \
-		QT4         "Build Qt4 widget" off
+OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4
+OPTIONS_DEFAULT=	X11 IMAGEMAGICK
+V4L_DESC=	Build zbarcam video scanner
 
 .include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libjpeg.so)
 CONFIGURE_ARGS+=	--with-jpeg=yes
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 .else
 CONFIGURE_ARGS+=	--with-jpeg=no
 .endif
 
-.if defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	ice sm x11 xau xdmcp xext xv
-LIB_DEPENDS+=	xcb.2:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
 CONFIGURE_ARGS+=	--with-x=yes
 .else
 CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 .endif
 
-.if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick++.5:${PORTSDIR}/graphics/ImageMagick
+.if ${PORT_OPTIONS:MIMAGEMAGICK}
+LIB_DEPENDS+=	Magick++:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--with-imagemagick=yes
 PLIST_SUB+=	IMAGEMAGICK=""
 MAN1=	zbarimg.1
@@ -55,7 +52,7 @@
 PLIST_SUB+=	IMAGEMAGICK="@comment "
 .endif
 
-.if defined(WITH_V4L)
+.if ${PORT_OPTIONS:MV4L}
 BUILD_DEPENDS+=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
 CONFIGURE_ARGS+=	--enable-video=yes
 PLIST_SUB+=	V4L=""
@@ -65,7 +62,7 @@
 PLIST_SUB+=	V4L="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	2.5-2.7
 USE_GNOME+=	pygtk2
 CONFIGURE_ARGS+=	--with-python=yes
@@ -75,7 +72,7 @@
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk=yes
 PLIST_SUB+=	GTK2=""
@@ -84,7 +81,7 @@
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT4=	gui moc_build
 CONFIGURE_ARGS+=	--with-qt=yes
 PLIST_SUB+=	QT4=""
@@ -97,9 +94,9 @@
 
 post-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
+	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
-.if defined(NOPORTDOCS)
+.if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
 		${WRKSRC}/Makefile.in
 .endif


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Sat Oct 6 13:40:21 UTC 2012 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172397 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Oct 6 13:40:29 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172397 
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Sat Oct 6 13:48:05 UTC 2012 
State-Changed-Why:  
Fixed typo in submitter address.  Submitter is maintainer. 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: dev2@heesakkers.info
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/172397: [maintainer patch] Convert graphics/zbar to OptionsNG
Date: Sat, 6 Oct 2012 13:40:27 UT

 Maintainer of graphics/zbar,
 
 Please note that PR ports/172397 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172397
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Sat Oct 6 17:34:21 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172397: commit references a PR
Date: Sun,  7 Oct 2012 10:23:37 +0000 (UTC)

 Author: ak
 Date: Sun Oct  7 10:23:23 2012
 New Revision: 305451
 URL: http://svn.freebsd.org/changeset/ports/305451
 
 Log:
   - Convert Makefile headers to new style
   - Convert to new options framework
   - Remove ABI version numbers from LIB_DEPENDS
   
   PR:	ports/172397
   Submitted by:	Oliver Heesakkers <dev2@heesakkers.info> (maintainer)
 
 Modified:
   head/graphics/zbar/Makefile   (contents, props changed)
 
 Modified: head/graphics/zbar/Makefile
 ==============================================================================
 --- head/graphics/zbar/Makefile	Sun Oct  7 10:14:54 2012	(r305450)
 +++ head/graphics/zbar/Makefile	Sun Oct  7 10:23:23 2012	(r305451)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	zbar
 -# Date created:				12 november 2010
 -# Whom:					Oliver Heesakkers <dev2@heesakkers.info>
 -#
  # $FreeBSD$
 -#
 +# Created by:	Oliver Heesakkers <dev2@heesakkers.info>
  
  PORTNAME=	zbar
  PORTVERSION=	0.10
 @@ -21,32 +17,29 @@ USE_GMAKE=	yes
  USE_LDCONFIG=	yes
  USE_ICONV=	yes
  
 -OPTIONS=	X11         "Build with X support" on \
 -		IMAGEMAGICK "ImageMagick graphics support" on \
 -		V4L         "Build zbarcam video scanner" off \
 -		PYTHON      "Build PyGTK widget" off \
 -		GTK2        "Build GTK+2 widget" off \
 -		QT4         "Build Qt4 widget" off
 +OPTIONS_DEFINE=	X11 IMAGEMAGICK V4L PYTHON GTK2 QT4
 +OPTIONS_DEFAULT=	X11 IMAGEMAGICK
 +V4L_DESC=	Build zbarcam video scanner
  
  .include <bsd.port.options.mk>
  
  .if exists(${LOCALBASE}/lib/libjpeg.so)
  CONFIGURE_ARGS+=	--with-jpeg=yes
 -LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 +LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
  .else
  CONFIGURE_ARGS+=	--with-jpeg=no
  .endif
  
 -.if defined(WITH_X11)
 +.if ${PORT_OPTIONS:MX11}
  USE_XORG=	ice sm x11 xau xdmcp xext xv
 -LIB_DEPENDS+=	xcb.2:${PORTSDIR}/x11/libxcb
 +LIB_DEPENDS+=	xcb:${PORTSDIR}/x11/libxcb
  CONFIGURE_ARGS+=	--with-x=yes
  .else
  CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
  .endif
  
 -.if defined(WITH_IMAGEMAGICK)
 -LIB_DEPENDS+=	Magick++.5:${PORTSDIR}/graphics/ImageMagick
 +.if ${PORT_OPTIONS:MIMAGEMAGICK}
 +LIB_DEPENDS+=	Magick++:${PORTSDIR}/graphics/ImageMagick
  CONFIGURE_ARGS+=	--with-imagemagick=yes
  PLIST_SUB+=	IMAGEMAGICK=""
  MAN1=	zbarimg.1
 @@ -55,7 +48,7 @@ CONFIGURE_ARGS+=	--with-imagemagick=no
  PLIST_SUB+=	IMAGEMAGICK="@comment "
  .endif
  
 -.if defined(WITH_V4L)
 +.if ${PORT_OPTIONS:MV4L}
  BUILD_DEPENDS+=	v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat
  CONFIGURE_ARGS+=	--enable-video=yes
  PLIST_SUB+=	V4L=""
 @@ -65,7 +58,7 @@ CONFIGURE_ARGS+=	--enable-video=no
  PLIST_SUB+=	V4L="@comment "
  .endif
  
 -.if defined(WITH_PYTHON)
 +.if ${PORT_OPTIONS:MPYTHON}
  USE_PYTHON=	2.5-2.7
  USE_GNOME+=	pygtk2
  CONFIGURE_ARGS+=	--with-python=yes
 @@ -75,7 +68,7 @@ CONFIGURE_ARGS+=	--with-python=no
  PLIST_SUB+=	PYTHON="@comment "
  .endif
  
 -.if defined(WITH_GTK2)
 +.if ${PORT_OPTIONS:MGTK2}
  USE_GNOME+=	gtk20
  CONFIGURE_ARGS+=	--with-gtk=yes
  PLIST_SUB+=	GTK2=""
 @@ -84,7 +77,7 @@ CONFIGURE_ARGS+=	--with-gtk=no
  PLIST_SUB+=	GTK2="@comment "
  .endif
  
 -.if defined(WITH_QT4)
 +.if ${PORT_OPTIONS:MQT4}
  USE_QT4=	gui moc_build
  CONFIGURE_ARGS+=	--with-qt=yes
  PLIST_SUB+=	QT4=""
 @@ -97,9 +90,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
  
  post-patch:
  	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
 -	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
 +	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
  		${WRKSRC}/Makefile.in
 -.if defined(NOPORTDOCS)
 +.if empty(PORT_OPTIONS:MDOCS)
  	@${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \
  		${WRKSRC}/Makefile.in
  .endif
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: ak 
State-Changed-When: Sun Oct 7 13:03:39 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172397 
>Unformatted:
