svn commit: r354591 - in head/graphics: gphoto2 libgphoto2 libgphoto2/files

[Martin Wilke]

Author: miwi
Date: Tue May 20 02:53:31 2014
New Revision: 354591
URL: http://svnweb.freebsd.org/changeset/ports/354591
QAT: https://qat.redports.org/buildarchive/r354591/

Log:
  - Update to 2.5.4
  
  PR:		187970
  Submitted by:	Ports Fury

Deleted:
  head/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
Modified:
  head/graphics/gphoto2/Makefile
  head/graphics/gphoto2/distinfo
  head/graphics/gphoto2/pkg-plist
  head/graphics/libgphoto2/Makefile
  head/graphics/libgphoto2/distinfo

Modified: head/graphics/gphoto2/Makefile
==============================================================================
--- head/graphics/gphoto2/Makefile	Tue May 20 02:51:09 2014	(r354590)
+++ head/graphics/gphoto2/Makefile	Tue May 20 02:53:31 2014	(r354591)
@@ -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})
 

Modified: head/graphics/gphoto2/distinfo
==============================================================================
--- head/graphics/gphoto2/distinfo	Tue May 20 02:51:09 2014	(r354590)
+++ head/graphics/gphoto2/distinfo	Tue May 20 02:53:31 2014	(r354591)
@@ -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

Modified: head/graphics/gphoto2/pkg-plist
==============================================================================
--- head/graphics/gphoto2/pkg-plist	Tue May 20 02:51:09 2014	(r354590)
+++ head/graphics/gphoto2/pkg-plist	Tue May 20 02:53:31 2014	(r354591)
@@ -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%%

Modified: head/graphics/libgphoto2/Makefile
==============================================================================
--- head/graphics/libgphoto2/Makefile	Tue May 20 02:51:09 2014	(r354590)
+++ head/graphics/libgphoto2/Makefile	Tue May 20 02:53:31 2014	(r354591)
@@ -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}/
 		ac_cv_path_DOT=false \
 		ac_cv_path_DOXYGEN=false \
 		udevscriptdir=${WRKDIR}
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/graphics/libgphoto2/distinfo
==============================================================================
--- head/graphics/libgphoto2/distinfo	Tue May 20 02:51:09 2014	(r354590)
+++ head/graphics/libgphoto2/distinfo	Tue May 20 02:53:31 2014	(r354591)
@@ -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