Date: Sat, 26 Oct 2013 18:10:02 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2 Message-ID: <201310261810.r9QIA2Z5010081@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181073; it has been noted by GNATS.
From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/181073: graphics/gphoto2: Update to version 2.5.2
Date: Sun, 27 Oct 2013 02:45:14 +0900
This is a multi-part message in MIME format.
--Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Remake of the patch against current tree.
--Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
Content-Type: text/x-diff;
name="graphics_libgphoto2.diff"
Content-Disposition: attachment;
filename="graphics_libgphoto2.diff"
Content-Transfer-Encoding: 7bit
diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile
--- /usr/ports/graphics/libgphoto2/Makefile 2013-10-27 01:02:24.000000000 +0900
+++ graphics/libgphoto2/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
# $FreeBSD: head/graphics/libgphoto2/Makefile 331670 2013-10-26 09:58:00Z tijl $
PORTNAME= libgphoto2
-PORTVERSION= 2.4.14
-PORTREVISION= 4
+PORTVERSION= 2.5.2
CATEGORIES= graphics
MASTER_SITES= SF/gphoto/libgphoto/${PORTVERSION}
@@ -12,58 +11,86 @@
LICENSE= LGPL21
-LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
- libjpeg.so:${PORTSDIR}/graphics/jpeg
+OPTIONS_DEFINE= EXIF GD JPEG XML DOCS NLS
+OPTIONS_DEFAULT=EXIF GD JPEG XML
+OPTIONS_SUB= yes
+EXIF_DESC= EXIF tag support
-USES= gmake pkgconfig
+USES= gmake iconv pkgconfig
USE_BZIP2= yes
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
.include <bsd.port.options.mk>
-.if ${OSVERSION} < 1000040
-CONFIGURE_ENV+= LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
+.if ${PORT_OPTIONS:MEXIF}
+LIB_DEPENDS+= libexif.so:${PORTSDIR}/graphics/libexif
+.else
+CONFIGURE_ARGS+= --without-libexif
+.endif
+
+.if ${PORT_OPTIONS:MGD}
+LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd
+.else
+CONFIGURE_ARGS+= --without-gd
+.endif
+
+.if ${PORT_OPTIONS:MJPEG}
+LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg
+.else
+CONFIGURE_ARGS+= --without-jpeg
+.endif
+
+.if ${PORT_OPTIONS:MXML}
+USE_GNOME+= libxml2
+CPPFLAGS+= $$(pkg-config --cflags-only-I libxml-2.0)
+LDFLAGS+= $$(pkg-config --libs-only-L libxml-2.0)
+.else
+CONFIGURE_ARGS+= --without-libxml2
.endif
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
-PLIST_SUB+= NLS=""
.else
-USES+= iconv
CONFIGURE_ARGS+= --disable-nls
-PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000040
+CONFIGURE_ENV+= LIBUSB1_CFLAGS="-I/usr/include" \
+ LIBUSB1_LIBS="-lusb"
.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>
diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo
--- /usr/ports/graphics/libgphoto2/distinfo 2013-06-21 03:50:16.000000000 +0900
+++ graphics/libgphoto2/distinfo 2013-10-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (libgphoto2-2.4.14.tar.bz2) = 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292
-SIZE (libgphoto2-2.4.14.tar.bz2) = 4481384
+SHA256 (libgphoto2-2.5.2.tar.bz2) = a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838
+SIZE (libgphoto2-2.5.2.tar.bz2) = 6446235
diff -urN /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES graphics/libgphoto2/files/patch-MAX_ENTRIES
--- /usr/ports/graphics/libgphoto2/files/patch-MAX_ENTRIES 2013-06-21 03:50:16.000000000 +0900
+++ graphics/libgphoto2/files/patch-MAX_ENTRIES 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- libgphoto2/gphoto2-list.c.orig 2007-07-27 07:52:55.000000000 +0200
-+++ libgphoto2/gphoto2-list.c 2008-11-09 17:04:16.000000000 +0100
-@@ -72,7 +72,7 @@
-
- #ifdef CAMERALIST_STRUCT_COMPATIBILITY
-
--#define MAX_ENTRIES 1024
-+#define MAX_ENTRIES 8192
- #define MAX_LIST_STRING_LENGTH 128
- struct _CameraList {
- int count;
diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c
--- /usr/ports/graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c 2013-06-21 03:50:16.000000000 +0900
+++ graphics/libgphoto2/files/patch-camlibs-smal-ultrapocket.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- camlibs/smal/ultrapocket.c.orig 2008-10-18 19:55:46.000000000 +0200
-+++ camlibs/smal/ultrapocket.c 2008-11-12 09:56:52.000000000 +0100
-@@ -33,6 +33,7 @@
-
- #define GP_MODULE "Smal Ultrapocket"
-
-+#include <locale.h>
- #ifdef ENABLE_NLS
- # include <libintl.h>
- # undef _
diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c graphics/libgphoto2/files/patch-camlibs_ptp2-config.c
--- /usr/ports/graphics/libgphoto2/files/patch-camlibs_ptp2-config.c 2013-06-21 03:50:16.000000000 +0900
+++ graphics/libgphoto2/files/patch-camlibs_ptp2-config.c 2013-10-27 00:00:00.000000000 +0900
@@ -1,11 +1,10 @@
--- 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>
+@@ -24,6 +24,7 @@
#include <string.h>
#include <stdio.h>
+ #include <time.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
diff -urN /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
--- /usr/ports/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c 2013-06-21 03:50:16.000000000 +0900
+++ graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- 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
diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist
--- /usr/ports/graphics/libgphoto2/pkg-plist 2013-10-27 01:02:24.000000000 +0900
+++ graphics/libgphoto2/pkg-plist 2013-10-27 00:00:00.000000000 +0900
@@ -19,6 +19,10 @@
include/gphoto2/gphoto2-version.h
include/gphoto2/gphoto2-widget.h
include/gphoto2/gphoto2.h
+lib/libgphoto2.a
+lib/libgphoto2.la
+lib/libgphoto2.so
+lib/libgphoto2.so.6
lib/libgphoto2/%%VERSION%%/adc65.a
lib/libgphoto2/%%VERSION%%/adc65.la
lib/libgphoto2/%%VERSION%%/adc65.so
@@ -43,6 +47,9 @@
lib/libgphoto2/%%VERSION%%/clicksmart310.a
lib/libgphoto2/%%VERSION%%/clicksmart310.la
lib/libgphoto2/%%VERSION%%/clicksmart310.so
+lib/libgphoto2/%%VERSION%%/digigr8.a
+lib/libgphoto2/%%VERSION%%/digigr8.la
+lib/libgphoto2/%%VERSION%%/digigr8.so
lib/libgphoto2/%%VERSION%%/digita.a
lib/libgphoto2/%%VERSION%%/digita.la
lib/libgphoto2/%%VERSION%%/digita.so
@@ -55,9 +62,6 @@
lib/libgphoto2/%%VERSION%%/directory.a
lib/libgphoto2/%%VERSION%%/directory.la
lib/libgphoto2/%%VERSION%%/directory.so
-lib/libgphoto2/%%VERSION%%/digigr8.a
-lib/libgphoto2/%%VERSION%%/digigr8.la
-lib/libgphoto2/%%VERSION%%/digigr8.so
lib/libgphoto2/%%VERSION%%/enigma13.a
lib/libgphoto2/%%VERSION%%/enigma13.la
lib/libgphoto2/%%VERSION%%/enigma13.so
@@ -136,6 +140,9 @@
lib/libgphoto2/%%VERSION%%/pccam600.a
lib/libgphoto2/%%VERSION%%/pccam600.la
lib/libgphoto2/%%VERSION%%/pccam600.so
+lib/libgphoto2/%%VERSION%%/pentax.a
+lib/libgphoto2/%%VERSION%%/pentax.la
+lib/libgphoto2/%%VERSION%%/pentax.so
lib/libgphoto2/%%VERSION%%/polaroid_pdc320.a
lib/libgphoto2/%%VERSION%%/polaroid_pdc320.la
lib/libgphoto2/%%VERSION%%/polaroid_pdc320.so
@@ -209,6 +216,10 @@
lib/libgphoto2/%%VERSION%%/tp6801.la
lib/libgphoto2/%%VERSION%%/tp6801.so
lib/libgphoto2/print-camera-list
+lib/libgphoto2_port.a
+lib/libgphoto2_port.la
+lib/libgphoto2_port.so
+lib/libgphoto2_port.so.10
lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
@@ -227,115 +238,110 @@
lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.a
lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.la
lib/libgphoto2_port/%%VERSION_PORT%%/usbscsi.so
-lib/libgphoto2.a
-lib/libgphoto2.la
-lib/libgphoto2.so
-lib/libgphoto2.so.2
-lib/libgphoto2_port.a
-lib/libgphoto2_port.la
-lib/libgphoto2_port.so
-lib/libgphoto2_port.so.0
libdata/pkgconfig/libgphoto2.pc
libdata/pkgconfig/libgphoto2_port.pc
man/man3/libgphoto2.3.gz
man/man3/libgphoto2_port.3.gz
-share/doc/libgphoto2/ABOUT-NLS
-share/doc/libgphoto2/AUTHORS
-share/doc/libgphoto2/ChangeLog
-share/doc/libgphoto2/COPYING
-share/doc/libgphoto2/NEWS
-share/doc/libgphoto2/README
-share/doc/libgphoto2/README.packaging
-share/doc/libgphoto2/camlibs/README.adc65
-share/doc/libgphoto2/camlibs/README.agfa-cl20
-share/doc/libgphoto2/camlibs/README.aox
-share/doc/libgphoto2/camlibs/README.ax203
-share/doc/libgphoto2/camlibs/README.ax203-compression
-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.jl2005a
-share/doc/libgphoto2/camlibs/README.jl2005c
-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.jl2005bcd-compression
-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.st2205
-share/doc/libgphoto2/camlibs/README.st2205-compression
-share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
-share/doc/libgphoto2/camlibs/README.tp6801
-share/doc/libgphoto2/camlibs/README.905C
-share/doc/libgphoto2/camlibs/README.9050
-share/doc/libgphoto2/camlibs/README.9051
-share/doc/libgphoto2/camlibs/README.9052
-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
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.packaging
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9050
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9051
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.9052
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.905C
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913D
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ax203-compression
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005a
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005bcd-compression
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jl2005c
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pentax
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.st2205
+%%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
-%%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
-%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/ja/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
-%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-0.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
-%%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
+%%NLS%%share/locale/cs/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/da/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2-6.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-10.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libgphoto2_port-10.mo
@dirrm share/libgphoto2/%%VERSION%%/konica
@dirrm share/libgphoto2/%%VERSION%%
@dirrm share/libgphoto2
-@dirrm share/doc/libgphoto2_port
-@dirrm share/doc/libgphoto2/camlibs
-@dirrm share/doc/libgphoto2
+%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/libgphoto2_port/%%VERSION_PORT%%
@dirrm lib/libgphoto2_port
@dirrm lib/libgphoto2/%%VERSION%%
--Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
Content-Type: text/x-diff;
name="graphics_gphoto2.diff"
Content-Disposition: attachment;
filename="graphics_gphoto2.diff"
Content-Transfer-Encoding: 7bit
diff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
--- /usr/ports/graphics/gphoto2/Makefile 2013-10-20 16:53:50.000000000 +0900
+++ graphics/gphoto2/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: head/graphics/gphoto2/Makefile 330928 2013-10-19 19:32:28Z danfe $
PORTNAME= gphoto2
-PORTVERSION= 2.4.14
+PORTVERSION= 2.5.2
CATEGORIES= graphics
MASTER_SITES= SF/gphoto/gphoto/${PORTVERSION}
@@ -19,19 +19,29 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-cdk
-OPTIONS_DEFINE= AALIB DOCS NLS
-OPTIONS_DEFAULT= AALIB
+OPTIONS_DEFINE= AALIB READLINE DOCS NLS
+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
+
+READLINE_USES= readline
+READLINE_CONFIGURE_WITH= readline
NLS_USES= gettext
-NLS_CONFIGURE_OFF= --disable-nls
+NLS_CONFIGURE_ENABLE= nls
+
+.include <bsd.port.options.mk>
+
+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 -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
--- /usr/ports/graphics/gphoto2/distinfo 2013-06-21 03:50:28.000000000 +0900
+++ graphics/gphoto2/distinfo 2013-10-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gphoto2-2.4.14.tar.bz2) = 8754cdf1ee8eb3ef636c05d052646957d3f087892ed867543ab9180a3bbaa123
-SIZE (gphoto2-2.4.14.tar.bz2) = 669292
+SHA256 (gphoto2-2.5.2.tar.bz2) = 8eb9928f3872fea13d22c556a5bc2aea70caf23b287604cb3eef7ad759988899
+SIZE (gphoto2-2.5.2.tar.bz2) = 720529
diff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
--- /usr/ports/graphics/gphoto2/pkg-plist 2013-10-20 16:53:50.000000000 +0900
+++ graphics/gphoto2/pkg-plist 2013-10-27 00:00:00.000000000 +0900
@@ -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 @@
%%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%%
--Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r
Content-Type: text/x-diff;
name="graphics_gtkam.diff"
Content-Disposition: attachment;
filename="graphics_gtkam.diff"
Content-Transfer-Encoding: 7bit
diff -urN /usr/ports/graphics/gtkam/Makefile graphics/gtkam/Makefile
--- /usr/ports/graphics/gtkam/Makefile 2013-10-23 00:36:27.000000000 +0900
+++ graphics/gtkam/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -2,43 +2,38 @@
# $FreeBSD: head/graphics/gtkam/Makefile 331272 2013-10-22 13:58:55Z amdmi3 $
PORTNAME= gtkam
-PORTVERSION= 0.1.18
-PORTREVISION= 3
+PORTVERSION= 0.2.0
CATEGORIES= graphics
MASTER_SITES= SF/gphoto/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Download and view files from various digital cameras
-LIB_DEPENDS= exif-gtk:${PORTSDIR}/graphics/libexif-gtk \
- gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+LICENSE= GPLv2 # (or later)
-WANT_GNOME= yes
-USES= pathfix pkgconfig
+LIB_DEPENDS= libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
+ libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
+
+OPTIONS_DEFINE= GIMP GNOME DOCS
+OPTIONS_SUB= yes
+GIMP_DESC= GIMP plugin support
+
+USES= gmake pathfix pkgconfig
USE_GNOME= gnomehier gtk20
-USE_GMAKE= yes
GNU_CONFIGURE= yes
+
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= gtkam.1
-
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libgimp-2.0.so) && !defined(WITHOUT_GIMP)
-WITH_GIMP= yes
-.endif
+.include <bsd.port.options.mk>
-.if defined(WITH_GIMP)
-LIB_DEPENDS+= gimp-2.0:${PORTSDIR}/graphics/gimp
-PLIST_SUB+= GIMP=""
+.if ${PORT_OPTIONS:MGIMP}
+LIB_DEPENDS+= libgimp-2.0.so:${PORTSDIR}/graphics/gimp
.else
CONFIGURE_ARGS+= --without-gimp
-PLIST_SUB+= GIMP="@comment "
.endif
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
+.if ${PORT_OPTIONS:MGNOME}
PKGNAMESUFFIX= -gnome
USE_GNOME+= gnomeprefix libgnomeui
INSTALLS_OMF= yes
@@ -48,31 +43,12 @@
MAKE_ENV+= GNOME_SUBDIRS=""
.endif
-pre-everything::
-.if !defined(WITH_GIMP)
- @${ECHO_MSG}
- @${ECHO_MSG} "If you want to compile with plugin for The GIMP,"
- @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_GIMP=yes\""
- @${ECHO_MSG}
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|GIMP_VERSION="2.0"|GIMP_VERSION="2.2"|g ; \
- s|images/gtkam|gtkam/images|g' ${WRKSRC}/configure
+ s|images/gtkam|gtkam/images|g ; \
+ s|FLAGS -g|FLAGS|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|images/gtkam|gtkam/images|g ; \
s|$$(libdir)/gimp/|$$(libexecdir)/gimp/|g'
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/gtkam.desktop \
- ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/gtkam.png \
- ${PREFIX}/share/pixmaps
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in AUTHORS NEWS README
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/gtkam/distinfo graphics/gtkam/distinfo
--- /usr/ports/graphics/gtkam/distinfo 2013-06-21 03:50:15.000000000 +0900
+++ graphics/gtkam/distinfo 2013-10-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gtkam-0.1.18.tar.gz) = 5221649c52ace24f28278b1a4dad7b4d3730a9a4e8dbcafe964a583e9e176ef5
-SIZE (gtkam-0.1.18.tar.gz) = 1443404
+SHA256 (gtkam-0.2.0.tar.gz) = ff5128d3988e37cca59853647fcab12be21d7b2de79aaad0b7c71cb0594053fd
+SIZE (gtkam-0.2.0.tar.gz) = 1443593
diff -urN /usr/ports/graphics/gtkam/files/patch-Makefile.in graphics/gtkam/files/patch-Makefile.in
--- /usr/ports/graphics/gtkam/files/patch-Makefile.in 2013-06-21 03:50:15.000000000 +0900
+++ graphics/gtkam/files/patch-Makefile.in 2013-10-27 00:00:00.000000000 +0900
@@ -1,7 +1,7 @@
--- Makefile.in.orig 2008-04-23 22:55:02.000000000 +0200
+++ Makefile.in 2008-04-23 22:56:37.000000000 +0200
-@@ -253,7 +253,7 @@
- target_alias = @target_alias@
+@@ -333,7 +333,7 @@
+ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
@@ -9,13 +9,12 @@
ACLOCAL_AMFLAGS = -I m4m
# disable scrollkeeper for distcheck
-@@ -714,8 +714,7 @@
-
- info-am:
-
--install-data-am: install-ApplicationsDATA install-gtkamdocDATA \
-- install-iconDATA
-+install-data-am:
-
- install-dvi: install-dvi-recursive
-
+@@ -342,7 +342,7 @@
+ ########################################################################
+ # Install a few support and doc files
+ gtkamdocdir = $(datadir)/doc/gtkam
+-gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
++gtkamdoc_DATA = AUTHORS NEWS README TODO CHANGES
+ icondir = $(datadir)/pixmaps
+ icon_DATA = gtkam.png
+ DESKTOP_IN_FILES = gtkam.desktop.in
diff -urN /usr/ports/graphics/gtkam/pkg-plist graphics/gtkam/pkg-plist
--- /usr/ports/graphics/gtkam/pkg-plist 2013-10-23 00:36:27.000000000 +0900
+++ graphics/gtkam/pkg-plist 2013-10-27 00:00:00.000000000 +0900
@@ -1,30 +1,30 @@
bin/gtkam
%%GIMP%%libexec/gimp/2.2/plug-ins/gtkam-gimp
+man/man1/gtkam.1.gz
+share/applications/gtkam.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
-share/applications/gtkam.desktop
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
-%%GNOME:%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
-%%GNOME:%%share/gnome/help/gtkam/C/gtkam.xml
-%%GNOME:%%share/gnome/help/gtkam/C/legal.xml
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
-%%GNOME:%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
-%%GNOME:%%share/gnome/help/gtkam/ru/gtkam.xml
-%%GNOME:%%share/gnome/help/gtkam/ru/legal.xml
-%%GNOME:%%share/omf/gtkam/gtkam-C.omf
-%%GNOME:%%share/omf/gtkam/gtkam-ru.omf
-share/pixmaps/gtkam.png
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_enhanced_window.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_add_camera_window.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_fileinfo.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_makedir.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_save_all.png
+%%GNOME%%share/gnome/help/gtkam/C/figures/gtkam_start_window.png
+%%GNOME%%share/gnome/help/gtkam/C/gtkam.xml
+%%GNOME%%share/gnome/help/gtkam/C/legal.xml
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_enhanced_window.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_add_camera_window.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_fileinfo.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_makedir.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_save_all.png
+%%GNOME%%share/gnome/help/gtkam/ru/figures/gtkam_start_window.png
+%%GNOME%%share/gnome/help/gtkam/ru/gtkam.xml
+%%GNOME%%share/gnome/help/gtkam/ru/legal.xml
%%DATADIR%%/images/gtkam-audio.png
%%DATADIR%%/images/gtkam-camera.png
%%DATADIR%%/images/gtkam-folder-camera.png
@@ -59,17 +59,20 @@
share/locale/sk/LC_MESSAGES/gtkam.mo
share/locale/sl/LC_MESSAGES/gtkam.mo
share/locale/sv/LC_MESSAGES/gtkam.mo
-share/locale/vi/LC_MESSAGES/gtkam.mo
share/locale/uk/LC_MESSAGES/gtkam.mo
+share/locale/vi/LC_MESSAGES/gtkam.mo
share/locale/zh_CN/LC_MESSAGES/gtkam.mo
+%%GNOME%%share/omf/gtkam/gtkam-C.omf
+%%GNOME%%share/omf/gtkam/gtkam-ru.omf
share/pixmaps/gtkam-camera.png
+share/pixmaps/gtkam.png
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/images
@dirrm %%DATADIR%%
-%%GNOME:%%@dirrm share/omf/gtkam
-%%GNOME:%%@dirrm share/gnome/help/gtkam/ru/figures
-%%GNOME:%%@dirrm share/gnome/help/gtkam/ru
-%%GNOME:%%@dirrm share/gnome/help/gtkam/C/figures
-%%GNOME:%%@dirrm share/gnome/help/gtkam/C
-%%GNOME:%%@dirrm share/gnome/help/gtkam
+%%GNOME%%@dirrm share/omf/gtkam
+%%GNOME%%@dirrm share/gnome/help/gtkam/ru/figures
+%%GNOME%%@dirrm share/gnome/help/gtkam/ru
+%%GNOME%%@dirrm share/gnome/help/gtkam/C/figures
+%%GNOME%%@dirrm share/gnome/help/gtkam/C
+%%GNOME%%@dirrm share/gnome/help/gtkam
%%PORTDOCS%%@dirrm %%DOCSDIR%%
--Multipart=_Sun__27_Oct_2013_02_45_14_+0900_k8RfMGgCOIRAqg1r--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310261810.r9QIA2Z5010081>