From owner-svn-ports-all@FreeBSD.ORG Tue Jul 15 15:35:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2ED38FB; Tue, 15 Jul 2014 15:35:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF98122A5; Tue, 15 Jul 2014 15:35:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6FFZrFG033880; Tue, 15 Jul 2014 15:35:53 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6FFZrQ1033879; Tue, 15 Jul 2014 15:35:53 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407151535.s6FFZrQ1033879@svn.freebsd.org> From: Adam Weinberger Date: Tue, 15 Jul 2014 15:35:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361951 - head/graphics/zbar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jul 2014 15:35:54 -0000 Author: adamw Date: Tue Jul 15 15:35:53 2014 New Revision: 361951 URL: http://svnweb.freebsd.org/changeset/ports/361951 QAT: https://qat.redports.org/buildarchive/r361951/ Log: Use OPTIONS helpers. Modified: head/graphics/zbar/Makefile Modified: head/graphics/zbar/Makefile ============================================================================== --- head/graphics/zbar/Makefile Tue Jul 15 15:30:08 2014 (r361950) +++ head/graphics/zbar/Makefile Tue Jul 15 15:35:53 2014 (r361951) @@ -18,75 +18,47 @@ GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= iconv libtool gmake pkgconfig -CONFIGURE_ARGS= --with-jpeg=yes +CONFIGURE_ARGS= --with-jpeg=yes OPTIONS_DEFINE= X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 DOCS -OPTIONS_DEFAULT= X11 IMAGEMAGICK +OPTIONS_DEFAULT=X11 IMAGEMAGICK +OPTIONS_SUB= yes V4L_DESC= Build zbarcam video scanner -.include - -.if ${PORT_OPTIONS:MX11} -USE_XORG= ice sm x11 xau xcb xdmcp xext xv -CONFIGURE_ARGS+= --with-x=yes -.else -CONFIGURE_ARGS+= --with-x=no --without-xshm --without-xv -.endif - -.if ${PORT_OPTIONS:MIMAGEMAGICK} -LIB_DEPENDS+= libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick -CONFIGURE_ARGS+= --with-imagemagick=yes -PLIST_SUB+= IMAGEMAGICK="" -.else -CONFIGURE_ARGS+= --with-imagemagick=no -PLIST_SUB+= IMAGEMAGICK="@comment " -.endif - -.if ${PORT_OPTIONS:MV4L} -BUILD_DEPENDS+= v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat -CONFIGURE_ARGS+= --enable-video=yes -PLIST_SUB+= V4L="" -.else -CONFIGURE_ARGS+= --enable-video=no -PLIST_SUB+= V4L="@comment " -.endif - -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= 2 -USE_GNOME+= pygtk2 -CONFIGURE_ARGS+= --with-python=yes -PLIST_SUB+= PYTHON="" -.else -CONFIGURE_ARGS+= --with-python=no -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MGTK2} -USE_GNOME+= gtk20 -CONFIGURE_ARGS+= --with-gtk=yes -PLIST_SUB+= GTK2="" -.else -CONFIGURE_ARGS+= --with-gtk=no -PLIST_SUB+= GTK2="@comment " -.endif - -.if ${PORT_OPTIONS:MQT4} -USE_QT4= gui moc_build -CONFIGURE_ARGS+= --with-qt=yes -PLIST_SUB+= QT4="" -.else -CONFIGURE_ARGS+= --with-qt=no -PLIST_SUB+= QT4="@comment " -.endif +X11_USE= XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv +X11_CONFIGURE_ON= --with-x=yes +X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv + +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick +IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes +IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no + +V4L_BUILD_DEPENDS= v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat +V4L_CONFIGURE_ON= --enable-video=yes +V4L_CONFIGURE_OFF= --enable-video=no + +PYTHON_USE= PYTHON=2 GNOME=pygtk2 +PYTHON_CONFIGURE_ON= --with-python=yes +PYTHON_CONFIGURE_OFF= --with-python=no + +GTK2_USE= GNOME=gtk20 +GTK2_CONFIGURE_ON= --with-gtk=yes +GTK2_CONFIGURE_OFF= --with-gtk=no + +QT4_USE= QT4=gui,moc_build +QT4_CONFIGURE_ON= --with-qt=yes +QT4_CONFIGURE_OFF= --with-qt=no CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +.include + post-patch: @${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure @${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in -.if ! ${PORT_OPTIONS:MDOCS} +.if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} '/^install-data-am: /s/install-dist_docDATA//' \ ${WRKSRC}/Makefile.in .endif