Date: Mon, 18 Nov 2013 10:05:48 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334167 - in head/graphics/zbar: . files Message-ID: <201311181005.rAIA5mIG030977@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Nov 18 10:05:48 2013 New Revision: 334167 URL: http://svnweb.freebsd.org/changeset/ports/334167 Log: graphics/zbar: Unbreak on F10 and DragonFly PR: ports/183572 Submitted by: marino Approved by: Oliver Heesakkers (maintainer, modified) Added: head/graphics/zbar/files/patch-configure (contents, props changed) Modified: head/graphics/zbar/Makefile Modified: head/graphics/zbar/Makefile ============================================================================== --- head/graphics/zbar/Makefile Mon Nov 18 09:52:42 2013 (r334166) +++ head/graphics/zbar/Makefile Mon Nov 18 10:05:48 2013 (r334167) @@ -12,10 +12,14 @@ COMMENT= ZBar barcode reader LICENSE= LGPL21 +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg + GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= iconv gmake pkgconfig +CONFIGURE_ARGS= --with-jpeg=yes + OPTIONS_DEFINE= X11 IMAGEMAGICK V4L PYTHON GTK2 QT4 OPTIONS_DEFAULT= X11 IMAGEMAGICK V4L_DESC= Build zbarcam video scanner @@ -23,13 +27,6 @@ V4L_DESC= Build zbarcam video scanner NO_STAGE= yes .include <bsd.port.options.mk> -.if exists(${LOCALBASE}/lib/libjpeg.so) -CONFIGURE_ARGS+= --with-jpeg=yes -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg -.else -CONFIGURE_ARGS+= --with-jpeg=no -.endif - .if ${PORT_OPTIONS:MX11} USE_XORG= ice sm x11 xau xcb xdmcp xext xv CONFIGURE_ARGS+= --with-x=yes Added: head/graphics/zbar/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/zbar/files/patch-configure Mon Nov 18 10:05:48 2013 (r334167) @@ -0,0 +1,10 @@ +--- configure.orig 2009-10-23 18:17:24.000000000 +0000 ++++ configure +@@ -21369,6 +21369,7 @@ if test "x$ac_cv_lib_jpeg_jpeg_read_head + #define HAVE_LIBJPEG 1 + _ACEOF + ++ have_jpeg="yes" + LIBS="-ljpeg $LIBS" + + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311181005.rAIA5mIG030977>