- Update to 2.5.3

PR:		ports/181073
Submitted by:	Ports Fury

1 files changed, 44 insertions, 38 deletions

diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 765fbea9b454..9a078c54b2ad 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.4.14
-PORTREVISION=	4
+PORTVERSION=	2.5.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
@@ -12,58 +11,65 @@ COMMENT=	Universal digital camera control library
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
-
-USES=		gmake pkgconfig
 USE_BZIP2=	yes
+USES=		gmake iconv pkgconfig
 USE_GNOME=	ltverhack
 USE_AUTOTOOLS=	libtool libltdl
 LIBTOOLFILES=	configure libgphoto2_port/configure
-USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
-		LIBLTDL="-L${LOCALBASE}/lib -lltdl"
-CFLAGS+=	-DENODATA=9999	# Safe because it's never used
+		LIBLTDL="-L${LOCALBASE}/lib -lltdl" \
+		PATH="${PATH:C,${HOME}/bin,,}" \
+		ac_cv_path_DOT=false \
+		ac_cv_path_DOXYGEN=false \
+		udevscriptdir=${WRKDIR}
+USE_LDCONFIG=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.10.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_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_CONFIGURE_WITH=	jpeg
+LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIBEXIF_CONFIGURE_ON=	--with-libexif=${LOCALBASE}
+LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+XML_USE=		GNOME=libxml2
+XML_CPPFLAGS=		$$(pkg-config --cflags-only-I libxml-2.0)
+XML_LDFLAGS=		$$(pkg-config --libs-only-L libxml-2.0)
+XML_CONFIGURE_WITH=	libxml2
 
 .include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000040
 CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-USES+=		iconv
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-patch:
-.for file in configure libgphoto2_port/configure
+.for i in configure libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
-		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
-		 s|-g -O2||g ; \
+		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig| ; \
+		 /FLAGS/s|-g|| ; \
 		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
-			${WRKSRC}/${file}
+		${WRKSRC}/${i}
 .endfor
-.if ${PORT_OPTIONS:MNLS}
-	@${REINPLACE_CMD} -e 's|(LDFLAGS) -o|(LDFLAGS) -lintl -o|' \
-		${WRKSRC}/libgphoto2_port/libgphoto2_port/Makefile.in
-.endif
-	@${REINPLACE_CMD} -e '/test.*udevscriptdir/d ; \
-		s| "$$(DESTDIR)$$(udevscriptdir)"||' \
-			${WRKSRC}/libgphoto2_port/usb/Makefile.in \
-			${WRKSRC}/packaging/generic/Makefile.in
-	@${REINPLACE_CMD} -e 's|linux-hotplug ||' \
-		${WRKSRC}/packaging/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' \
-			${WRKSRC}/doc/Makefile.in
-	@${REINPLACE_CMD} 's|with_hal=yes|with_hal=no|' \
-		${WRKSRC}/libgphoto2_port/configure
+		'/^doc_DATA/s|COPYING||' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|ENODATA|ENOATTR|g' \
+		${WRKSRC}/libgphoto2_port/libusb1/libusb1.c
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|linux-hotplug||' \
+		${WRKSRC}/packaging/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>