Update to 0.1.10: GTK2 version, and lots of changes.

6 files changed, 41 insertions, 59 deletions

diff --git a/graphics/gtkam/DESCR b/graphics/gtkam/DESCR
index fb45c286440..7d445d6f8c2 100644
--- a/graphics/gtkam/DESCR
+++ b/graphics/gtkam/DESCR
@@ -1,6 +1,4 @@
-gtkam is an universal, free GTK+ application that will allow
-downloading, saving, and manipulation of images from several 
-different digital camera models, or from the local harddrive.
-
-gtkam supports a wide array of digital camera models.  
-Visit http://www.gphoto.org/cameras.html for an updated list.
+gtkam is the official GTK2 GUI for libgphoto2. Its purpose it to
+provide a standard client for libgphoto2 aimed at GNOME users.
+Consider it as a reference implementation for a graphical libgphoto2
+client.
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 2febb4f11df..14ce5efdf96 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2002/10/07 19:33:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/24 21:38:33 wiz Exp $
+#
 
-DISTNAME=	gtkam-0.1.2
-PKGREVISION=	3
+DISTNAME=	gtkam-0.1.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.gphoto.org/gphoto2/
-COMMENT=	GTK+ application for downloading, saving and manipulating on images from digital cameras
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
+COMMENT=	digital camera access graphical client (GTK2)
 
-BUILD_USES_MSGFMT=	yes
+USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
 
-USE_BUILDLINK2=		yes
-USE_X11BASE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-nls
-CPPFLAGS+=		-DHAVE_CONFIG_H -I${WRKSRC}
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../graphics/gphoto2/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../devel/libgphoto2/buildlink2.mk"
+.include "../../graphics/libexif-gtk/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gtkam/PLIST b/graphics/gtkam/PLIST
index f943ee4bce5..d46941eafd7 100644
--- a/graphics/gtkam/PLIST
+++ b/graphics/gtkam/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/21 03:39:27 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/24 21:38:33 wiz Exp $
 bin/gtkam
+man/man1/gtkam.1
 share/doc/gtkam/AUTHORS
 share/doc/gtkam/COPYING
-share/doc/gtkam/MANUAL
 share/gtkam/pixmaps/camera.xpm
 share/gtkam/pixmaps/configure.xpm
 share/gtkam/pixmaps/delete_images.xpm
@@ -15,7 +15,22 @@ share/images/gtkam/gtkam-folder-camera.png
 share/images/gtkam/gtkam-folder.png
 share/images/gtkam/gtkam-lock.png
 share/images/gtkam/gtkam-new.png
-@dirrm share/doc/gtkam
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtkam.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtkam.mo
+@dirrm share/images/gtkam
+@dirrm share/images
 @dirrm share/gtkam/pixmaps
 @dirrm share/gtkam
-@dirrm share/images/gtkam
+@dirrm share/doc/gtkam
diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo
index 25bfa94d20c..e9fe0887869 100644
--- a/graphics/gtkam/distinfo
+++ b/graphics/gtkam/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/03/04 14:36:55 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/12/24 21:38:33 wiz Exp $
 
-SHA1 (gtkam-0.1.2.tar.gz) = 8a0ad7c4c83158240edeb11c3087de75971fcccc
-Size (gtkam-0.1.2.tar.gz) = 536588 bytes
-SHA1 (patch-aa) = 09c7938c8164c6902025b2a94eaf54675a58f2ec
-SHA1 (patch-ab) = f0e7804997beaa887c1b2f3c6b55ddfea0591bf7
+SHA1 (gtkam-0.1.10.tar.bz2) = eda354f9e871e1d8e46a2ffdd1b668de531dc288
+Size (gtkam-0.1.10.tar.bz2) = 326015 bytes
diff --git a/graphics/gtkam/patches/patch-aa b/graphics/gtkam/patches/patch-aa
deleted file mode 100644
index b46934a39f1..00000000000
--- a/graphics/gtkam/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/02/28 14:52:19 martti Exp $
-
---- Makefile.in.orig	Tue Jan 29 11:45:19 2002
-+++ Makefile.in	Thu Feb 28 15:29:16 2002
-@@ -98,7 +98,7 @@
- 
- SUBDIRS = libexif po src intl art pixmaps packaging
- 
--gtkamdocdir = $(prefix)/doc/gtkam
-+gtkamdocdir = $(prefix)/share/doc/gtkam
- gtkamdoc_DATA = AUTHORS COPYING MANUAL
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gtkam/patches/patch-ab b/graphics/gtkam/patches/patch-ab
deleted file mode 100644
index 4c265ac4333..00000000000
--- a/graphics/gtkam/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/03/04 14:36:55 martti Exp $
-
---- libexif/Makefile.in.orig	Mon Mar  4 15:05:18 2002
-+++ libexif/Makefile.in	Mon Mar  4 15:06:04 2002
-@@ -313,7 +313,7 @@
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
-+install:
- uninstall-am:
- uninstall: uninstall-recursive
- all-am: Makefile config.h