Update to 1.99.98. Changes since 1.99.95 include lots of things, specially

bug fixes.

Changes in the package:
- Depend on gnome2-dirs.
- Use the new schemas.mk framework to handle GConf2 schemas.

4 files changed, 26 insertions, 32 deletions

diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 89a6c60579c..e7165271bde 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/01/10 07:46:22 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/14 21:12:49 jmmv Exp $
 #
 
-DISTNAME=		ggv-1.99.95
-PKGREVISION=		1
+DISTNAME=		ggv-1.99.98
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.99/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME2 frontend for GhostScript
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
@@ -21,10 +21,14 @@ USE_GMAKE=		YES
 USE_X11=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
+CONFIGURE_ARGS+=	--disable-install-schemas
+
+GCONF2_SCHEMAS= 	ggv.schemas
 
 .include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ggv2/PLIST b/print/ggv2/PLIST
index 2e2cab0895f..b4e44be5225 100644
--- a/print/ggv2/PLIST
+++ b/print/ggv2/PLIST
@@ -1,21 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/03 09:17:01 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/14 21:12:49 jmmv Exp $
 bin/ggv
-etc/gconf/gconf.xml.defaults/apps/ggv/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/coordinates/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/ggv/printing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing/%gconf.xml
-etc/gconf/schemas/ggv.schemas
 lib/bonobo/servers/GNOME_GGV.server
 libexec/ggv-postscript-viewer
 share/applications/ggv.desktop
+share/gconf/schemas/ggv.schemas
 share/gnome-2.0/ui/ggv-control-ui.xml
 share/gnome-2.0/ui/ggv-postscript-view-ui.xml
 share/gnome-2.0/ui/ggv-ui.xml
@@ -75,15 +63,3 @@ share/pixmaps/gnome-ghostview.png
 @dirrm share/gnome/help/ggv/C/figures
 @dirrm share/gnome/help/ggv/C
 @dirrm share/gnome/help/ggv
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/printing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/layout
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/gtkgs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/coordinates
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv/control
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/ggv
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/printing
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/layout
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/gtkgs
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/coordinates
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv/control
-@dirrm etc/gconf/gconf.xml.defaults/apps/ggv
diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo
index decc20e9b2f..f612b626070 100644
--- a/print/ggv2/distinfo
+++ b/print/ggv2/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/03 09:17:01 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/02/14 21:12:49 jmmv Exp $
 
-SHA1 (ggv-1.99.95.tar.bz2) = d233d010b2e28a36b8e5128458c7ca5f9146b780
-Size (ggv-1.99.95.tar.bz2) = 581660 bytes
+SHA1 (ggv-1.99.98.tar.bz2) = 39fc6442164bd90cd114e1b24c210fad1c3238be
+Size (ggv-1.99.98.tar.bz2) = 639144 bytes
+SHA1 (patch-aa) = d92ff0c733f7c34b2f03f004b75c4af2d53f08d4
diff --git a/print/ggv2/patches/patch-aa b/print/ggv2/patches/patch-aa
new file mode 100644
index 00000000000..b185df0b4aa
--- /dev/null
+++ b/print/ggv2/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/02/14 21:12:49 jmmv Exp $
+
+--- Makefile.in.orig	2003-02-04 14:42:06.000000000 +0100
++++ Makefile.in
+@@ -140,7 +140,7 @@ SUBDIRS = po idl src bonobo pixmaps help
+ DESKTOP_IN_FILES = ggv.desktop.in
+ DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+ 
+-schemasdir = $(sysconfdir)/gconf/schemas
++schemasdir = $(datadir)/gconf/schemas
+ schemas_DATA = ggv.schemas
+ 
+ EXTRA_DIST =  	$(DESKTOP_FILES)		$(DESKTOP_IN_FILES)		ggv.spec.in 			ggv.spec			ggv.schemas			xmldocs.make		        intltool-extract.in     	intltool-update.in              intltool-merge.in       	COPYING-DOCS			TODO				MAINTAINERS