diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2014-05-20 02:53:31 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2014-05-20 02:53:31 +0000 |
| commit | e0543dc56120aaf61189a3673732681ce583290b (patch) | |
| tree | 2c85881360f5a82fcad2fce36a7939d4bbf9eb91 | |
| parent | f7b59150eaf8d903786a39f610bf8ee4ebe0768a (diff) | |
Notes
| -rw-r--r-- | graphics/gphoto2/Makefile | 12 | ||||
| -rw-r--r-- | graphics/gphoto2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/gphoto2/pkg-plist | 4 | ||||
| -rw-r--r-- | graphics/libgphoto2/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libgphoto2/distinfo | 4 | ||||
| -rw-r--r-- | graphics/libgphoto2/files/patch-camlibs_ptp2-config.c | 10 |
6 files changed, 12 insertions, 26 deletions
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 36dd0898e677..6caa55a78d25 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gphoto2 -PORTVERSION= 2.5.3 +PORTVERSION= 2.5.4 CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} @@ -14,10 +14,11 @@ LICENSE= GPLv2 LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 -USES= tar:bzip2 gmake pkgconfig +USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= POPT_CFLAGS="$$(pkg-config --cflags popt)" \ - POPT_LIBS="$$(pkg-config --libs popt)" + POPT_LIBS="$$(pkg-config --libs popt)" \ + ac_cv_lib_pthread_pthread_exit=no CONFIGURE_ARGS= --without-cdk OPTIONS_DEFINE= AALIB DOCS NLS READLINE @@ -35,11 +36,6 @@ NLS_CONFIGURE_ENV= LIBS="-lintl" READLINE_USES= readline READLINE_CONFIGURE_WITH= readline -post-patch: - @${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/configure - post-install: (cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR}) diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo index 0fc1f3f540fe..023f6e853f87 100644 --- a/graphics/gphoto2/distinfo +++ b/graphics/gphoto2/distinfo @@ -1,2 +1,2 @@ -SHA256 (gphoto2-2.5.3.tar.bz2) = 719447efe115c519c81f6ddd3e4e7d22795743d93c56bae2d54a0dfbb697d844 -SIZE (gphoto2-2.5.3.tar.bz2) = 740384 +SHA256 (gphoto2-2.5.4.tar.bz2) = 7da2124dbc4b77f4107437e52aa41301513488195dcd16f62f34eb631aa75c2b +SIZE (gphoto2-2.5.4.tar.bz2) = 740449 diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist index 3cc5cbd0eeb8..b3c9aebe7070 100644 --- a/graphics/gphoto2/pkg-plist +++ b/graphics/gphoto2/pkg-plist @@ -23,8 +23,6 @@ man/man1/gphoto2.1.gz %%NLS%%share/locale/ro/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/ru/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/rw/LC_MESSAGES/gphoto2.mo -%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/rw %%NLS%%share/locale/sk/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/sr/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/sv/LC_MESSAGES/gphoto2.mo @@ -32,4 +30,6 @@ man/man1/gphoto2.1.gz %%NLS%%share/locale/vi/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gphoto2.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gphoto2.mo +%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/rw %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 6462dbb03cea..06ba82e8a47c 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libgphoto2 -PORTVERSION= 2.5.3.1 -PORTREVISION= 2 +PORTVERSION= 2.5.4 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} @@ -21,6 +20,7 @@ CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ ac_cv_path_DOT=false \ ac_cv_path_DOXYGEN=false \ udevscriptdir=${WRKDIR} +INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo index e3680e94a7e7..be009d90954e 100644 --- a/graphics/libgphoto2/distinfo +++ b/graphics/libgphoto2/distinfo @@ -1,2 +1,2 @@ -SHA256 (libgphoto2-2.5.3.1.tar.bz2) = 29322d3b163d1d91501280259ca16d1ba966e7d11739d8dc7cf07ef5e617cda2 -SIZE (libgphoto2-2.5.3.1.tar.bz2) = 6676451 +SHA256 (libgphoto2-2.5.4.tar.bz2) = 5fb412e28d3a8ed15bfe86df2173360fcccd29f3d2117e8329d827c356e60bc0 +SIZE (libgphoto2-2.5.4.tar.bz2) = 6682743 diff --git a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c b/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c deleted file mode 100644 index e7cbde56000e..000000000000 --- a/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c +++ /dev/null @@ -1,10 +0,0 @@ ---- camlibs/ptp2/config.c.orig Tue Dec 12 18:43:53 2006 -+++ camlibs/ptp2/config.c Tue Dec 12 19:00:45 2006 -@@ -24,6 +24,7 @@ - #include <string.h> - #include <stdio.h> - #include <time.h> -+#include <sys/types.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> |