[Midnightbsd-cvs] mports: graphics/libgphoto2: update to 2.4.1.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Jun 9 16:41:51 EDT 2008


Log Message:
-----------
update to 2.4.1.  This *should* fix gvfs

Modified Files:
--------------
    mports/graphics/libgphoto2:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

Added Files:
-----------
    mports/graphics/libgphoto2/files:
        patch-camlibs_ptp2-config.c (r1.1)
        patch-libgphoto2_port-serial-unix.c (r1.1)

Removed Files:
-------------
    mports/graphics/libgphoto2/files:
        patch-camlibs-ptp2-ptpip.c
        patch-camlibs-sonix-library.c
        patch-libgphoto2_port-libgphoto2_port-gphoto2-port-info-list.c

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/graphics/libgphoto2/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libgphoto2/pkg-plist -L graphics/libgphoto2/pkg-plist -u -r1.1 -r1.2
--- graphics/libgphoto2/pkg-plist
+++ graphics/libgphoto2/pkg-plist
@@ -1,5 +1,6 @@
 bin/gphoto2-config
 bin/gphoto2-port-config
+include/gphoto2/gphoto2
 include/gphoto2/gphoto2-abilities-list.h
 include/gphoto2/gphoto2-camera.h
 include/gphoto2/gphoto2-context.h
@@ -150,9 +151,6 @@
 lib/libgphoto2/%%VERSION%%/sierra.a
 lib/libgphoto2/%%VERSION%%/sierra.la
 lib/libgphoto2/%%VERSION%%/sierra.so
-lib/libgphoto2/%%VERSION%%/sipix_blink.a
-lib/libgphoto2/%%VERSION%%/sipix_blink.la
-lib/libgphoto2/%%VERSION%%/sipix_blink.so
 lib/libgphoto2/%%VERSION%%/sipix_blink2.a
 lib/libgphoto2/%%VERSION%%/sipix_blink2.la
 lib/libgphoto2/%%VERSION%%/sipix_blink2.so
@@ -213,19 +211,55 @@
 lib/libgphoto2_port.la
 lib/libgphoto2_port.so
 lib/libgphoto2_port.so.0
+lib/udev/check-mtp-device
+lib/udev/check-ptp-camera
 libdata/pkgconfig/libgphoto2.pc
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
-%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
-%%PORTDOCS%%share/doc/libgphoto2_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
+libdata/pkgconfig/libgphoto2_port.pc
+share/doc/libgphoto2/AUTHORS
+share/doc/libgphoto2/COPYING
+share/doc/libgphoto2/NEWS
+share/doc/libgphoto2/README
+share/doc/libgphoto2/camlibs/README.adc65
+share/doc/libgphoto2/camlibs/README.agfa-cl20
+share/doc/libgphoto2/camlibs/README.aox
+share/doc/libgphoto2/camlibs/README.canon
+share/doc/libgphoto2/camlibs/README.clicksmart310
+share/doc/libgphoto2/camlibs/README.enigma13
+share/doc/libgphoto2/camlibs/README.gsmart300
+share/doc/libgphoto2/camlibs/README.iclick
+share/doc/libgphoto2/camlibs/README.jamcam
+share/doc/libgphoto2/camlibs/README.konica
+share/doc/libgphoto2/camlibs/README.largan-lmini
+share/doc/libgphoto2/camlibs/README.lg_gsm
+share/doc/libgphoto2/camlibs/README.mars
+share/doc/libgphoto2/camlibs/README.minolta-dimagev
+share/doc/libgphoto2/camlibs/README.mustek
+share/doc/libgphoto2/camlibs/README.panasonic
+share/doc/libgphoto2/camlibs/README.panasonic-coolshot
+share/doc/libgphoto2/camlibs/README.panasonic-l859
+share/doc/libgphoto2/camlibs/README.pccam300
+share/doc/libgphoto2/camlibs/README.pccam600
+share/doc/libgphoto2/camlibs/README.ptp2
+share/doc/libgphoto2/camlibs/README.smal
+share/doc/libgphoto2/camlibs/README.sonix
+share/doc/libgphoto2/camlibs/README.sonydscf1
+share/doc/libgphoto2/camlibs/README.soundvision
+share/doc/libgphoto2/camlibs/README.spca50x
+share/doc/libgphoto2/camlibs/README.sq905
+share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
+share/doc/libgphoto2/camlibs/README.905C
+share/doc/libgphoto2/camlibs/README.9050
+share/doc/libgphoto2/camlibs/README.913C
+share/doc/libgphoto2/camlibs/README.913D
+share/doc/libgphoto2_port/AUTHORS
+share/doc/libgphoto2_port/NEWS
+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
 %%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
@@ -244,6 +278,8 @@
 %%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2_port-0.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
@@ -255,15 +291,18 @@
 %%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-0.mo
- at dirrm %%DATADIR%%/%%VERSION%%/konica
- at dirrm %%DATADIR%%/%%VERSION%%
- at dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm share/libgphoto2/%%VERSION%%/konica
+ at dirrm share/libgphoto2/%%VERSION%%
+ at dirrm share/libgphoto2
+ at dirrm share/doc/libgphoto2_port
+ at dirrm share/doc/libgphoto2/camlibs
+ at dirrm share/doc/libgphoto2
+ at dirrmtry lib/udev
 @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
 @dirrm lib/libgphoto2_port
 @dirrm lib/libgphoto2/%%VERSION%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/libgphoto2/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libgphoto2/Makefile -L graphics/libgphoto2/Makefile -u -r1.1 -r1.2
--- graphics/libgphoto2/Makefile
+++ graphics/libgphoto2/Makefile
@@ -2,37 +2,34 @@
 # Date created:		26 May 1999
 # Whom:			Anders Nordby <anders at fix.no>
 #
-# $FreeBSD: ports/graphics/libgphoto2/Makefile,v 1.28 2006/06/21 19:20:45 pav Exp $
 # $MidnightBSD$
+# $FreeBSD: ports/graphics/libgphoto2/Makefile,v 1.37 2008/05/18 15:08:07 pav Exp $
 #
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.2.1
-PORTREVISION=	1
+PORTVERSION=	2.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A universal digital camera picture control tool
+LICENSE=	lgpl
 
-LIB_DEPENDS=	usb:${PORTSDIR}/devel/libusb \
-		exif:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb \
+		exif.12:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget pkgconfig ltverhack
-USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 LIBTOOLFILES=	configure libgphoto2_port/configure
-INSTALLS_SHLIB=	yes
-PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.6.1
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" LIBLTDL="-L${LOCALBASE}/lib -lltdl"
+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 
 MAN3=		libgphoto2.3 libgphoto2_port.3
 
-#LIBUSB_CFLAGS=	-I${LOCALBASE}/include
-#LIBUSB_LIBS=	-L${LOCALBASE}/lib
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -45,26 +42,9 @@
 .for file in configure libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
 		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
-		 s|-g ||g' ${WRKSRC}/${file}
+		 s|-g -O2||g' ${WRKSRC}/${file}
 .endfor
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|: install-docDATA|:|g'
 	@${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in
-
-pre-build:
-	@cd ${WRKSRC} && ${GMAKE} all-local
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${PREFIX}/share/doc/libgphoto2_port
-.for file in AUTHORS NEWS README
-	${INSTALL_DATA} ${WRKSRC}/libgphoto2_port/${file} \
-		${PREFIX}/share/doc/libgphoto2_port
-.endfor
-.endif
+	@${REINPLACE_CMD} -e 's|@HAVE_DOXYGEN_TRUE@|#| ; s|@HAVE_DOXYGEN_FALSE@||' ${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/graphics/libgphoto2/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L graphics/libgphoto2/distinfo -L graphics/libgphoto2/distinfo -u -r1.1 -r1.2
--- graphics/libgphoto2/distinfo
+++ graphics/libgphoto2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgphoto2-2.2.1.tar.bz2) = 69827311733e39fafa9f77bb05e55b77
-SHA256 (libgphoto2-2.2.1.tar.bz2) = fb2ba23957f5892a5ed0b4e346230006bf2a72b5fdf52563b978c78f0bcccd11
-SIZE (libgphoto2-2.2.1.tar.bz2) = 3086807
+MD5 (libgphoto2-2.4.1.tar.bz2) = 70c7d2c3e84997f29b4e988e56bd02aa
+SHA256 (libgphoto2-2.4.1.tar.bz2) = dbb78d2eaf7c06ada10be244589835e683d3a0b4fb20494bff850a5762286bab
+SIZE (libgphoto2-2.4.1.tar.bz2) = 3493514
--- graphics/libgphoto2/files/patch-camlibs-ptp2-ptpip.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- camlibs/ptp2/ptpip.c.orig	Tue Jun 20 04:02:16 2006
-+++ camlibs/ptp2/ptpip.c	Sat Jun 24 00:33:29 2006
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/select.h>
- 
- #include <sys/socket.h>
--- /dev/null
+++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
@@ -0,0 +1,24 @@
+--- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
++++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
+@@ -43,6 +43,7 @@
+ #endif
+ #include <string.h>
+ #include <signal.h>
++#include <sys/select.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_TIME_H
+@@ -348,11 +349,11 @@
+ 		/* resmgr has its own API, which calls to a server and
+ 		 * communicates over UNIX domain sockets.
+ 		 */
+-		fd = rsm_open_device(path, O_RDONLY | O_NDELAY);
++		fd = rsm_open_device(path, O_RDONLY | O_NONBLOCK);
+ 		/* fall through to standard open if this failed */
+ #endif
+ 		if (fd == -1)
+-			fd = open (path, O_RDONLY | O_NDELAY);
++			fd = open (path, O_RDONLY | O_NONBLOCK);
+ 		if (fd < 0) {
+ 			gp_port_serial_unlock (NULL, path);
+ 			continue;
--- graphics/libgphoto2/files/patch-camlibs-sonix-library.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camlibs/sonix/library.c.orig	Wed Apr 19 03:54:18 2006
-+++ camlibs/sonix/library.c	Wed Jun 21 00:12:06 2006
-@@ -41,7 +41,7 @@
- #else
- #  define _(String) (String)
- #  define N_(String) (String)
--#  define ngettext(String1,String2,Count) ((Count==1)?String1:String)
-+#  define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
- #endif
- 
- #include <gphoto2-port.h>
--- /dev/null
+++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
@@ -0,0 +1,11 @@
+--- camlibs/ptp2/config.c.orig	Tue Dec 12 18:43:53 2006
++++ camlibs/ptp2/config.c	Tue Dec 12 19:00:45 2006
+@@ -19,6 +19,8 @@
+  */
+ #include "config.h"
+ 
++#include <sys/types.h>
++#include <netinet/in.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
--- graphics/libgphoto2/files/patch-libgphoto2_port-libgphoto2_port-gphoto2-port-info-list.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c.orig	Sat Jun  3 17:38:12 2006
-+++ libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c	Wed Jun 21 00:08:02 2006
-@@ -51,6 +51,7 @@
- #  define dgettext(Domain,Message) (Message)
- #  define dcgettext(Domain,Message,Type) (Message)
- #  define bindtextdomain(Domain,Directory) (Domain)
-+#  define bind_textdomain_codeset(Domain,codeset) (codeset)
- #  define _(String) (String)
- #  define N_(String) (String)
- #endif


More information about the Midnightbsd-cvs mailing list