[Midnightbsd-cvs] mports [24323] trunk/graphics/libgphoto2: update to 2.5.16

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Sep 13 13:58:28 EDT 2018 

Revision: 24323
          http://svnweb.midnightbsd.org/mports/?rev=24323
Author:   laffer1
Date:     2018-09-13 13:58:27 -0400 (Thu, 13 Sep 2018)
Log Message:
-----------
update to 2.5.16

Modified Paths:
--------------
    trunk/graphics/libgphoto2/Makefile
    trunk/graphics/libgphoto2/distinfo
    trunk/graphics/libgphoto2/pkg-plist

Added Paths:
-----------
    trunk/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h
    trunk/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h
    trunk/graphics/libgphoto2/files/patch-libgphoto2_port-serial_unix.c

Removed Paths:
-------------
    trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c

Modified: trunk/graphics/libgphoto2/Makefile
===================================================================
--- trunk/graphics/libgphoto2/Makefile	2018-09-13 17:41:14 UTC (rev 24322)
+++ trunk/graphics/libgphoto2/Makefile	2018-09-13 17:58:27 UTC (rev 24323)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.5.8
+PORTVERSION=	2.5.16
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gphoto/libgphoto/${PORTVERSION}
 
@@ -11,9 +11,9 @@
 LICENSE=	lgpl2.1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		gmake iconv libtool pkgconfig tar:bzip2
+USES=		gmake iconv libtool localbase pathfix pkgconfig tar:bzip2
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" \
@@ -24,10 +24,11 @@
 		udevscriptdir=${WRKDIR}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
+PATHFIX_MAKEFILEIN=	Makefile.in \
+			configure \
+			libgphoto2_port/Makefile.in \
+			libgphoto2_port/configure
 
-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
@@ -34,27 +35,22 @@
 OPTIONS_DEFAULT=	GD JPEG LIBEXIF XML
 OPTIONS_SUB=		yes
 
-GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
-GD_CONFIGURE_WITH=	gd
+GD_LIB_DEPENDS=		libgd.so:graphics/gd
+GD_CONFIGURE_OFF=	--with-gdlib=no
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
-LIBEXIF_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_CONFIGURE_OFF=	--with-libexif=no
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 XML_USE=		GNOME=libxml2
-XML_CONFIGURE_WITH=	libxml2
+XML_CONFIGURE_OFF=	--with-libxml-2.0=no
 
-.include <bsd.mport.options.mk>
-
-CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
-
 post-patch:
 .for i in configure libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
 		'/FLAGS/s|-g|| ; \
-		 /grep -i linux/s|; fi ; then|; else false; fi ; then| ; \
-		 /pkgconfig/s|$${libdir}|$${prefix}/libdata|' \
+		 /grep -i linux/s|; fi ; then|; else false; fi ; then|' \
 		${WRKSRC}/${i}
 .endfor
 	@${REINPLACE_CMD} -e \
@@ -61,9 +57,6 @@
 		'/^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
 

Modified: trunk/graphics/libgphoto2/distinfo
===================================================================
--- trunk/graphics/libgphoto2/distinfo	2018-09-13 17:41:14 UTC (rev 24322)
+++ trunk/graphics/libgphoto2/distinfo	2018-09-13 17:58:27 UTC (rev 24323)
@@ -1,2 +1,3 @@
-SHA256 (libgphoto2-2.5.8.tar.bz2) = 031a262e342fae43f724afe66787947ce1fb483277dfe5a8cf1fbe92c58e27b6
-SIZE (libgphoto2-2.5.8.tar.bz2) = 6941251
+TIMESTAMP = 1515810394
+SHA256 (libgphoto2-2.5.16.tar.bz2) = e757416d1623e01a9d0d294b2e790162e434c0964f50d3b7ff1a3424b62a2906
+SIZE (libgphoto2-2.5.16.tar.bz2) = 7006551

Added: trunk/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h
===================================================================
--- trunk/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h	                        (rev 0)
+++ trunk/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h	2018-09-13 17:58:27 UTC (rev 24323)
@@ -0,0 +1,16 @@
+--- camlibs/ax203/jpeg_memsrcdest.h.orig	2015-08-08 15:57:29 UTC
++++ camlibs/ax203/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+ 
++#if JPEG_LIB_VERSION < 80
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ 	unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, un
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ 	unsigned long * outsize);
++
++#endif


Property changes on: trunk/graphics/libgphoto2/files/patch-camlibs_ax203_jpeg__memsrcdest.h
___________________________________________________________________
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
Added: trunk/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h
===================================================================
--- trunk/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h	                        (rev 0)
+++ trunk/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h	2018-09-13 17:58:27 UTC (rev 24323)
@@ -0,0 +1,16 @@
+--- camlibs/jl2005c/jpeg_memsrcdest.h.orig	2015-08-08 15:57:29 UTC
++++ camlibs/jl2005c/jpeg_memsrcdest.h
+@@ -1,5 +1,7 @@
+ #include <jpeglib.h>
+ 
++#if JPEG_LIB_VERSION < 80
++
+ void
+ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
+ 	unsigned long bufsize);
+@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, un
+ void
+ jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
+ 	unsigned long * outsize);
++
++#endif


Property changes on: trunk/graphics/libgphoto2/files/patch-camlibs_jl2005c_jpeg__memsrcdest.h
___________________________________________________________________
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
Added: trunk/graphics/libgphoto2/files/patch-libgphoto2_port-serial_unix.c
===================================================================
--- trunk/graphics/libgphoto2/files/patch-libgphoto2_port-serial_unix.c	                        (rev 0)
+++ trunk/graphics/libgphoto2/files/patch-libgphoto2_port-serial_unix.c	2018-09-13 17:58:27 UTC (rev 24323)
@@ -0,0 +1,26 @@
+--- libgphoto2_port/serial/unix.c.orig	2018-09-13 13:56:02.389432000 -0400
++++ libgphoto2_port/serial/unix.c	2018-09-13 13:56:48.691535000 -0400
+@@ -121,6 +121,14 @@
+ #define GP_PORT_SERIAL_RANGE_HIGH       (0xf)
+ #endif
+ 
++/* MidnightBSD */
++#ifdef __MidnightBSD__
++#define GP_PORT_SERIAL_PREFIX   "/dev/cuad%x"
++#define GP_PORT_SERIAL_RANGE_LOW        0
++#define GP_PORT_SERIAL_RANGE_HIGH       (0xf)
++#endif
++
++
+ /* OpenBSD */
+ /* devices appear to go up to /dev/cuac7, but we just list the first 4 */
+ #ifdef __OpenBSD__
+@@ -419,7 +427,7 @@
+ 	}
+ 	dev->pl->fd = -1;
+ 
+-#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__MidnightBSD__)
+ 	dev->pl->fd = open (port, O_RDWR | O_NOCTTY | O_NONBLOCK);
+ #elif OS2
+ 	fd = open (port, O_RDWR | O_BINARY);


Property changes on: trunk/graphics/libgphoto2/files/patch-libgphoto2_port-serial_unix.c
___________________________________________________________________
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
Deleted: trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c
===================================================================
--- trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	2018-09-13 17:41:14 UTC (rev 24322)
+++ trunk/graphics/libgphoto2/files/patch-libgphoto2_port__libusb1__libusb1.c	2018-09-13 17:58:27 UTC (rev 24323)
@@ -1,13 +0,0 @@
---- 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)
- {

Modified: trunk/graphics/libgphoto2/pkg-plist
===================================================================
--- trunk/graphics/libgphoto2/pkg-plist	2018-09-13 17:41:14 UTC (rev 24322)
+++ trunk/graphics/libgphoto2/pkg-plist	2018-09-13 17:58:27 UTC (rev 24323)
@@ -149,15 +149,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205-compression
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.tp6801
-%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
-%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
-%%PORTDOCS%%share/doc/libgphoto2_port/README
-share/libgphoto2/%%VERSION%%/konica/english
-share/libgphoto2/%%VERSION%%/konica/french
-share/libgphoto2/%%VERSION%%/konica/german
-share/libgphoto2/%%VERSION%%/konica/japanese
-share/libgphoto2/%%VERSION%%/konica/korean
-share/libgphoto2/%%VERSION%%/konica/spanish
+%%PORTDOCS%%%%DOCSDIR%%_port/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%_port/NEWS
+%%PORTDOCS%%%%DOCSDIR%%_port/README
+%%DATADIR%%/%%VERSION%%/konica/english
+%%DATADIR%%/%%VERSION%%/konica/french
+%%DATADIR%%/%%VERSION%%/konica/german
+%%DATADIR%%/%%VERSION%%/konica/japanese
+%%DATADIR%%/%%VERSION%%/konica/korean
+%%DATADIR%%/%%VERSION%%/konica/spanish
+%%DATADIR%%_port/%%VERSION_PORT%%/vcamera/README.txt
 %%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2-6.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-12.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo

More information about the Midnightbsd-cvs mailing list