From owner-svn-ports-all@FreeBSD.ORG Sun Jun 29 07:58:03 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 6807F215; Sun, 29 Jun 2014 07:58:03 +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 553502288; Sun, 29 Jun 2014 07:58:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5T7w337072975; Sun, 29 Jun 2014 07:58:03 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5T7w2lh072972; Sun, 29 Jun 2014 07:58:02 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201406290758.s5T7w2lh072972@svn.freebsd.org> From: Thomas Zander Date: Sun, 29 Jun 2014 07:58:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359739 - in head/graphics: gstreamer1-plugins-zbar 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: Sun, 29 Jun 2014 07:58:03 -0000 Author: riggs Date: Sun Jun 29 07:58:02 2014 New Revision: 359739 URL: http://svnweb.freebsd.org/changeset/ports/359739 QAT: https://qat.redports.org/buildarchive/r359739/ Log: - Fix build/staging of graphics/zbar for all permutations of OPTIONS - CPPFLAGS - Get rid of MAN1 - Fix pkg-plist - Introduce USES=libtool - Bump PORTREVISION including dependent ports that need rebuild PR: 187923 Submitted by: kamikaze@bsdforen.de Reviewed by: Oliver Heesakkers (maintainer) Approved by: maintainer, mentors (implicit) Modified: head/graphics/gstreamer1-plugins-zbar/Makefile head/graphics/zbar/Makefile head/graphics/zbar/pkg-plist Modified: head/graphics/gstreamer1-plugins-zbar/Makefile ============================================================================== --- head/graphics/gstreamer1-plugins-zbar/Makefile Sun Jun 29 07:18:59 2014 (r359738) +++ head/graphics/gstreamer1-plugins-zbar/Makefile Sun Jun 29 07:58:02 2014 (r359739) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer ZBar barcode detector plugin Modified: head/graphics/zbar/Makefile ============================================================================== --- head/graphics/zbar/Makefile Sun Jun 29 07:18:59 2014 (r359738) +++ head/graphics/zbar/Makefile Sun Jun 29 07:58:02 2014 (r359739) @@ -3,7 +3,7 @@ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF @@ -16,7 +16,7 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= iconv gmake pkgconfig +USES= iconv libtool gmake pkgconfig CONFIGURE_ARGS= --with-jpeg=yes @@ -37,7 +37,6 @@ CONFIGURE_ARGS+= --with-x=no --without-x LIB_DEPENDS+= libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick CONFIGURE_ARGS+= --with-imagemagick=yes PLIST_SUB+= IMAGEMAGICK="" -MAN1= zbarimg.1 .else CONFIGURE_ARGS+= --with-imagemagick=no PLIST_SUB+= IMAGEMAGICK="@comment " @@ -47,7 +46,6 @@ PLIST_SUB+= IMAGEMAGICK="@comment " BUILD_DEPENDS+= v4l_compat>=1.0.20101027:${PORTSDIR}/multimedia/v4l_compat CONFIGURE_ARGS+= --enable-video=yes PLIST_SUB+= V4L="" -MAN1+= zbarcam.1 .else CONFIGURE_ARGS+= --enable-video=no PLIST_SUB+= V4L="@comment " @@ -81,6 +79,7 @@ CONFIGURE_ARGS+= --with-qt=no PLIST_SUB+= QT4="@comment " .endif +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib post-patch: Modified: head/graphics/zbar/pkg-plist ============================================================================== --- head/graphics/zbar/pkg-plist Sun Jun 29 07:18:59 2014 (r359738) +++ head/graphics/zbar/pkg-plist Sun Jun 29 07:58:02 2014 (r359739) @@ -14,23 +14,23 @@ include/zbar/Video.h include/zbar/Window.h %%GTK2%%include/zbar/zbargtk.h lib/libzbar.a -lib/libzbar.la lib/libzbar.so -lib/libzbar.so.2 +lib/libzbar.so.0 +lib/libzbar.so.0.2.0 %%GTK2%%lib/libzbargtk.a -%%GTK2%%lib/libzbargtk.la %%GTK2%%lib/libzbargtk.so %%GTK2%%lib/libzbargtk.so.0 +%%GTK2%%lib/libzbargtk.so.0.0.2 %%QT4%%lib/libzbarqt.a -%%QT4%%lib/libzbarqt.la %%QT4%%lib/libzbarqt.so %%QT4%%lib/libzbarqt.so.0 +%%QT4%%lib/libzbarqt.so.0.0.2 %%GTK2%%libdata/pkgconfig/zbar-gtk.pc %%QT4%%libdata/pkgconfig/zbar-qt.pc libdata/pkgconfig/zbar.pc -%%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.la +%%V4L%%man/man1/zbarcam.1.gz +%%IMAGEMAGICK%%man/man1/zbarimg.1.gz %%PYTHON%%%%PYTHON_SITELIBDIR%%/zbar.so -%%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.la %%PYTHON%%%%GTK2%%%%PYTHON_SITELIBDIR%%/zbarpygtk.so %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/INSTALL