From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 18 10:05:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 49F80AD7;
 Mon, 18 Nov 2013 10:05:49 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 398AF2CAA;
 Mon, 18 Nov 2013 10:05:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIA5nNr030979;
 Mon, 18 Nov 2013 10:05:49 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIA5mIG030977;
 Mon, 18 Nov 2013 10:05:48 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201311181005.rAIA5mIG030977@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Mon, 18 Nov 2013 10:05:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334167 - in head/graphics/zbar: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Nov 2013 10:05:49 -0000

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