From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 9 20:10:03 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 ESMTP id 5688A22D for ; Sat, 9 Nov 2013 20:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 282F120A3 for ; Sat, 9 Nov 2013 20:10:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rA9KA2fF098745 for ; Sat, 9 Nov 2013 20:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA9KA2wZ098744; Sat, 9 Nov 2013 20:10:02 GMT (envelope-from gnats) Date: Sat, 9 Nov 2013 20:10:02 GMT Message-Id: <201311092010.rA9KA2wZ098744@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Oliver Heesakkers Subject: Re: ports/183572: [PATCH] graphics/zbar: Unbreak on FreeBSD 10 (and DragonFly) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Oliver Heesakkers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Nov 2013 20:10:03 -0000 The following reply was made to PR ports/183572; it has been noted by GNATS. From: Oliver Heesakkers To: bug-followup@freebsd.org Cc: Subject: Re: ports/183572: [PATCH] graphics/zbar: Unbreak on FreeBSD 10 (and DragonFly) Date: Sat, 09 Nov 2013 21:01:12 +0100 This is a multi-part message in MIME format. --nextPart2071947.70pAsMqHus Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" I submit for inclusion in the ports tree the attached update to graphics/zbar. Changes: - Jpeg is now a requirement. - Patch to unbreak build on 10 (and reportedly DragonflyBSD) (John Marino). Requiring jpeg brings the possibility that the package changes in a way that PORTREVISION needs to be be upped. However this is highly unlikely, so I didn't do that. --nextPart2071947.70pAsMqHus Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="patch.txt" Index: Makefile =================================================================== --- Makefile (revision 333324) +++ Makefile (working copy) @@ -12,10 +12,14 @@ 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 @@ NO_STAGE= yes .include -.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 Index: files/patch-configure =================================================================== --- files/patch-configure (revision 0) +++ files/patch-configure (working copy) @@ -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 Property changes on: files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --nextPart2071947.70pAsMqHus--