Hi.
3 diffs to update the gphoto2 suite:
- libgphoto-2.4.1
- gphoto-2.4.1
- gtkam-0.1.15
Passes regress and works ok after small testing under macppc.
Comments/OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 19 Oct 2007 12:57:51 -0000 1.13
+++ Makefile 14 Jun 2008 17:34:40 -0000
@@ -5,7 +5,7 @@
MAINTAINER= Marc Espie <[EMAIL PROTECTED]>
-VERSION= 2.4.0
+VERSION= 2.4.1
DISTNAME= libgphoto2-${VERSION}
PKGNAME= libgphoto-${VERSION}
SHARED_LIBS+= gphoto2 3.0 # 5.0
@@ -15,7 +15,7 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
-# GPL
+# LGPLv2
PERMIT_PACKAGE_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 19 Oct 2007 12:57:51 -0000 1.7
+++ distinfo 14 Jun 2008 17:34:40 -0000
@@ -1,5 +1,5 @@
-MD5 (libgphoto2-2.4.0.tar.gz) = re8aVk09GkjhwT7ONLERtg==
-RMD160 (libgphoto2-2.4.0.tar.gz) = 8yU/CIssA9NsLw0w8s/F4M/IZOQ=
-SHA1 (libgphoto2-2.4.0.tar.gz) = cTASJWXMqPCo2OIJI88KGjhCNbU=
-SHA256 (libgphoto2-2.4.0.tar.gz) = 37MhZpIZPzPD7wJGFNoERvjl2vQbtzSqaOdCGREcgLM=
-SIZE (libgphoto2-2.4.0.tar.gz) = 4257979
+MD5 (libgphoto2-2.4.1.tar.gz) = ScEsUgMdpQFT1/vXW0kSTQ==
+RMD160 (libgphoto2-2.4.1.tar.gz) = iW2rt69DJ27Nfi6LtQueT/PmvGg=
+SHA1 (libgphoto2-2.4.1.tar.gz) = aVcs5xNvQjNIxBKfQtZnT4xhDkA=
+SHA256 (libgphoto2-2.4.1.tar.gz) = 6NaxL8rrQvcJ6WsfmVG8zeaRqUa1/tXw3KFY9lt3W7M=
+SIZE (libgphoto2-2.4.1.tar.gz) = 4605742
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 19 Oct 2007 12:57:51 -0000 1.1
+++ patches/patch-Makefile_in 14 Jun 2008 17:34:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/10/19 12:57:51 ajacoutot Exp $
---- Makefile.in.orig Thu Oct 11 13:22:12 2007
-+++ Makefile.in Thu Oct 11 13:22:27 2007
-@@ -299,7 +299,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.
+--- Makefile.in.orig Fri Mar 28 21:52:06 2008
++++ Makefile.in Sat Jun 14 18:43:46 2008
+@@ -300,7 +300,7 @@ EXTRA_DIST = HACKING MAINTAINERS TESTERS installcheck.
SUBDIRS = @subdirs@ libgphoto2 camlibs tests po packaging doc
pkgconfig_DATA = libgphoto2.pc
noinst_DATA = libgphoto2-uninstalled.pc
Index: patches/patch-camlibs_canon_usb_c
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/patches/patch-camlibs_canon_usb_c,v
retrieving revision 1.1
diff -u -r1.1 patch-camlibs_canon_usb_c
--- patches/patch-camlibs_canon_usb_c 19 Oct 2007 12:57:52 -0000 1.1
+++ patches/patch-camlibs_canon_usb_c 14 Jun 2008 17:34:40 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-camlibs_canon_usb_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
---- camlibs/canon/usb.c.orig Sun Oct 14 12:14:21 2007
-+++ camlibs/canon/usb.c Sun Oct 14 12:14:35 2007
+--- camlibs/canon/usb.c.orig Sat Jun 14 18:41:27 2008
++++ camlibs/canon/usb.c Sat Jun 14 18:41:38 2008
@@ -72,7 +72,7 @@
/* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
* an URB to come back on an interrupt endpoint */
--#define CANON_FAST_TIMEOUT 75
+-#define CANON_FAST_TIMEOUT 150
+#define CANON_FAST_TIMEOUT 750
/* WARNING: This destroys reentrancy of the code. Better to put this
Index: patches/patch-camlibs_ptp2_library_c
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/patches/patch-camlibs_ptp2_library_c,v
retrieving revision 1.1
diff -u -r1.1 patch-camlibs_ptp2_library_c
--- patches/patch-camlibs_ptp2_library_c 19 Oct 2007 12:57:52 -0000
1.1
+++ patches/patch-camlibs_ptp2_library_c 14 Jun 2008 17:34:40 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-camlibs_ptp2_library_c,v 1.1 2007/10/19 12:57:52 ajacoutot Exp
$
---- camlibs/ptp2/library.c.orig Fri Jul 27 02:35:37 2007
-+++ camlibs/ptp2/library.c Mon Oct 15 12:34:45 2007
+--- camlibs/ptp2/library.c.orig Sat Jun 14 18:41:47 2008
++++ camlibs/ptp2/library.c Sat Jun 14 18:43:14 2008
@@ -26,7 +26,11 @@
#include <string.h>
#include <stdio.h>
@@ -13,15 +13,7 @@
#include <gphoto2/gphoto2-library.h>
#include <gphoto2/gphoto2-port-log.h>
-@@ -683,6 +687,7 @@ static struct {
- {"Canon:PowerShot A710 IS (PTP mode)", 0x04a9, 0x3138,
PTPBUG_DELETE_SENDS_EVENT},
- {"Canon:PowerShot A640 (PTP mode)", 0x04a9, 0x3139,
PTPBUG_DELETE_SENDS_EVENT|PTP_CAP|PTP_CAP_PREVIEW},
- {"Canon:PowerShot A630 (PTP mode)", 0x04a9, 0x313a,
PTPBUG_DELETE_SENDS_EVENT},
-+ {"Canon:EOS 40D (PTP mode)", 0x04a9, 0x3146, 0},
- {"Canon:PowerShot S5 IS (PTP mode)", 0x04a9, 0x3148,
PTP_CAP|PTP_CAP_PREVIEW},
- {"Canon:PowerShot A570 IS (PTP mode)", 0x04a9, 0x314c,
PTPBUG_DELETE_SENDS_EVENT},
- {"Canon:PowerShot A560 (PTP mode)", 0x04a9, 0x314d,
PTPBUG_DELETE_SENDS_EVENT},
-@@ -4203,7 +4208,11 @@ camera_init (Camera *camera, GPContext *context)
+@@ -4302,7 +4306,11 @@ camera_init (Camera *camera, GPContext *context)
break;
}
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 19 Oct 2007 12:57:52 -0000 1.1
+++ patches/patch-configure 14 Jun 2008 17:34:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
---- configure.orig Tue Oct 16 16:48:32 2007
-+++ configure Tue Oct 16 16:49:17 2007
-@@ -28442,10 +28442,10 @@ MSGFMT!$MSGFMT$ac_delim
+--- configure.orig Fri Mar 28 21:52:10 2008
++++ configure Sat Jun 14 18:43:46 2008
+@@ -28649,10 +28649,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
Index: patches/patch-libgphoto2_port_Makefile_in
===================================================================
RCS file:
/cvs/ports/graphics/libgphoto2/patches/patch-libgphoto2_port_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-libgphoto2_port_Makefile_in
--- patches/patch-libgphoto2_port_Makefile_in 19 Oct 2007 12:57:52 -0000
1.1
+++ patches/patch-libgphoto2_port_Makefile_in 14 Jun 2008 17:34:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_Makefile_in,v 1.1 2007/10/19 12:57:52
ajacoutot Exp $
---- libgphoto2_port/Makefile.in.orig Thu Oct 11 13:24:02 2007
-+++ libgphoto2_port/Makefile.in Thu Oct 11 13:25:14 2007
-@@ -759,7 +759,7 @@ info: info-recursive
+--- libgphoto2_port/Makefile.in.orig Mon Mar 24 14:14:13 2008
++++ libgphoto2_port/Makefile.in Sat Jun 14 18:43:46 2008
+@@ -760,7 +760,7 @@ info: info-recursive
info-am:
Index: patches/patch-libgphoto2_port_configure
===================================================================
RCS file:
/cvs/ports/graphics/libgphoto2/patches/patch-libgphoto2_port_configure,v
retrieving revision 1.1
diff -u -r1.1 patch-libgphoto2_port_configure
--- patches/patch-libgphoto2_port_configure 19 Oct 2007 12:57:52 -0000
1.1
+++ patches/patch-libgphoto2_port_configure 14 Jun 2008 17:34:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libgphoto2_port_configure,v 1.1 2007/10/19 12:57:52 ajacoutot
Exp $
---- libgphoto2_port/configure.orig Tue Oct 16 17:04:24 2007
-+++ libgphoto2_port/configure Tue Oct 16 17:04:49 2007
-@@ -27528,10 +27528,10 @@ MSGFMT!$MSGFMT$ac_delim
+--- libgphoto2_port/configure.orig Mon Mar 24 14:14:14 2008
++++ libgphoto2_port/configure Sat Jun 14 18:43:47 2008
+@@ -27735,10 +27735,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
Index: patches/patch-tests_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/patches/patch-tests_Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-tests_Makefile_in
--- patches/patch-tests_Makefile_in 19 Oct 2007 12:57:52 -0000 1.1
+++ patches/patch-tests_Makefile_in 14 Jun 2008 17:34:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tests_Makefile_in,v 1.1 2007/10/19 12:57:52 ajacoutot Exp $
---- tests/Makefile.in.orig Thu Oct 11 13:22:39 2007
-+++ tests/Makefile.in Thu Oct 11 13:22:56 2007
-@@ -351,9 +351,9 @@ test_camera_list_LDADD = \
+--- tests/Makefile.in.orig Fri Mar 28 21:52:06 2008
++++ tests/Makefile.in Sat Jun 14 18:43:47 2008
+@@ -352,9 +352,9 @@ test_camera_list_LDADD = \
$(INTLLIBS)
@[EMAIL PROTECTED] =
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 19 Oct 2007 12:57:52 -0000 1.7
+++ pkg/PLIST 14 Jun 2008 17:34:40 -0000
@@ -139,7 +139,7 @@
lib/libgphoto2/${VERSION}/sx330z.la
lib/libgphoto2/${VERSION}/toshiba_pdrm11.a
lib/libgphoto2/${VERSION}/toshiba_pdrm11.la
-lib/libgphoto2/print-camera-list
[EMAIL PROTECTED] lib/libgphoto2/print-camera-list
lib/libgphoto2_port/
lib/libgphoto2_port.a
lib/libgphoto2_port.la
@@ -156,20 +156,22 @@
lib/pkgconfig/libgphoto2.pc
lib/pkgconfig/libgphoto2_port.pc
@comment lib/udev/
[EMAIL PROTECTED] lib/udev/check-mtp-device
[EMAIL PROTECTED] @bin lib/udev/check-mtp-device
@comment lib/udev/check-ptp-camera
@man man/man3/libgphoto2.3
@man man/man3/libgphoto2_port.3
share/doc/libgphoto2/
share/doc/libgphoto2/README
share/doc/libgphoto2/camlibs/
+share/doc/libgphoto2/camlibs/README.9050
+share/doc/libgphoto2/camlibs/README.905C
share/doc/libgphoto2/camlibs/README.913C
+share/doc/libgphoto2/camlibs/README.913D
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.digigr8
share/doc/libgphoto2/camlibs/README.enigma13
share/doc/libgphoto2/camlibs/README.gsmart300
share/doc/libgphoto2/camlibs/README.iclick
@@ -235,6 +237,7 @@
share/locale/sv/LC_MESSAGES/libgphoto2_port-0.mo
share/locale/uk/LC_MESSAGES/libgphoto2-2.mo
share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
+share/locale/vi/LC_MESSAGES/libgphoto2-2.mo
share/locale/vi/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
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gphoto2/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 19 Oct 2007 13:00:18 -0000 1.10
+++ Makefile 14 Jun 2008 17:39:20 -0000
@@ -5,7 +5,7 @@
MAINTAINER= Marc Espie <[EMAIL PROTECTED]>
-VERSION= 2.4.0
+VERSION= 2.4.1
DISTNAME= gphoto2-${VERSION}
PKGNAME= gphoto-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gphoto2/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 19 Oct 2007 13:00:18 -0000 1.7
+++ distinfo 14 Jun 2008 17:39:20 -0000
@@ -1,5 +1,5 @@
-MD5 (gphoto2-2.4.0.tar.gz) = /wWp7dQDMUR7M9cth7OLTA==
-RMD160 (gphoto2-2.4.0.tar.gz) = Yk72gJLM9ra1EqKh2wPc9YbvSjM=
-SHA1 (gphoto2-2.4.0.tar.gz) = juzgEAgW4xJiUc3qle7FdZqEVX4=
-SHA256 (gphoto2-2.4.0.tar.gz) = zrjVwkZteagc6RUlO8tqc7fGtfhVro2xr54vwTjyKxU=
-SIZE (gphoto2-2.4.0.tar.gz) = 866020
+MD5 (gphoto2-2.4.1.tar.gz) = 9IowINdr7bEr8+Op8OCciA==
+RMD160 (gphoto2-2.4.1.tar.gz) = EkwqDWxXfF++gNvipNPc1tZOQhY=
+SHA1 (gphoto2-2.4.1.tar.gz) = 6PYq6Uub09LGGTuOse4Ot+KXe/0=
+SHA256 (gphoto2-2.4.1.tar.gz) = dKPS+8kQisr6KiIcbhiYG/jDDhxn7aj7lhV1wwj09VQ=
+SIZE (gphoto2-2.4.1.tar.gz) = 878192
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/gphoto2/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 19 Oct 2007 13:00:18 -0000 1.1
+++ patches/patch-configure 14 Jun 2008 17:39:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2007/10/19 13:00:18 ajacoutot Exp $
---- configure.orig Mon Jul 30 02:49:04 2007
-+++ configure Tue Oct 16 17:34:00 2007
-@@ -23183,13 +23183,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
+--- configure.orig Wed Mar 26 08:36:46 2008
++++ configure Sat Jun 14 19:35:06 2008
+@@ -23389,13 +23389,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6; }
fi
if test $ac_cv_header_pthread_h = yes; then
@@ -18,7 +18,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23251,8 +23251,8 @@ cat >>confdefs.h <<\_ACEOF
+@@ -23457,8 +23457,8 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD 1
_ACEOF
@@ -29,7 +29,7 @@
else
{ echo "$as_me:$LINENO: checking for pthread_create in
-lc_r" >&5
-@@ -26695,10 +26695,10 @@ MSGFMT!$MSGFMT$ac_delim
+@@ -26902,10 +26902,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gphoto2/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 19 Oct 2007 13:00:18 -0000 1.3
+++ pkg/PLIST 14 Jun 2008 17:39:20 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2007/10/19 13:00:18 ajacoutot Exp $
-bin/gphoto2
[EMAIL PROTECTED] bin/gphoto2
@man man/man1/gphoto2.1
share/doc/gphoto2/
share/doc/gphoto2/test-hook.sh
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gtkam/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 13 Nov 2007 17:10:25 -0000 1.15
+++ Makefile 14 Jun 2008 18:14:35 -0000
@@ -2,19 +2,14 @@
COMMENT= digital camera frontend
-DISTNAME= gtkam-0.1.14
-PKGNAME= ${DISTNAME}p1
+DISTNAME= gtkam-0.1.15
CATEGORIES= graphics
-# gtkam-0.1.14 contains corrupted PNG files so we're getting
-# them from a previous release
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gtkam-0.1.12${EXTRACT_SUFX}
-
HOMEPAGE= http://gphoto.sourceforge.net/proj/gtkam/
MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -24,7 +19,7 @@
atk-1.0 fontconfig freetype m c z cairo glib-2.0 pcre \
pango-1.0 pangocairo-1.0 pangoft2-1.0 Xau Xcursor \
Xdmcp Xfixes Xi Xinerama Xrandr exif expat ltdl usb \
- Xcomposite Xdamage
+ Xcomposite Xdamage pixman-1 pthread
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
@@ -40,14 +35,11 @@
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -pthread"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-gnome=no \
--with-gimp=no \
--with-bonobo=no \
--disable-scrollkeeper
-
-post-extract:
- @mv ${WRKDIR}/gtkam-0.1.12/art/*.png ${WRKSRC}/art
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gtkam/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 22 Oct 2007 20:36:15 -0000 1.4
+++ distinfo 14 Jun 2008 18:14:35 -0000
@@ -1,10 +1,5 @@
-MD5 (gtkam-0.1.12.tar.gz) = YiFw1BRxilrhFIemrx5HzQ==
-MD5 (gtkam-0.1.14.tar.gz) = 3rCdm95w7LdtpUNpBjMcsA==
-RMD160 (gtkam-0.1.12.tar.gz) = XekYkpcOxU0zTvOsV0wCXhu9T5I=
-RMD160 (gtkam-0.1.14.tar.gz) = fKuXzz2iqHsj2FTmFayb6dXUeuY=
-SHA1 (gtkam-0.1.12.tar.gz) = 2MoHVdnexIM4/PsMfpfJCWK21ic=
-SHA1 (gtkam-0.1.14.tar.gz) = ekbuLMnYjtMdbuRrFbxRrClkiLo=
-SHA256 (gtkam-0.1.12.tar.gz) = Fiwgc6A+LbA6Mrn66EcACuml5YpPFVLowPrcfdxtOCI=
-SHA256 (gtkam-0.1.14.tar.gz) = WDFuDxyNF5SAOEy4EJi/3PtizADyH+akRsUCYf7xw4M=
-SIZE (gtkam-0.1.12.tar.gz) = 611323
-SIZE (gtkam-0.1.14.tar.gz) = 1301806
+MD5 (gtkam-0.1.15.tar.gz) = YnhEfdL2NSgJ1TeLuIVV/A==
+RMD160 (gtkam-0.1.15.tar.gz) = VNWHticgu+5f2vU/+LJqk/AF/Lg=
+SHA1 (gtkam-0.1.15.tar.gz) = IywTJmLFYk4i15w/4l++9IZJuQY=
+SHA256 (gtkam-0.1.15.tar.gz) = juWCP2PwgQ4ErdVnAXmV5anTp0l2a+33eRXuUHhKVSg=
+SIZE (gtkam-0.1.15.tar.gz) = 1032151
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/gtkam/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 22 Oct 2007 20:36:15 -0000 1.1
+++ patches/patch-Makefile_in 14 Jun 2008 18:14:35 -0000
@@ -1,21 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2007/10/22 20:36:15 ajacoutot Exp $
---- Makefile.in.orig Mon Dec 18 01:11:40 2006
-+++ Makefile.in Mon Oct 15 15:09:57 2007
-@@ -261,7 +261,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- Makefile.in.orig Sat Jun 14 19:48:31 2008
++++ Makefile.in Sat Jun 14 19:48:52 2008
+@@ -253,7 +253,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
-SUBDIRS = m4m art doc help omf-install packaging pixmaps po src test
+SUBDIRS = m4m art doc packaging pixmaps po src test
ACLOCAL_AMFLAGS = -I m4m
# disable scrollkeeper for distcheck
-@@ -270,7 +270,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
- ########################################################################
- # Install a few support and doc files
- gtkamdocdir = $(datadir)/doc/gtkam
--gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
-+gtkamdoc_DATA = NEWS README TODO CHANGES
- desktopdir = $(datadir)/applications
- desktop_DATA = gtkam.desktop
- icondir = $(datadir)/pixmaps
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/gtkam/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 22 Oct 2007 20:36:15 -0000 1.1
+++ patches/patch-configure 14 Jun 2008 18:14:36 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1 2007/10/22 20:36:15 ajacoutot Exp $
---- configure.orig Tue Oct 16 17:54:24 2007
-+++ configure Tue Oct 16 17:54:45 2007
-@@ -26212,10 +26212,10 @@ MSGFMT!$MSGFMT$ac_delim
+--- configure.orig Mon Apr 14 22:25:28 2008
++++ configure Sat Jun 14 18:34:05 2008
+@@ -25815,10 +25815,10 @@ MSGFMT!$MSGFMT$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
Index: patches/patch-src_gtkam-save_c
===================================================================
RCS file: patches/patch-src_gtkam-save_c
diff -N patches/patch-src_gtkam-save_c
--- patches/patch-src_gtkam-save_c 22 Oct 2007 20:36:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_gtkam-save_c,v 1.2 2007/10/22 20:36:15 ajacoutot Exp $
---- src/gtkam-save.c.orig Thu Dec 14 19:38:12 2006
-+++ src/gtkam-save.c Sun Oct 21 15:13:25 2007
-@@ -167,9 +167,11 @@ default_numbering_start(const GtkamSave *save)
- gchar *tail,*prefix;
- int max = 1;
- int plen, current;
-+ gchar *filename ;
-
-- if (!(dir = g_dir_open (gtk_file_chooser_get_filename (
-- GTK_FILE_CHOOSER (save)) , 0, NULL))) return 1;
-+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (save));
-+ if (filename == NULL) return 1;
-+ if (!(dir = g_dir_open (filename , 0, NULL))) return 1;
- prefix = g_strdup (gtk_entry_get_text
- (GTK_ENTRY (save->priv->prefix_entry)));
- plen = strlen (prefix);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gtkam/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 22 Oct 2007 20:36:15 -0000 1.5
+++ pkg/PLIST 14 Jun 2008 18:14:36 -0000
@@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.5 2007/10/22 20:36:15 ajacoutot Exp $
-bin/gtkam
[EMAIL PROTECTED] bin/gtkam
@man man/man1/gtkam.1
-share/applications/
share/applications/gtkam.desktop
share/doc/gtkam/
+share/doc/gtkam/AUTHORS
share/doc/gtkam/CHANGES
+share/doc/gtkam/COPYING
share/doc/gtkam/NEWS
share/doc/gtkam/README
share/doc/gtkam/TODO
@@ -24,6 +25,7 @@
share/images/gtkam/gtkam-folder.png
share/images/gtkam/gtkam-lock.png
share/images/gtkam/gtkam-new.png
+share/locale/be/LC_MESSAGES/gtkam.mo
share/locale/cs/LC_MESSAGES/gtkam.mo
share/locale/da/LC_MESSAGES/gtkam.mo
share/locale/de/LC_MESSAGES/gtkam.mo
@@ -33,15 +35,19 @@
share/locale/it/LC_MESSAGES/gtkam.mo
share/locale/ja/LC_MESSAGES/gtkam.mo
share/locale/nb/LC_MESSAGES/gtkam.mo
+share/locale/nl/LC_MESSAGES/gtkam.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
+share/locale/pa/LC_MESSAGES/gtkam.mo
share/locale/pl/LC_MESSAGES/gtkam.mo
+share/locale/pt/LC_MESSAGES/gtkam.mo
share/locale/pt_BR/LC_MESSAGES/gtkam.mo
-share/locale/pt_PT/
-share/locale/pt_PT/LC_MESSAGES/
-share/locale/pt_PT/LC_MESSAGES/gtkam.mo
share/locale/ru/LC_MESSAGES/gtkam.mo
+share/locale/sk/LC_MESSAGES/gtkam.mo
share/locale/sl/LC_MESSAGES/gtkam.mo
share/locale/sv/LC_MESSAGES/gtkam.mo
share/locale/uk/LC_MESSAGES/gtkam.mo
+share/locale/vi/LC_MESSAGES/gtkam.mo
share/pixmaps/
share/pixmaps/gtkam.png
@exec %D/bin/update-desktop-database
--
Antoine
