Hi.
This diff updates gtkam to the latest stable release.
It needs the libgphoto update I sent to ports@ as well as the new
libexif-gtk port (also sent to ports@).
I'm taking maintainership of this (with ok from the former maintainer).
You can also grab anything you need to test this here:
http://www.obsd.fr/libgphoto2.diff
http://www.obsd.fr/gtkam.diff
http://www.obsd.fr/libexif-gtk.tar.gz
Comments/Ok?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gtkam/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 15 Sep 2007 20:09:41 -0000 1.12
+++ Makefile 15 Oct 2007 14:38:57 -0000
@@ -2,38 +2,50 @@
COMMENT= digital camera frontend
-VERSION= 0.1.10
-DISTNAME= gtkam-${VERSION}
-PKGNAME= ${DISTNAME}p3
+DISTNAME= gtkam-0.1.14
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= Srebrenko Sehic <[EMAIL PROTECTED]>
+MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= gmodule-2.0 X11 Xext Xrender gobject-2.0 glitz png \
- atk-1.0 fontconfig freetype m c z cairo \
- glib-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
+ atk-1.0 fontconfig freetype m c z cairo glib-2.0 \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 Xau Xcursor \
+ Xdmcp Xfixes Xi Xinerama Xrandr exif expat ltdl usb
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
LIB_DEPENDS= gphoto2,gphoto2_port::graphics/libgphoto2 \
-
gdk_pixbuf-2.0.>=0.11,gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
+
gdk_pixbuf-2.0.>=0.11,gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 \
+ exif-gtk::graphics/libexif-gtk
+RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
-MODULES= devel/gettext
+MODULES= devel/gettext
-SEPARATE_BUILD= concurrent
USE_X11= Yes
+USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--without-gnome \
- --without-gimp \
- --without-bonobo-activation \
- --without-exif
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
+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.3
diff -u -r1.3 distinfo
--- distinfo 5 Apr 2007 16:19:56 -0000 1.3
+++ distinfo 15 Oct 2007 14:38:57 -0000
@@ -1,5 +1,10 @@
-MD5 (gtkam-0.1.10.tar.gz) = hPU5xss7LDZLwZD5M5tPfQ==
-RMD160 (gtkam-0.1.10.tar.gz) = NkbgdHvLglIxiz5RSLwSaxTifF8=
-SHA1 (gtkam-0.1.10.tar.gz) = 8QvvN21jry9v6W6ZdpOnaLUGigQ=
-SHA256 (gtkam-0.1.10.tar.gz) = a62DsqG5zNFRvQDojx64WKBX4el88SREzYXlE7CQM90=
-SIZE (gtkam-0.1.10.tar.gz) = 392478
+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
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 15 Oct 2007 14:38:57 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- 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@
+ target_alias = @target_alias@
+-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: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 15 Oct 2007 14:38:57 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- configure.orig Mon Oct 15 13:28:48 2007
++++ configure Mon Oct 15 13:29:09 2007
+@@ -21976,12 +21976,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int libintl_nl_domain_bindings;
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr + libintl_nl_domain_bindings
+ ;
+ return 0;
+ }
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 25 Jun 2004 00:28:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/06/25 00:28:05 marcm Exp $
---- src/Makefile.in.orig Thu Jun 24 18:20:48 2004
-+++ src/Makefile.in Thu Jun 24 18:21:04 2004
-@@ -121,7 +121,6 @@ INCLUDES = \
- -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\" \
- -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\" \
- -DAPP_DATADIR=\"@[EMAIL PROTECTED]" \
-- -DGTK_DISABLE_DEPRECATED \
- $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS) \
- $(BONOBO_CFLAGS) \
- $(GTKAM_GIMP_CFLAGS)
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 23 Oct 2003 05:58:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gtkam-save_c,v 1.1 2003/10/23 05:58:53 pvalchev Exp $
---- src/gtkam-save.c.orig 2003-10-22 20:18:55.000000000 -0600
-+++ src/gtkam-save.c 2003-10-22 20:19:09.000000000 -0600
-@@ -351,7 +351,7 @@ save_file (GtkamSave *save, CameraFile *
- } else {
- progname = gtk_entry_get_text (save->priv->program);
- if (progname && fork ()) {
-- execlp (progname, progname, full_path, NULL);
-+ execlp (progname, progname, full_path, (void *)NULL);
- _exit (0);
- }
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gtkam/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 20 Jan 2006 23:54:19 -0000 1.4
+++ pkg/PLIST 15 Oct 2007 14:38:57 -0000
@@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST,v 1.4 2006/01/20 23:54:19 steven Exp $
bin/gtkam
@man man/man1/gtkam.1
[EMAIL PROTECTED] share/doc/gtkam/
[EMAIL PROTECTED] share/doc/gtkam/AUTHORS
[EMAIL PROTECTED] share/doc/gtkam/COPYING
+share/applications/
+share/applications/gtkam.desktop
+share/doc/gtkam/
+share/doc/gtkam/CHANGES
+share/doc/gtkam/NEWS
+share/doc/gtkam/README
+share/doc/gtkam/TODO
share/gtkam/
share/gtkam/pixmaps/
share/gtkam/pixmaps/camera.xpm
@@ -20,6 +24,7 @@
share/images/gtkam/gtkam-folder.png
share/images/gtkam/gtkam-lock.png
share/images/gtkam/gtkam-new.png
+share/locale/cs/LC_MESSAGES/gtkam.mo
share/locale/da/LC_MESSAGES/gtkam.mo
share/locale/de/LC_MESSAGES/gtkam.mo
share/locale/es/LC_MESSAGES/gtkam.mo
@@ -27,7 +32,8 @@
share/locale/hu/LC_MESSAGES/gtkam.mo
share/locale/it/LC_MESSAGES/gtkam.mo
share/locale/ja/LC_MESSAGES/gtkam.mo
-share/locale/no/LC_MESSAGES/gtkam.mo
+share/locale/nb/LC_MESSAGES/gtkam.mo
+share/locale/pl/LC_MESSAGES/gtkam.mo
share/locale/pt_BR/LC_MESSAGES/gtkam.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
@@ -36,3 +42,7 @@
share/locale/sl/LC_MESSAGES/gtkam.mo
share/locale/sv/LC_MESSAGES/gtkam.mo
share/locale/uk/LC_MESSAGES/gtkam.mo
+share/pixmaps/
+share/pixmaps/gtkam.png
[EMAIL PROTECTED] %D/bin/update-desktop-database
[EMAIL PROTECTED] %D/bin/update-desktop-database
