From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 28 05:50:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 763F416A4D2 for ; Tue, 28 Oct 2003 05:50:23 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D121943FFB for ; Tue, 28 Oct 2003 05:50:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9SDoEFY069863 for ; Tue, 28 Oct 2003 05:50:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9SDoD1V069856; Tue, 28 Oct 2003 05:50:13 -0800 (PST) (envelope-from gnats) Resent-Date: Tue, 28 Oct 2003 05:50:13 -0800 (PST) Resent-Message-Id: <200310281350.h9SDoD1V069856@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1A7916A4D2 for ; Tue, 28 Oct 2003 05:47:46 -0800 (PST) Received: from hfep04.dion.ne.jp (hfep04.dion.ne.jp [203.181.105.70]) by mx1.FreeBSD.org (Postfix) with ESMTP id D387A43FFB for ; Tue, 28 Oct 2003 05:47:43 -0800 (PST) (envelope-from tkato@prontomail.com) Received: from localhost ([218.222.54.43]) by hfep04.dion.ne.jp with SMTP id <20031028134734168.ZLUA@hfep04.dion.ne.jp> for ; Tue, 28 Oct 2003 22:47:34 +0900 Message-Id: <20031028224526.76dbd3b5.tkato@prontomail.com> Date: Tue, 28 Oct 2003 22:45:26 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58627: Update port: graphics/libgphoto2 to 2.1.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2003 13:50:23 -0000 >Number: 58627 >Category: ports >Synopsis: Update port: graphics/libgphoto2 to 2.1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 28 05:50:13 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.1.3 >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/libgphoto2/Makefile graphics/libgphoto2/Makefile --- /usr/ports/graphics/libgphoto2/Makefile Tue Oct 21 11:01:00 2003 +++ graphics/libgphoto2/Makefile Sun Oct 26 22:13:55 2003 @@ -6,8 +6,7 @@ # PORTNAME= libgphoto2 -PORTVERSION= 2.1.2 -PORTREVISION= 2 +PORTVERSION= 2.1.3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -20,28 +19,29 @@ exif.10:${PORTSDIR}/graphics/libexif USE_BZIP2= yes -USE_REINPLACE= yes USE_GNOME= gnometarget pkgconfig +USE_GETOPT_LONG= yes +USE_REINPLACE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INSTALLS_SHLIB= yes -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION=${PORTVERSION} MAN3= libgphoto2.3 libgphoto2_port.3 +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + post-patch: .for file in configure libgphoto2_port/configure @${REINPLACE_CMD} -e \ - 's|[{]libdir[}]/pkgconfig|{prefix}/libdata/pkgconfig|g ; \ + 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \ s|-g ||g' ${WRKSRC}/${file} .endfor @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|po packaging doc|po doc|g ; \ s|: install-docDATA|:|g' - @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|||g' post-install: .if !defined(NOPORTDOCS) diff -urN /usr/ports/graphics/libgphoto2/distinfo graphics/libgphoto2/distinfo --- /usr/ports/graphics/libgphoto2/distinfo Sat Aug 16 04:21:27 2003 +++ graphics/libgphoto2/distinfo Sun Oct 26 21:54:49 2003 @@ -1 +1 @@ -MD5 (libgphoto2-2.1.2.tar.bz2) = ded0d8262d02e4c215ffc0d73d5acbbb +MD5 (libgphoto2-2.1.3.tar.bz2) = af200308629fcbe0b88d3802bba04779 diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs:canon:canon.c graphics/libgphoto2/files/patch-camlibs:canon:canon.c --- /usr/ports/graphics/libgphoto2/files/patch-camlibs:canon:canon.c Tue Oct 21 02:49:40 2003 +++ graphics/libgphoto2/files/patch-camlibs:canon:canon.c Sun Oct 26 22:57:02 2003 @@ -1,17 +1,17 @@ ---- camlibs/canon/canon.c.orig Sun Aug 10 20:51:13 2003 -+++ camlibs/canon/canon.c Mon Oct 20 10:17:48 2003 -@@ -138,6 +138,8 @@ +--- camlibs/canon/canon.c.orig Mon Oct 20 01:53:12 2003 ++++ camlibs/canon/canon.c Sun Oct 26 22:55:34 2003 +@@ -147,6 +147,8 @@ /* 0x306D is S45 in PTP mode */ - {"Canon:PowerShot G3 (normal mode)", CANON_PS_G3, 0x04A9, 0x306E, CAP_SUP, S99M, S32K, NULL}, + {"Canon:PowerShot G3 (normal mode)", CANON_PS_G3, 0x04A9, 0x306E, CAP_SUP, S99M, S32K, S2M, NULL}, /* 0x306F is G3 in PTP mode */ -+ {"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, S99M, S32K, NULL}, ++ {"Canon:PowerShot G5 (normal mode)", CANON_PS_G5, 0x04A9, 0x3085, CAP_SUP, S99M, S32K, S2M, NULL}, + /* XXX 0x???? is G5 in PTP mode */ - {"Canon:PowerShot S230 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, NULL}, - /* 0x3071 is S230 in PTP mode */ - {"Canon:Digital IXUS v3 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, NULL}, -@@ -250,6 +252,7 @@ - case CANON_PS_S40: + {"Canon:PowerShot S230 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL}, + {"Canon:Digital IXUS v3 (normal mode)", CANON_PS_S230, 0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL}, + /* 0x3071 is S230/IXUS v3 in PTP mode */ +@@ -312,6 +314,7 @@ case CANON_PS_S45: + case CANON_PS_S400: case CANON_PS_G3: + case CANON_PS_G5: break; diff -urN /usr/ports/graphics/libgphoto2/files/patch-camlibs:canon:canon.h graphics/libgphoto2/files/patch-camlibs:canon:canon.h --- /usr/ports/graphics/libgphoto2/files/patch-camlibs:canon:canon.h Tue Oct 21 02:49:40 2003 +++ graphics/libgphoto2/files/patch-camlibs:canon:canon.h Sun Oct 26 22:58:33 2003 @@ -1,18 +1,18 @@ ---- camlibs/canon/canon.h.orig Sun Aug 10 20:51:13 2003 -+++ camlibs/canon/canon.h Mon Oct 20 10:17:51 2003 -@@ -86,6 +86,7 @@ +--- camlibs/canon/canon.h.orig Mon Oct 20 01:53:12 2003 ++++ camlibs/canon/canon.h Sun Oct 26 22:57:54 2003 +@@ -87,6 +87,7 @@ * @CANON_PS_S330: Digital IXUS 330 * @CANON_PS_S45: PowerShot S45 * @CANON_PS_G3: PowerShot G3 -+ * @CANON_PS_G5: PowerShot G5 ++ * @CANON_PS_G3: PowerShot G5 * @CANON_PS_S230: PowerShot S230, Digital IXUS v3 * @CANON_PS_A60: PowerShot A60 - * @CANON_EOS_10D: EOS 10D -@@ -123,6 +124,7 @@ - CANON_PS_A300, + * @CANON_MV630I: MV630i camcorder +@@ -133,6 +134,7 @@ + CANON_PS_S50, CANON_PS_S45, CANON_PS_G3, + CANON_PS_G5, - CANON_PS_S50, CANON_PS_S230, + CANON_MV630I, CANON_EOS_10D, diff -urN /usr/ports/graphics/libgphoto2/pkg-plist graphics/libgphoto2/pkg-plist --- /usr/ports/graphics/libgphoto2/pkg-plist Sat Aug 16 04:21:27 2003 +++ graphics/libgphoto2/pkg-plist Sun Oct 26 22:20:22 2003 @@ -18,73 +18,75 @@ include/gphoto2/gphoto2-version.h include/gphoto2/gphoto2-widget.h include/gphoto2/gphoto2.h -lib/gphoto2/%%PORTVERSION%%/libgphoto2_agfa_cl20.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_barbie.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_canon.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_casio_qv.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_digita.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_dimera3500.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_directory.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_fuji.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_gsmart300.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_jamcam.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_jd11.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc120.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc210.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc240.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc3200.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_konica.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_konica_qm150.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_largan.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_dimagev.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_mustek.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_coolshot.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_l859.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_dc1000.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_dc1580.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_pccam300.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_pccam600.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc320.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc640.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc700.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_ptp2.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_ricoh.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_samsung.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sierra.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_blink.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_blink2.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_web2.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_smal.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sony_dscf1.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sony_dscf55.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_soundvision.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_spca50x.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sq905.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_stv0674.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_stv0680.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_sx330z.so -lib/gphoto2/%%PORTVERSION%%/libgphoto2_toshiba.so +lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.so +lib/gphoto2/%%VERSION%%/libgphoto2_barbie.so +lib/gphoto2/%%VERSION%%/libgphoto2_canon.so +lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.so +lib/gphoto2/%%VERSION%%/libgphoto2_digita.so +lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.so +lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.so +lib/gphoto2/%%VERSION%%/libgphoto2_directory.so +lib/gphoto2/%%VERSION%%/libgphoto2_fuji.so +lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.so +lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.so +lib/gphoto2/%%VERSION%%/libgphoto2_jd11.so +lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.so +lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.so +lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.so +lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.so +lib/gphoto2/%%VERSION%%/libgphoto2_konica.so +lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.so +lib/gphoto2/%%VERSION%%/libgphoto2_largan.so +lib/gphoto2/%%VERSION%%/libgphoto2_mustek.so +lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.so +lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.so +lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.so +lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.so +lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.so +lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.so +lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.so +lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.so +lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.so +lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.so +lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.so +lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.so +lib/gphoto2/%%VERSION%%/libgphoto2_samsung.so +lib/gphoto2/%%VERSION%%/libgphoto2_sierra.so +lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.so +lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.so +lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.so +lib/gphoto2/%%VERSION%%/libgphoto2_smal.so +lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.so +lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.so +lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.so +lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.so +lib/gphoto2/%%VERSION%%/libgphoto2_sq905.so +lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.so +lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.so +lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.so +lib/gphoto2/%%VERSION%%/libgphoto2_toshiba.so lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so -libdata/pkgconfig/libgphoto2.pc lib/libgphoto2.a lib/libgphoto2.so lib/libgphoto2.so.2 lib/libgphoto2_port.a lib/libgphoto2_port.so lib/libgphoto2_port.so.5 -%%PORTDOCS%%share/doc/libgphoto2/AUTHORS -%%PORTDOCS%%share/doc/libgphoto2/NEWS -%%PORTDOCS%%share/doc/libgphoto2/README +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 -share/libgphoto2/%%PORTVERSION%%/konica/english -share/libgphoto2/%%PORTVERSION%%/konica/french -share/libgphoto2/%%PORTVERSION%%/konica/german -share/libgphoto2/%%PORTVERSION%%/konica/japanese -share/libgphoto2/%%PORTVERSION%%/konica/korean -share/libgphoto2/%%PORTVERSION%%/konica/spanish +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 +share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo share/locale/da/LC_MESSAGES/libgphoto2-2.mo share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo share/locale/de/LC_MESSAGES/libgphoto2-2.mo @@ -93,12 +95,14 @@ share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo share/locale/fr/LC_MESSAGES/libgphoto2-2.mo share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/hu/LC_MESSAGES/libgphoto2-2.mo share/locale/it/LC_MESSAGES/libgphoto2-2.mo share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo share/locale/ja/LC_MESSAGES/libgphoto2-2.mo share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo share/locale/no/LC_MESSAGES/libgphoto2-2.mo share/locale/no/LC_MESSAGES/libgphoto2_port-0.mo +share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo share/locale/ru/LC_MESSAGES/libgphoto2-2.mo share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo share/locale/sl/LC_MESSAGES/libgphoto2-2.mo @@ -109,13 +113,13 @@ share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo -@dirrm share/libgphoto2/%%PORTVERSION%%/konica -@dirrm share/libgphoto2/%%PORTVERSION%% +@dirrm share/libgphoto2/%%VERSION%%/konica +@dirrm share/libgphoto2/%%VERSION%% @dirrm share/libgphoto2 %%PORTDOCS%%@dirrm share/doc/libgphoto2_port -%%PORTDOCS%%@dirrm share/doc/libgphoto2 +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/gphoto2_port/0.5.1 @dirrm lib/gphoto2_port -@dirrm lib/gphoto2/%%PORTVERSION%% +@dirrm lib/gphoto2/%%VERSION%% @dirrm lib/gphoto2 @dirrm include/gphoto2 >Release-Note: >Audit-Trail: >Unformatted: