aboutsummaryrefslogtreecommitdiff
path: root/graphics/gphoto2
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2014-01-17 16:56:15 +0000
committerMartin Wilke <miwi@FreeBSD.org>2014-01-17 16:56:15 +0000
commit8d5f87c53766e3000c2447524afd4f0450e64160 (patch)
treed5ad385d603af8ad014f9fddc2de969df281700a /graphics/gphoto2
parenta26c8d07f70b006993df2c52efb38ee9019c8ed2 (diff)
downloadports-8d5f87c53766e3000c2447524afd4f0450e64160.tar.gz
ports-8d5f87c53766e3000c2447524afd4f0450e64160.zip
Notes
Diffstat (limited to 'graphics/gphoto2')
-rw-r--r--graphics/gphoto2/Makefile33
-rw-r--r--graphics/gphoto2/distinfo4
-rw-r--r--graphics/gphoto2/pkg-plist4
3 files changed, 24 insertions, 17 deletions
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 44d34e57ee8a..390433c41676 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gphoto2
-PORTVERSION= 2.4.14
+PORTVERSION= 2.5.3
CATEGORIES= graphics
MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION}
@@ -14,26 +14,33 @@ LICENSE= GPLv2
LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \
libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
-USES= gmake pkgconfig
USE_BZIP2= yes
+USES= gmake pkgconfig
GNU_CONFIGURE= yes
+CONFIGURE_ENV= POPT_CFLAGS="$$(pkg-config --cflags popt)" \
+ POPT_LIBS="$$(pkg-config --libs popt)"
CONFIGURE_ARGS= --without-cdk
-CONFIGURE_ENV= POPT_CFLAGS="-I${LOCALBASE}/include" \
- POPT_LIBS="-L${LOCALBASE}/lib -lpopt"
-OPTIONS_DEFINE= AALIB DOCS NLS
-OPTIONS_DEFAULT= AALIB
-OPTIONS_SUB= yes
-
-AALIB_DESC= Text mode capture preview support
+OPTIONS_DEFINE= AALIB DOCS NLS READLINE
+OPTIONS_DEFAULT= AALIB READLINE
+OPTIONS_SUB= yes
+AALIB_DESC= Text mode capture preview support
AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib
-AALIB_CONFIGURE_OFF= --without-aalib
+AALIB_CONFIGURE_WITH= aalib
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+READLINE_USES= readline
+READLINE_CONFIGURE_WITH= readline
+
+.include <bsd.port.options.mk>
-NLS_USES= gettext
-NLS_CONFIGURE_OFF= --disable-nls
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|-lpthread|-pthread|' \
+ ${WRKSRC}/configure
post-install:
- ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKSRC} && ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index ade1e15c6e19..0fc1f3f540fe 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
-SIZE (gphoto2-2.4.14.tar.bz2) = 669292
+SHA256 (gphoto2-2.5.3.tar.bz2) = 719447efe115c519c81f6ddd3e4e7d22795743d93c56bae2d54a0dfbb697d844
+SIZE (gphoto2-2.5.3.tar.bz2) = 740384
diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist
index a7f2b717fe8d..3cc5cbd0eeb8 100644
--- a/graphics/gphoto2/pkg-plist
+++ b/graphics/gphoto2/pkg-plist
@@ -1,7 +1,7 @@
bin/gphoto2
man/man1/gphoto2.1.gz
%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/test-hook.sh
+%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
%%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
%%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
@@ -32,4 +32,4 @@ 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
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%