Date: Tue, 28 Jul 2015 20:12:46 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393097 - in head/graphics: gphoto2 gphoto2/files libgphoto2 libgphoto2/files Message-ID: <201507282012.t6SKCkL5010769@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Jul 28 20:12:45 2015 New Revision: 393097 URL: https://svnweb.freebsd.org/changeset/ports/393097 Log: Update to 2.5.8 PR: 201845 Submitted by: tkato432@yahoo.com Added: head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c (contents, props changed) Modified: head/graphics/gphoto2/Makefile head/graphics/gphoto2/distinfo head/graphics/gphoto2/files/patch-configure head/graphics/libgphoto2/Makefile head/graphics/libgphoto2/distinfo head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h Modified: head/graphics/gphoto2/Makefile ============================================================================== --- head/graphics/gphoto2/Makefile Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/gphoto2/Makefile Tue Jul 28 20:12:45 2015 (r393097) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gphoto2 -PORTVERSION= 2.5.6 +PORTVERSION= 2.5.8 CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Command-line frontend to libgphoto2 LICENSE= GPLv2 +#LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 @@ -31,11 +32,11 @@ AALIB_CONFIGURE_WITH= aalib NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LIBS= -L${LOCALBASE}/lib -lintl +NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl READLINE_USES= readline READLINE_CONFIGURE_WITH=readline post-install: - ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/graphics/gphoto2/distinfo ============================================================================== --- head/graphics/gphoto2/distinfo Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/gphoto2/distinfo Tue Jul 28 20:12:45 2015 (r393097) @@ -1,2 +1,2 @@ -SHA256 (gphoto2-2.5.6.tar.bz2) = 55e5ec8b2bba4ed358f15eda466f61c79d6f75c220237f821ac687a3ceb336e8 -SIZE (gphoto2-2.5.6.tar.bz2) = 756926 +SHA256 (gphoto2-2.5.8.tar.bz2) = a9abcd15d95f205318d17e3ac12af7ce523d2bc4943709d50b0a12c30cc5ee4d +SIZE (gphoto2-2.5.8.tar.bz2) = 777235 Modified: head/graphics/gphoto2/files/patch-configure ============================================================================== --- head/graphics/gphoto2/files/patch-configure Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/gphoto2/files/patch-configure Tue Jul 28 20:12:45 2015 (r393097) @@ -1,6 +1,6 @@ ---- configure.orig 2014-05-08 17:21:32.000000000 +0400 -+++ configure 2014-05-08 17:23:08.000000000 +0400 -@@ -12988,13 +12988,11 @@ +--- configure.orig 2015-07-05 20:43:09 UTC ++++ configure +@@ -13459,13 +13459,11 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> Modified: head/graphics/libgphoto2/Makefile ============================================================================== --- head/graphics/libgphoto2/Makefile Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/libgphoto2/Makefile Tue Jul 28 20:12:45 2015 (r393097) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgphoto2 -PORTVERSION= 2.5.7 +PORTVERSION= 2.5.8 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Universal digital camera control library LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +#LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl @@ -55,9 +55,9 @@ CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUS post-patch: .for i in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ - 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \ - /FLAGS/s|-g|| ; \ - /grep -i linux/s|; fi ; then|; else false; fi ; then|' \ + '/FLAGS/s|-g|| ; \ + /grep -i linux/s|; fi ; then|; else false; fi ; then| ; \ + /pkgconfig/s|$${libdir}|$${prefix}/libdata|' \ ${WRKSRC}/${i} .endfor @${REINPLACE_CMD} -e \ Modified: head/graphics/libgphoto2/distinfo ============================================================================== --- head/graphics/libgphoto2/distinfo Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/libgphoto2/distinfo Tue Jul 28 20:12:45 2015 (r393097) @@ -1,2 +1,2 @@ -SHA256 (libgphoto2-2.5.7.tar.bz2) = 7260193277bdb4c319dd8f151224f87deac9fde64cbe5d2eb25d9c19e4d09894 -SIZE (libgphoto2-2.5.7.tar.bz2) = 6726164 +SHA256 (libgphoto2-2.5.8.tar.bz2) = 031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6 +SIZE (libgphoto2-2.5.8.tar.bz2) = 6941251 Modified: head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h ============================================================================== --- head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h Tue Jul 28 20:08:21 2015 (r393096) +++ head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h Tue Jul 28 20:12:45 2015 (r393097) @@ -1,6 +1,6 @@ ---- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig 2011-04-05 08:38:24.000000000 +0200 -+++ libgphoto2_port/gphoto2/gphoto2-port-portability.h 2013-10-26 11:13:54.000000000 +0200 -@@ -152,20 +152,6 @@ +--- libgphoto2_port/gphoto2/gphoto2-port-portability.h.orig 2014-06-27 05:26:01 UTC ++++ libgphoto2_port/gphoto2/gphoto2-port-portability.h +@@ -174,20 +174,6 @@ typedef struct { /* yummy. :) */ Added: head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c Tue Jul 28 20:12:45 2015 (r393097) @@ -0,0 +1,13 @@ +--- libgphoto2_port/libusb1/libusb1.c.orig 2015-06-15 20:13:54 UTC ++++ libgphoto2_port/libusb1/libusb1.c +@@ -66,6 +66,10 @@ + }\ + } while(0) + ++#ifndef LIBUSB_CALL ++#define LIBUSB_CALL ++#endif ++ + #ifndef HAVE_LIBUSB_STRERROR + static const char *libusb_strerror(int r) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507282012.t6SKCkL5010769>