From owner-svn-ports-all@FreeBSD.ORG Wed Jul 10 01:19:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CC9924CE; Wed, 10 Jul 2013 01:19:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BFAED1A3D; Wed, 10 Jul 2013 01:19:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6A1JD5L019772; Wed, 10 Jul 2013 01:19:13 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6A1JDn9019771; Wed, 10 Jul 2013 01:19:13 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307100119.r6A1JDn9019771@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 10 Jul 2013 01:19:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322593 - head/graphics/libgphoto2 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.14 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: Wed, 10 Jul 2013 01:19:14 -0000 Author: danfe Date: Wed Jul 10 01:19:12 2013 New Revision: 322593 URL: http://svnweb.freebsd.org/changeset/ports/322593 Log: Cleanup the port a bit: - Make COMMENT reflect the reality better - Drop shlib ABI versions from LIB_DEPENDS - Utilize USES of gmake and pkgconfig - Collapse two CONFIGURE_ENV lines into one - Drop MAKE_JOBS_SAFE: it will be default in a few days - Wrap very long lines in post-patch for better readability Modified: head/graphics/libgphoto2/Makefile Modified: head/graphics/libgphoto2/Makefile ============================================================================== --- head/graphics/libgphoto2/Makefile Tue Jul 9 22:33:03 2013 (r322592) +++ head/graphics/libgphoto2/Makefile Wed Jul 10 01:19:12 2013 (r322593) @@ -8,20 +8,23 @@ CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= Universal digital camera picture control tool +COMMENT= Universal digital camera control library -LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ - jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= exif:${PORTSDIR}/graphics/libexif \ + jpeg:${PORTSDIR}/graphics/jpeg +USES= gmake pkgconfig USE_BZIP2= yes -USE_GNOME= pkgconfig ltverhack -USE_GMAKE= yes +USE_GNOME= ltverhack USE_AUTOTOOLS= libtool libltdl LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes -CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" LIBLTDL="-L${LOCALBASE}/lib -lltdl" +CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ + LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ + LIBUSB_CFLAGS="-I/usr/include" \ + LIBUSB_LIBS="-lusb" + PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.8.0 -MAKE_JOBS_SAFE= yes MAN3= libgphoto2.3 libgphoto2_port.3 @@ -31,27 +34,35 @@ MAN3= libgphoto2.3 libgphoto2_port.3 USES+= gettext PLIST_SUB+= NLS="" .else +USES+= iconv CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " -USES+= iconv .endif -CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" LIBUSB_CFLAGS="-I/usr/include" - post-patch: .for file in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \ s|-g -O2||g ; \ - /grep -i linux/s|; fi ; then|; else false; fi ; then|' ${WRKSRC}/${file} + /grep -i linux/s|; fi ; then|; else false; fi ; then|' \ + ${WRKSRC}/${file} .endfor .if ${PORT_OPTIONS:MNLS} - @${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' ${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in + @${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \ + ${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in .endif - @${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; s| "$$(DESTDIR)$$(udevscriptdir)"||' ${WRKSRC}/libgphoto2_port/usb/Makefile.in ${WRKSRC}/packaging/generic/Makefile.in - @${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in - @${REINPLACE_CMD} -e 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' ${WRKSRC}/doc/Makefile.in - @${REINPLACE_CMD} -e '/Requires/d' ${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in - @${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' ${WRKSRC}/libgphoto2_port/configure + @${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \ + s| "$$(DESTDIR)$$(udevscriptdir)"||' \ + ${WRKSRC}/libgphoto2_port/usb/Makefile.in \ + ${WRKSRC}/packaging/generic/Makefile.in + @${REINPLACE_CMD} -e 's|linux-hotplug ||' \ + ${WRKSRC}/packaging/Makefile.in + @${REINPLACE_CMD} -e \ + 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \ + ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} -e '/Requires/d' \ + ${WRKSRC}/libgphoto2_port/libgphoto2_port.pc.in + @${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \ + ${WRKSRC}/libgphoto2_port/configure .include