Date: Tue, 3 Dec 2002 07:09:39 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/45938: Update port: graphics/gphoto2 to 2.1.1 Message-ID: <20021203070939.1760072d.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 45938
>Category: ports
>Synopsis: Update port: graphics/gphoto2 to 2.1.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 02 14:20:07 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 2.1.1
[libgphoto2]
Remove file:
files/patch-frontends_command-line_actions.c
files/patch-libgphoto2_gphoto2-filesys.c
[gphoto2]
Remove file:
files/patch-frontends_command-line_actions.c
files/patch-libgphoto2_gphoto2-filesys.c
files/patch-libgphoto2_port::ltmain.sh
files/patch-ltmain.sh
Note:
gphoto2 is split into libgphoto2(backends) and gphoto2(frontends) from
this version.
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# graphics_libgphoto2.patch
# graphics_gphoto2.patch
#
echo x - graphics_libgphoto2.patch
sed 's/^X//' >graphics_libgphoto2.patch << 'END-of-graphics_libgphoto2.patch'
Xdiff -urN /usr/ports/graphics/gphoto2/Makefile graphics/libgphoto2/Makefile
X--- /usr/ports/graphics/gphoto2/Makefile Mon Nov 11 18:59:48 2002
X+++ graphics/libgphoto2/Makefile Tue Dec 3 02:58:59 2002
X@@ -5,12 +5,10 @@
X # $FreeBSD: ports/graphics/gphoto2/Makefile,v 1.33 2002/11/10 16:46:26 lioux Exp $
X #
X
X-PORTNAME= gphoto2
X-PORTVERSION= 2.1.0
X-PORTREVISION= 2
X+PORTNAME= libgphoto2
X+PORTVERSION= 2.1.1
X CATEGORIES= graphics
X-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
X- http://www.gphoto.net/dist/
X+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
X MASTER_SITE_SUBDIR= gphoto
X
X MAINTAINER= ports@FreeBSD.org
X@@ -18,43 +16,36 @@
X BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
X LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
X usb-0.1.5:${PORTSDIR}/devel/libusb \
X- aa.1:${PORTSDIR}/graphics/aalib \
X- jpeg.9:${PORTSDIR}/graphics/jpeg \
X exif.8:${PORTSDIR}/graphics/libexif
X RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
X
X USE_BZIP2= yes
X USE_REINPLACE= yes
X-USE_GNOMENG= yes
X-USE_GNOME= glib12
X USE_GMAKE= yes
X GNU_CONFIGURE= yes
X CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
X-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X- LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
X-CONFIGURE_ARGS= --without-cdk --without-fig2dev --without-xmlto
X+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
X+ LDFLAGS="-L${LOCALBASE}/lib"
X INSTALLS_SHLIB= yes
X
X-MAN1= gphoto2.1
X MAN3= gphoto2.3 gphoto2_port.3
X
X post-patch:
X .for file in configure libgphoto2_port/configure
X- @${REINPLACE_CMD} -e 's|-g -Wall||g ; \
X- s|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/${file}
X+ @${REINPLACE_CMD} -e \
X+ 's|[{]libdir[}]/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
X+ s|-g -Wall||g' ${WRKSRC}/${file}
X .endfor
X @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
X- 's|`glib-config|`\$$(GLIB_CONFIG)|g ; \
X- s| install-docDATA||g ; \
X- s| install-figureDATA||g ; \
X- s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
X+ 's|po packaging doc|po doc|g ; \
X+ s|: install-docDATA|:|g'
X @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
X- 's|malloc\.h|stdlib.h|g'
X+ 's|<malloc\.h>|<stdlib.h>|g'
X
X post-install:
X .if !defined(NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}
X-.for file in AUTHORS NEWS README doc/FAQ doc/gphoto2-cli.txt doc/gphoto2.txt
X+.for file in AUTHORS NEWS README
X ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X .endfor
X @${MKDIR} ${PREFIX}/share/doc/libgphoto2_port
Xdiff -urN /usr/ports/graphics/gphoto2/distinfo graphics/libgphoto2/distinfo
X--- /usr/ports/graphics/gphoto2/distinfo Tue Sep 10 20:12:06 2002
X+++ graphics/libgphoto2/distinfo Tue Dec 3 01:58:22 2002
X@@ -1 +1 @@
X-MD5 (gphoto2-2.1.0.tar.bz2) = b998bcb01cbb1916dedea03b7119ae42
X+MD5 (libgphoto2-2.1.1.tar.bz2) = ec69ffba3dc3d6a6a604fd63b3e1159e
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-frontends_command-line_actions.c graphics/libgphoto2/files/patch-frontends_command-line_actions.c
X--- /usr/ports/graphics/gphoto2/files/patch-frontends_command-line_actions.c Sun Sep 1 09:40:21 2002
X+++ graphics/libgphoto2/files/patch-frontends_command-line_actions.c Thu Jan 1 09:00:00 1970
X@@ -1,30 +0,0 @@
X---- frontends/command-line/actions.c.orig Sat Aug 31 20:34:21 2002
X-+++ frontends/command-line/actions.c Sat Aug 31 20:36:35 2002
X-@@ -316,6 +316,7 @@
X- const char *data;
X- unsigned long size;
X- ExifData *ed;
X-+ unsigned int i;
X-
X- CR (gp_file_new (&file));
X- CRU (gp_camera_file_get (p->camera, p->folder, filename,
X-@@ -337,16 +338,9 @@
X- printf ("%-59.59s", _("Value"));
X- printf ("\n");
X- print_hline ();
X-- if (ed->ifd0)
X-- show_ifd (ed->ifd0);
X-- if (ed->ifd1)
X-- show_ifd (ed->ifd1);
X-- if (ed->ifd_exif)
X-- show_ifd (ed->ifd_exif);
X-- if (ed->ifd_gps)
X-- show_ifd (ed->ifd_gps);
X-- if (ed->ifd_interoperability)
X-- show_ifd (ed->ifd_interoperability);
X-+ for (i = 0; i < EXIF_IFD_COUNT; i++)
X-+ if (ed->ifd[i])
X-+ show_ifd (ed->ifd[i]);
X- print_hline ();
X- if (ed->size) {
X- printf (_("EXIF data contains a thumbnail (%i bytes)."),
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c graphics/libgphoto2/files/patch-libgphoto2_gphoto2-filesys.c
X--- /usr/ports/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c Sun Sep 1 09:40:21 2002
X+++ graphics/libgphoto2/files/patch-libgphoto2_gphoto2-filesys.c Thu Jan 1 09:00:00 1970
X@@ -1,18 +0,0 @@
X---- libgphoto2/gphoto2-filesys.c.orig Sat Aug 31 20:30:42 2002
X-+++ libgphoto2/gphoto2-filesys.c Sat Aug 31 20:32:23 2002
X-@@ -98,12 +98,12 @@
X- /*
X- * HP PhotoSmart C30 has the date and time in ifd_exif.
X- */
X-- e = exif_content_get_entry (ed->ifd0, EXIF_TAG_DATE_TIME);
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_0], EXIF_TAG_DATE_TIME);
X- if (!e)
X-- e = exif_content_get_entry (ed->ifd_exif,
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
X- EXIF_TAG_DATE_TIME_ORIGINAL);
X- if (!e)
X-- e = exif_content_get_entry (ed->ifd_exif,
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
X- EXIF_TAG_DATE_TIME_DIGITIZED);
X- if (!e) {
X- GP_DEBUG ("EXIF data has not date/time tag.");
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-descr graphics/libgphoto2/pkg-descr
X--- /usr/ports/graphics/gphoto2/pkg-descr Fri Mar 8 09:37:08 2002
X+++ graphics/libgphoto2/pkg-descr Tue Dec 3 02:20:16 2002
X@@ -1,7 +1,4 @@
X-gphoto2 is a library that can be used by applications to access
X+libgphoto2 is a library that can be used by applications to access
X various digital cameras.
X-
X-Additionally, the command-line frontend, which is shipped with
X-the library, is called gphoto2, too.
X
X WWW: http://www.gphoto.org/
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/libgphoto2/pkg-plist
X--- /usr/ports/graphics/gphoto2/pkg-plist Tue Sep 10 20:12:06 2002
X+++ graphics/libgphoto2/pkg-plist Tue Dec 3 03:05:04 2002
X@@ -1,4 +1,3 @@
X-bin/gphoto2
X bin/gphoto2-config
X bin/gphoto2-port-config
X include/gphoto2/gphoto2-abilities-list.h
X@@ -12,96 +11,103 @@
X include/gphoto2/gphoto2-port-log.h
X include/gphoto2/gphoto2-port-portability.h
X include/gphoto2/gphoto2-port-result.h
X+include/gphoto2/gphoto2-port-version.h
X include/gphoto2/gphoto2-port.h
X include/gphoto2/gphoto2-result.h
X include/gphoto2/gphoto2-setting.h
X+include/gphoto2/gphoto2-version.h
X include/gphoto2/gphoto2-widget.h
X include/gphoto2/gphoto2.h
X-lib/gphoto2/2.1.0/libgphoto2_agfa.so
X-lib/gphoto2/2.1.0/libgphoto2_barbie.so
X-lib/gphoto2/2.1.0/libgphoto2_canon.so
X-lib/gphoto2/2.1.0/libgphoto2_casio_qv.so
X-lib/gphoto2/2.1.0/libgphoto2_digita.so
X-lib/gphoto2/2.1.0/libgphoto2_dimagev.so
X-lib/gphoto2/2.1.0/libgphoto2_dimera3500.so
X-lib/gphoto2/2.1.0/libgphoto2_directory.so
X-lib/gphoto2/2.1.0/libgphoto2_fuji.so
X-lib/gphoto2/2.1.0/libgphoto2_jamcam.so
X-lib/gphoto2/2.1.0/libgphoto2_jd11.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc120.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc240.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc3200.so
X-lib/gphoto2/2.1.0/libgphoto2_konica.so
X-lib/gphoto2/2.1.0/libgphoto2_mustek.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_coolshot.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1000.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1580.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_l859.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc320.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc640.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc700.so
X-lib/gphoto2/2.1.0/libgphoto2_ptp.so
X-lib/gphoto2/2.1.0/libgphoto2_ricoh.so
X-lib/gphoto2/2.1.0/libgphoto2_samsung.so
X-lib/gphoto2/2.1.0/libgphoto2_sierra.so
X-lib/gphoto2/2.1.0/libgphoto2_sipix.so
X-lib/gphoto2/2.1.0/libgphoto2_sony_dscf1.so
X-lib/gphoto2/2.1.0/libgphoto2_sony_dscf55.so
X-lib/gphoto2/2.1.0/libgphoto2_stv0680.so
X-lib/gphoto2_port/0.5.0/libgphoto2_port_serial.so
X-lib/gphoto2_port/0.5.0/libgphoto2_port_usb.so
X+lib/gphoto2/2.1.1/libgphoto2_barbie.so
X+lib/gphoto2/2.1.1/libgphoto2_canon.so
X+lib/gphoto2/2.1.1/libgphoto2_casio_qv.so
X+lib/gphoto2/2.1.1/libgphoto2_digita.so
X+lib/gphoto2/2.1.1/libgphoto2_dimagev.so
X+lib/gphoto2/2.1.1/libgphoto2_dimera3500.so
X+lib/gphoto2/2.1.1/libgphoto2_directory.so
X+lib/gphoto2/2.1.1/libgphoto2_fuji.so
X+lib/gphoto2/2.1.1/libgphoto2_gsmart.so
X+lib/gphoto2/2.1.1/libgphoto2_jamcam.so
X+lib/gphoto2/2.1.1/libgphoto2_jd11.so
X+lib/gphoto2/2.1.1/libgphoto2_kodak_dc120.so
X+lib/gphoto2/2.1.1/libgphoto2_kodak_dc210.so
X+lib/gphoto2/2.1.1/libgphoto2_kodak_dc240.so
X+lib/gphoto2/2.1.1/libgphoto2_kodak_dc3200.so
X+lib/gphoto2/2.1.1/libgphoto2_konica.so
X+lib/gphoto2/2.1.1/libgphoto2_largan.so
X+lib/gphoto2/2.1.1/libgphoto2_mustek.so
X+lib/gphoto2/2.1.1/libgphoto2_panasonic_coolshot.so
X+lib/gphoto2/2.1.1/libgphoto2_panasonic_dc1000.so
X+lib/gphoto2/2.1.1/libgphoto2_panasonic_dc1580.so
X+lib/gphoto2/2.1.1/libgphoto2_panasonic_l859.so
X+lib/gphoto2/2.1.1/libgphoto2_pccam600.so
X+lib/gphoto2/2.1.1/libgphoto2_polaroid_pdc320.so
X+lib/gphoto2/2.1.1/libgphoto2_polaroid_pdc640.so
X+lib/gphoto2/2.1.1/libgphoto2_polaroid_pdc700.so
X+lib/gphoto2/2.1.1/libgphoto2_ptp.so
X+lib/gphoto2/2.1.1/libgphoto2_ricoh.so
X+lib/gphoto2/2.1.1/libgphoto2_samsung.so
X+lib/gphoto2/2.1.1/libgphoto2_sierra.so
X+lib/gphoto2/2.1.1/libgphoto2_sipix.so
X+lib/gphoto2/2.1.1/libgphoto2_sipixblink.so
X+lib/gphoto2/2.1.1/libgphoto2_sony_dscf1.so
X+lib/gphoto2/2.1.1/libgphoto2_sony_dscf55.so
X+lib/gphoto2/2.1.1/libgphoto2_soundvision.so
X+lib/gphoto2/2.1.1/libgphoto2_spca504_flash.so
X+lib/gphoto2/2.1.1/libgphoto2_stv0680.so
X+lib/gphoto2/2.1.1/libgphoto2_sx330z.so
X+lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so
X+lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so
X+libdata/pkgconfig/libgphoto2.pc
X lib/libgphoto2.a
X lib/libgphoto2.so
X lib/libgphoto2.so.2
X lib/libgphoto2_port.a
X lib/libgphoto2_port.so
X lib/libgphoto2_port.so.5
X-libdata/pkgconfig/libgphoto2.pc
X-%%PORTDOCS%%share/doc/gphoto2/AUTHORS
X-%%PORTDOCS%%share/doc/gphoto2/FAQ
X-%%PORTDOCS%%share/doc/gphoto2/NEWS
X-%%PORTDOCS%%share/doc/gphoto2/README
X-%%PORTDOCS%%share/doc/gphoto2/gphoto2-cli.txt
X-%%PORTDOCS%%share/doc/gphoto2/gphoto2.txt
X+%%PORTDOCS%%share/doc/libgphoto2/AUTHORS
X+%%PORTDOCS%%share/doc/libgphoto2/NEWS
X+%%PORTDOCS%%share/doc/libgphoto2/README
X %%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
X %%PORTDOCS%%share/doc/libgphoto2_port/NEWS
X %%PORTDOCS%%share/doc/libgphoto2_port/README
X-share/gphoto2/konica/english
X-share/gphoto2/konica/french
X-share/gphoto2/konica/german
X-share/gphoto2/konica/japanese
X-share/gphoto2/konica/korean
X-share/gphoto2/konica/spanish
X-share/locale/da/LC_MESSAGES/gphoto2.mo
X-share/locale/da/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/de/LC_MESSAGES/gphoto2.mo
X-share/locale/de/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/es/LC_MESSAGES/gphoto2.mo
X-share/locale/es/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/fr/LC_MESSAGES/gphoto2.mo
X-share/locale/fr/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/it/LC_MESSAGES/gphoto2.mo
X-share/locale/it/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/ja/LC_MESSAGES/gphoto2.mo
X-share/locale/ja/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/no/LC_MESSAGES/gphoto2.mo
X-share/locale/no/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/ru/LC_MESSAGES/gphoto2.mo
X-share/locale/ru/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/sl/LC_MESSAGES/gphoto2.mo
X-share/locale/sl/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/sv/LC_MESSAGES/gphoto2.mo
X-share/locale/sv/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/uk/LC_MESSAGES/gphoto2.mo
X-share/locale/uk/LC_MESSAGES/libgphoto2_port.mo
X-share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
X-share/locale/zh_CN/LC_MESSAGES/libgphoto2_port.mo
X-@dirrm share/gphoto2/konica
X-@dirrm share/gphoto2
X+share/libgphoto2/2.1.1/konica/english
X+share/libgphoto2/2.1.1/konica/french
X+share/libgphoto2/2.1.1/konica/german
X+share/libgphoto2/2.1.1/konica/japanese
X+share/libgphoto2/2.1.1/konica/korean
X+share/libgphoto2/2.1.1/konica/spanish
X+share/locale/da/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/de/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/de/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/es/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/it/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/no/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/no/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/sl/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/sl/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/sv/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
X+share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
X+share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
X+@dirrm share/libgphoto2/2.1.1/konica
X+@dirrm share/libgphoto2/2.1.1
X+@dirrm share/libgphoto2
X %%PORTDOCS%%@dirrm share/doc/libgphoto2_port
X-%%PORTDOCS%%@dirrm share/doc/gphoto2
X-@dirrm lib/gphoto2_port/0.5.0
X+%%PORTDOCS%%@dirrm share/doc/libgphoto2
X+@dirrm lib/gphoto2_port/0.5.1
X @dirrm lib/gphoto2_port
X-@dirrm lib/gphoto2/2.1.0
X+@dirrm lib/gphoto2/2.1.1
X @dirrm lib/gphoto2
X @dirrm include/gphoto2
END-of-graphics_libgphoto2.patch
echo x - graphics_gphoto2.patch
sed 's/^X//' >graphics_gphoto2.patch << 'END-of-graphics_gphoto2.patch'
Xdiff -urN /usr/ports/graphics/gphoto2/Makefile graphics/gphoto2/Makefile
X--- /usr/ports/graphics/gphoto2/Makefile Mon Nov 11 18:59:48 2002
X+++ graphics/gphoto2/Makefile Tue Dec 3 03:08:24 2002
X@@ -6,61 +6,38 @@
X #
X
X PORTNAME= gphoto2
X-PORTVERSION= 2.1.0
X-PORTREVISION= 2
X+PORTVERSION= 2.1.1
X CATEGORIES= graphics
X-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
X- http://www.gphoto.net/dist/
X+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
X MASTER_SITE_SUBDIR= gphoto
X
X MAINTAINER= ports@FreeBSD.org
X
X-BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
X-LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
X- usb-0.1.5:${PORTSDIR}/devel/libusb \
X+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
X aa.1:${PORTSDIR}/graphics/aalib \
X jpeg.9:${PORTSDIR}/graphics/jpeg \
X- exif.8:${PORTSDIR}/graphics/libexif
X-RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
X+ gphoto2:${PORTSDIR}/graphics/libgphoto2
X
X USE_BZIP2= yes
X USE_REINPLACE= yes
X-USE_GNOMENG= yes
X-USE_GNOME= glib12
X USE_GMAKE= yes
X GNU_CONFIGURE= yes
X CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
X CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
X LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
X-CONFIGURE_ARGS= --without-cdk --without-fig2dev --without-xmlto
X-INSTALLS_SHLIB= yes
X+CONFIGURE_ARGS= --without-cdk
X
X MAN1= gphoto2.1
X-MAN3= gphoto2.3 gphoto2_port.3
X
X post-patch:
X-.for file in configure libgphoto2_port/configure
X- @${REINPLACE_CMD} -e 's|-g -Wall||g ; \
X- s|-pthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/${file}
X-.endfor
X- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
X- 's|`glib-config|`\$$(GLIB_CONFIG)|g ; \
X- s| install-docDATA||g ; \
X- s| install-figureDATA||g ; \
X- s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
X- @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
X- 's|malloc\.h|stdlib.h|g'
X+ @${REINPLACE_CMD} -e 's|-pthread|${PTHREADS_LIBS:S/"//g}|g ; \
X+ s|-g -Wall||g' ${WRKSRC}/configure
X
X post-install:
X .if !defined(NOPORTDOCS)
X @${MKDIR} ${DOCSDIR}
X-.for file in AUTHORS NEWS README doc/FAQ doc/gphoto2-cli.txt doc/gphoto2.txt
X- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X-.endfor
X- @${MKDIR} ${PREFIX}/share/doc/libgphoto2_port
X .for file in AUTHORS NEWS README
X- ${INSTALL_DATA} ${WRKSRC}/libgphoto2_port/${file} \
X- ${PREFIX}/share/doc/libgphoto2_port
X+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
X .endfor
X .endif
X
Xdiff -urN /usr/ports/graphics/gphoto2/distinfo graphics/gphoto2/distinfo
X--- /usr/ports/graphics/gphoto2/distinfo Tue Sep 10 20:12:06 2002
X+++ graphics/gphoto2/distinfo Tue Dec 3 02:42:45 2002
X@@ -1 +1 @@
X-MD5 (gphoto2-2.1.0.tar.bz2) = b998bcb01cbb1916dedea03b7119ae42
X+MD5 (gphoto2-2.1.1.tar.bz2) = ce77b9c9ce25a57990c61f9e301e74b9
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-frontends_command-line_actions.c graphics/gphoto2/files/patch-frontends_command-line_actions.c
X--- /usr/ports/graphics/gphoto2/files/patch-frontends_command-line_actions.c Sun Sep 1 09:40:21 2002
X+++ graphics/gphoto2/files/patch-frontends_command-line_actions.c Thu Jan 1 09:00:00 1970
X@@ -1,30 +0,0 @@
X---- frontends/command-line/actions.c.orig Sat Aug 31 20:34:21 2002
X-+++ frontends/command-line/actions.c Sat Aug 31 20:36:35 2002
X-@@ -316,6 +316,7 @@
X- const char *data;
X- unsigned long size;
X- ExifData *ed;
X-+ unsigned int i;
X-
X- CR (gp_file_new (&file));
X- CRU (gp_camera_file_get (p->camera, p->folder, filename,
X-@@ -337,16 +338,9 @@
X- printf ("%-59.59s", _("Value"));
X- printf ("\n");
X- print_hline ();
X-- if (ed->ifd0)
X-- show_ifd (ed->ifd0);
X-- if (ed->ifd1)
X-- show_ifd (ed->ifd1);
X-- if (ed->ifd_exif)
X-- show_ifd (ed->ifd_exif);
X-- if (ed->ifd_gps)
X-- show_ifd (ed->ifd_gps);
X-- if (ed->ifd_interoperability)
X-- show_ifd (ed->ifd_interoperability);
X-+ for (i = 0; i < EXIF_IFD_COUNT; i++)
X-+ if (ed->ifd[i])
X-+ show_ifd (ed->ifd[i]);
X- print_hline ();
X- if (ed->size) {
X- printf (_("EXIF data contains a thumbnail (%i bytes)."),
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c
X--- /usr/ports/graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c Sun Sep 1 09:40:21 2002
X+++ graphics/gphoto2/files/patch-libgphoto2_gphoto2-filesys.c Thu Jan 1 09:00:00 1970
X@@ -1,18 +0,0 @@
X---- libgphoto2/gphoto2-filesys.c.orig Sat Aug 31 20:30:42 2002
X-+++ libgphoto2/gphoto2-filesys.c Sat Aug 31 20:32:23 2002
X-@@ -98,12 +98,12 @@
X- /*
X- * HP PhotoSmart C30 has the date and time in ifd_exif.
X- */
X-- e = exif_content_get_entry (ed->ifd0, EXIF_TAG_DATE_TIME);
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_0], EXIF_TAG_DATE_TIME);
X- if (!e)
X-- e = exif_content_get_entry (ed->ifd_exif,
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
X- EXIF_TAG_DATE_TIME_ORIGINAL);
X- if (!e)
X-- e = exif_content_get_entry (ed->ifd_exif,
X-+ e = exif_content_get_entry (ed->ifd[EXIF_IFD_EXIF],
X- EXIF_TAG_DATE_TIME_DIGITIZED);
X- if (!e) {
X- GP_DEBUG ("EXIF data has not date/time tag.");
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh
X--- /usr/ports/graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh Wed Jul 3 03:44:43 2002
X+++ graphics/gphoto2/files/patch-libgphoto2_port::ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,23 +0,0 @@
X---- libgphoto2_port/ltmain.sh.orig Tue Jun 25 21:56:37 2002
X-+++ libgphoto2_port/ltmain.sh Tue Jul 2 02:34:54 2002
X-@@ -967,6 +967,7 @@
X- ;;
X-
X- -avoid-version)
X-+ build_old_libs=no
X- avoid_version=yes
X- continue
X- ;;
X-@@ -4273,10 +4274,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/graphics/gphoto2/files/patch-ltmain.sh graphics/gphoto2/files/patch-ltmain.sh
X--- /usr/ports/graphics/gphoto2/files/patch-ltmain.sh Fri Mar 8 09:37:10 2002
X+++ graphics/gphoto2/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970
X@@ -1,23 +0,0 @@
X---- ltmain.sh.orig Sat Mar 2 08:58:32 2002
X-+++ ltmain.sh Sat Mar 2 08:59:07 2002
X-@@ -958,6 +958,7 @@
X- ;;
X-
X- -avoid-version)
X-+ build_old_libs=no
X- avoid_version=yes
X- continue
X- ;;
X-@@ -4247,10 +4248,12 @@
X- fi
X-
X- # Install the pseudo-library for information purposes.
X-+ if /usr/bin/false; then
X- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
X- instname="$dir/$name"i
X- $show "$install_prog $instname $destdir/$name"
X- $run eval "$install_prog $instname $destdir/$name" || exit $?
X-+ fi
X-
X- # Maybe install the static library, too.
X- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-comment graphics/gphoto2/pkg-comment
X--- /usr/ports/graphics/gphoto2/pkg-comment Mon Nov 11 01:46:26 2002
X+++ graphics/gphoto2/pkg-comment Tue Dec 3 03:03:05 2002
X@@ -1 +1 @@
X-A universal digital camera picture control tool
X+A command-line frontend to libgphoto2
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-descr graphics/gphoto2/pkg-descr
X--- /usr/ports/graphics/gphoto2/pkg-descr Fri Mar 8 09:37:08 2002
X+++ graphics/gphoto2/pkg-descr Tue Dec 3 03:02:46 2002
X@@ -1,7 +1,3 @@
X-gphoto2 is a library that can be used by applications to access
X-various digital cameras.
X-
X-Additionally, the command-line frontend, which is shipped with
X-the library, is called gphoto2, too.
X+gphoto2 is a command-line frontend to libgphoto2.
X
X WWW: http://www.gphoto.org/
Xdiff -urN /usr/ports/graphics/gphoto2/pkg-plist graphics/gphoto2/pkg-plist
X--- /usr/ports/graphics/gphoto2/pkg-plist Tue Sep 10 20:12:06 2002
X+++ graphics/gphoto2/pkg-plist Tue Dec 3 03:08:09 2002
X@@ -1,107 +1,17 @@
X bin/gphoto2
X-bin/gphoto2-config
X-bin/gphoto2-port-config
X-include/gphoto2/gphoto2-abilities-list.h
X-include/gphoto2/gphoto2-camera.h
X-include/gphoto2/gphoto2-context.h
X-include/gphoto2/gphoto2-file.h
X-include/gphoto2/gphoto2-filesys.h
X-include/gphoto2/gphoto2-library.h
X-include/gphoto2/gphoto2-list.h
X-include/gphoto2/gphoto2-port-info-list.h
X-include/gphoto2/gphoto2-port-log.h
X-include/gphoto2/gphoto2-port-portability.h
X-include/gphoto2/gphoto2-port-result.h
X-include/gphoto2/gphoto2-port.h
X-include/gphoto2/gphoto2-result.h
X-include/gphoto2/gphoto2-setting.h
X-include/gphoto2/gphoto2-widget.h
X-include/gphoto2/gphoto2.h
X-lib/gphoto2/2.1.0/libgphoto2_agfa.so
X-lib/gphoto2/2.1.0/libgphoto2_barbie.so
X-lib/gphoto2/2.1.0/libgphoto2_canon.so
X-lib/gphoto2/2.1.0/libgphoto2_casio_qv.so
X-lib/gphoto2/2.1.0/libgphoto2_digita.so
X-lib/gphoto2/2.1.0/libgphoto2_dimagev.so
X-lib/gphoto2/2.1.0/libgphoto2_dimera3500.so
X-lib/gphoto2/2.1.0/libgphoto2_directory.so
X-lib/gphoto2/2.1.0/libgphoto2_fuji.so
X-lib/gphoto2/2.1.0/libgphoto2_jamcam.so
X-lib/gphoto2/2.1.0/libgphoto2_jd11.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc120.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc240.so
X-lib/gphoto2/2.1.0/libgphoto2_kodak_dc3200.so
X-lib/gphoto2/2.1.0/libgphoto2_konica.so
X-lib/gphoto2/2.1.0/libgphoto2_mustek.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_coolshot.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1000.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_dc1580.so
X-lib/gphoto2/2.1.0/libgphoto2_panasonic_l859.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc320.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc640.so
X-lib/gphoto2/2.1.0/libgphoto2_polaroid_pdc700.so
X-lib/gphoto2/2.1.0/libgphoto2_ptp.so
X-lib/gphoto2/2.1.0/libgphoto2_ricoh.so
X-lib/gphoto2/2.1.0/libgphoto2_samsung.so
X-lib/gphoto2/2.1.0/libgphoto2_sierra.so
X-lib/gphoto2/2.1.0/libgphoto2_sipix.so
X-lib/gphoto2/2.1.0/libgphoto2_sony_dscf1.so
X-lib/gphoto2/2.1.0/libgphoto2_sony_dscf55.so
X-lib/gphoto2/2.1.0/libgphoto2_stv0680.so
X-lib/gphoto2_port/0.5.0/libgphoto2_port_serial.so
X-lib/gphoto2_port/0.5.0/libgphoto2_port_usb.so
X-lib/libgphoto2.a
X-lib/libgphoto2.so
X-lib/libgphoto2.so.2
X-lib/libgphoto2_port.a
X-lib/libgphoto2_port.so
X-lib/libgphoto2_port.so.5
X-libdata/pkgconfig/libgphoto2.pc
X %%PORTDOCS%%share/doc/gphoto2/AUTHORS
X-%%PORTDOCS%%share/doc/gphoto2/FAQ
X %%PORTDOCS%%share/doc/gphoto2/NEWS
X %%PORTDOCS%%share/doc/gphoto2/README
X-%%PORTDOCS%%share/doc/gphoto2/gphoto2-cli.txt
X-%%PORTDOCS%%share/doc/gphoto2/gphoto2.txt
X-%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
X-%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
X-%%PORTDOCS%%share/doc/libgphoto2_port/README
X-share/gphoto2/konica/english
X-share/gphoto2/konica/french
X-share/gphoto2/konica/german
X-share/gphoto2/konica/japanese
X-share/gphoto2/konica/korean
X-share/gphoto2/konica/spanish
X share/locale/da/LC_MESSAGES/gphoto2.mo
X-share/locale/da/LC_MESSAGES/libgphoto2_port.mo
X share/locale/de/LC_MESSAGES/gphoto2.mo
X-share/locale/de/LC_MESSAGES/libgphoto2_port.mo
X share/locale/es/LC_MESSAGES/gphoto2.mo
X-share/locale/es/LC_MESSAGES/libgphoto2_port.mo
X share/locale/fr/LC_MESSAGES/gphoto2.mo
X-share/locale/fr/LC_MESSAGES/libgphoto2_port.mo
X share/locale/it/LC_MESSAGES/gphoto2.mo
X-share/locale/it/LC_MESSAGES/libgphoto2_port.mo
X share/locale/ja/LC_MESSAGES/gphoto2.mo
X-share/locale/ja/LC_MESSAGES/libgphoto2_port.mo
X share/locale/no/LC_MESSAGES/gphoto2.mo
X-share/locale/no/LC_MESSAGES/libgphoto2_port.mo
X share/locale/ru/LC_MESSAGES/gphoto2.mo
X-share/locale/ru/LC_MESSAGES/libgphoto2_port.mo
X share/locale/sl/LC_MESSAGES/gphoto2.mo
X-share/locale/sl/LC_MESSAGES/libgphoto2_port.mo
X share/locale/sv/LC_MESSAGES/gphoto2.mo
X-share/locale/sv/LC_MESSAGES/libgphoto2_port.mo
X share/locale/uk/LC_MESSAGES/gphoto2.mo
X-share/locale/uk/LC_MESSAGES/libgphoto2_port.mo
X share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
X-share/locale/zh_CN/LC_MESSAGES/libgphoto2_port.mo
X-@dirrm share/gphoto2/konica
X-@dirrm share/gphoto2
X-%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
X %%PORTDOCS%%@dirrm share/doc/gphoto2
X-@dirrm lib/gphoto2_port/0.5.0
X-@dirrm lib/gphoto2_port
X-@dirrm lib/gphoto2/2.1.0
X-@dirrm lib/gphoto2
X-@dirrm include/gphoto2
END-of-graphics_gphoto2.patch
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021203070939.1760072d.tkato>