Index: head/graphics/gphoto2/Makefile =================================================================== --- head/graphics/gphoto2/Makefile (revision 393096) +++ head/graphics/gphoto2/Makefile (revision 393097) @@ -1,41 +1,42 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= gphoto2 -PORTVERSION= 2.5.6 +PORTVERSION= 2.5.8 CATEGORIES= graphics MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION} 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 USES= gmake pkgconfig tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ENV= POPT_CFLAGS="$$(pkg-config --cflags popt)" \ POPT_LIBS="$$(pkg-config --libs popt)" \ ac_cv_lib_pthread_pthread_exit=no CONFIGURE_ARGS= --without-cdk 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_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 Index: head/graphics/gphoto2/distinfo =================================================================== --- head/graphics/gphoto2/distinfo (revision 393096) +++ head/graphics/gphoto2/distinfo (revision 393097) @@ -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 Index: head/graphics/gphoto2/files/patch-configure =================================================================== --- head/graphics/gphoto2/files/patch-configure (revision 393096) +++ head/graphics/gphoto2/files/patch-configure (revision 393097) @@ -1,17 +1,17 @@ ---- 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 -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext (""); ; return 0; } Index: head/graphics/libgphoto2/Makefile =================================================================== --- head/graphics/libgphoto2/Makefile (revision 393096) +++ head/graphics/libgphoto2/Makefile (revision 393097) @@ -1,73 +1,73 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= libgphoto2 -PORTVERSION= 2.5.7 +PORTVERSION= 2.5.8 CATEGORIES= graphics MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION} 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 USES= gmake iconv libtool pkgconfig tar:bzip2 USE_CSTD= gnu89 GNU_CONFIGURE= yes CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" \ LIBLTDL="-L${LOCALBASE}/lib -lltdl" \ PATH="${PATH:C,${HOME}/bin,,}" \ ac_cv_path_DOT=false \ ac_cv_path_DOXYGEN=false \ udevscriptdir=${WRKDIR} INSTALL_TARGET= install-strip USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= VERSION="${PORTVERSION}" VERSION_PORT=0.12.0 OPTIONS_DEFINE= DOCS GD JPEG LIBEXIF NLS XML OPTIONS_DEFAULT= GD JPEG LIBEXIF XML OPTIONS_SUB= yes GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd GD_CONFIGURE_WITH= gd JPEG_USES= jpeg JPEG_CONFIGURE_WITH= jpeg LIBEXIF_LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif LIBEXIF_CONFIGURE_OFF= --with-libexif=no NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls XML_USE= GNOME=libxml2 XML_CONFIGURE_WITH= libxml2 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000040 CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb" .endif 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 \ '/^doc_DATA/s|COPYING||' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|-lusb-1.0|-lusb|' \ ${WRKSRC}/libgphoto2_port/configure @${REINPLACE_CMD} -e \ '/^SUBDIRS/s|linux-hotplug||' \ ${WRKSRC}/packaging/Makefile.in .include Index: head/graphics/libgphoto2/distinfo =================================================================== --- head/graphics/libgphoto2/distinfo (revision 393096) +++ head/graphics/libgphoto2/distinfo (revision 393097) @@ -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 Index: head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h =================================================================== --- head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h (revision 393096) +++ head/graphics/libgphoto2/files/patch-libgphoto2_port-gphoto2-gphoto2-port-portability.h (revision 393097) @@ -1,23 +1,23 @@ ---- 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. :) */ -/* XOPEN needed for usleep */ -#ifndef _XOPEN_SOURCE -# define _XOPEN_SOURCE 500 -#else -# if ((_XOPEN_SOURCE - 0) < 500) -# undef _XOPEN_SOURCE -# define _XOPEN_SOURCE 500 -# endif -#endif - -/* for nanosleep */ -# ifndef _POSIX_C_SOURCE -# define _POSIX_C_SOURCE 199309 -# endif # include # include Index: head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c =================================================================== --- head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c (nonexistent) +++ head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c (revision 393097) @@ -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) + { Property changes on: head/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property