Upgrade to 0.1.11. Release notes says major changes are:

* Multiple bug fixes
* Changes to adhere to the Gnome Human Interface Guidelines (HIG), including
menu entries and the start of a help system.

Note that this is built --without-gnome support.

Now using buildlink3 instead of buildlink2.

PLIST now has NEWS, README, and TODO added.

Also add patch-aa to get rid of use of GTK_DISABLE_DEPRECATED,
because that breaks the build with new gtk2 2.4.0.

4 files changed, 28 insertions, 12 deletions

diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 8e29a32f6ae..ea75adfc10c 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/03/08 19:40:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/13 16:27:26 reed Exp $
 #
 
-DISTNAME=	gtkam-0.1.10
-PKGREVISION=	7
+DISTNAME=	gtkam-0.1.11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
@@ -13,15 +11,16 @@ COMMENT=	Digital camera access graphical client (GTK2)
 
 DEPENDS+=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--without-bonobo
 CONFIGURE_ARGS+=	--without-bonobo-activation
+CONFIGURE_ARGS+=	--without-gnome
 
-.include "../../devel/libgphoto2/buildlink2.mk"
-.include "../../graphics/libexif-gtk/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/libgphoto2/buildlink3.mk"
+.include "../../graphics/libexif-gtk/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gtkam/PLIST b/graphics/gtkam/PLIST
index 6abd28c9fb3..193ff84f223 100644
--- a/graphics/gtkam/PLIST
+++ b/graphics/gtkam/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/16 15:06:19 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/13 16:27:26 reed Exp $
 bin/gtkam
 man/man1/gtkam.1
 share/doc/gtkam/AUTHORS
 share/doc/gtkam/COPYING
+share/doc/gtkam/NEWS
+share/doc/gtkam/README
+share/doc/gtkam/TODO
 share/gtkam/pixmaps/camera.xpm
 share/gtkam/pixmaps/configure.xpm
 share/gtkam/pixmaps/delete_images.xpm
diff --git a/graphics/gtkam/distinfo b/graphics/gtkam/distinfo
index e9fe0887869..5d79203437b 100644
--- a/graphics/gtkam/distinfo
+++ b/graphics/gtkam/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/12/24 21:38:33 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/04/13 16:27:26 reed Exp $
 
-SHA1 (gtkam-0.1.10.tar.bz2) = eda354f9e871e1d8e46a2ffdd1b668de531dc288
-Size (gtkam-0.1.10.tar.bz2) = 326015 bytes
+SHA1 (gtkam-0.1.11.tar.gz) = 732662e9d9f65d713c5f24b495aa13cef7db2362
+Size (gtkam-0.1.11.tar.gz) = 611388 bytes
+SHA1 (patch-aa) = b1758926c7b4e265b7cf9e86c15c896e8db880ca
diff --git a/graphics/gtkam/patches/patch-aa b/graphics/gtkam/patches/patch-aa
new file mode 100644
index 00000000000..2173be99223
--- /dev/null
+++ b/graphics/gtkam/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2004/04/13 16:27:26 reed Exp $
+
+--- src/Makefile.in.orig	2004-03-06 14:36:27.000000000 -0800
++++ src/Makefile.in
+@@ -106,7 +106,7 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIB
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ 
+-INCLUDES =   -I$(top_srcdir)/intl				 -DIMAGE_DIR=\"$(datadir)/images/gtkam\" 	 -DGTKAM_LOCALEDIR=\"$(datadir)/locale\"	 -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\"	 -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\"		 -DAPP_DATADIR=\"$(datadir)/\"		 -DGTK_DISABLE_DEPRECATED			 $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS)	 $(BONOBO_CFLAGS)				 $(GTKAM_GIMP_CFLAGS)
++INCLUDES =   -I$(top_srcdir)/intl				 -DIMAGE_DIR=\"$(datadir)/images/gtkam\" 	 -DGTKAM_LOCALEDIR=\"$(datadir)/locale\"	 -DPACKAGE_DATA_DIR=\"$(datadir)/gtkam\"	 -DPACKAGE_SOURCE_DIR=\"$(top_srcdir)\"		 -DAPP_DATADIR=\"$(datadir)/\"	 $(EXIF_CFLAGS) $(GNOME_CFLAGS) $(GTKAM_CFLAGS)	 $(BONOBO_CFLAGS)				 $(GTKAM_GIMP_CFLAGS)
+ 
+ 
+ noinst_LIBRARIES = libgtkam.a