Use the framework provided by GConf2/schemas.mk to register .schemas files.

Depend on gnome2-dirs to handle shared directories.
Bump PKGREVISION.

4 files changed, 19 insertions, 28 deletions

diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 33985a102a3..2c95a75c803 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/01/10 08:00:02 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/14 21:13:35 jmmv Exp $
 #
 
 DISTNAME=		gnome-terminal-2.0.1
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		xterm like terminal program for GNOME 2
 
 BUILD_USES_MSGFMT=	YES
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 USE_PERL5=		build
 GNU_CONFIGURE=		YES
@@ -23,9 +24,11 @@ USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+GCONF2_SCHEMAS= 	gnome-terminal.schemas
+
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/libzvt/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
 .include "../../textproc/scrollkeeper/buildlink2.mk"
diff --git a/x11/gnome2-terminal/PLIST b/x11/gnome2-terminal/PLIST
index b0f9599dfa2..2fd53d8a661 100644
--- a/x11/gnome2-terminal/PLIST
+++ b/x11/gnome2-terminal/PLIST
@@ -1,18 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/30 10:32:14 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/14 21:13:35 jmmv Exp $
 bin/gnome2-terminal
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/schemas/gnome-terminal.schemas
 lib/bonobo/servers/gnome-terminal.server
 share/applications/gnome-terminal.desktop
+share/gconf/schemas/gnome-terminal.schemas
 share/gnome-terminal/glade/gnome-terminal.glade2
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
@@ -57,13 +47,3 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal
 @dirrm share/gnome-terminal/glade
 @dirrm share/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles/Default
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/profiles
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
diff --git a/x11/gnome2-terminal/distinfo b/x11/gnome2-terminal/distinfo
index 18861dafda5..81e5f8750be 100644
--- a/x11/gnome2-terminal/distinfo
+++ b/x11/gnome2-terminal/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/10/30 10:32:15 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/02/14 21:13:35 jmmv Exp $
 
 SHA1 (gnome-terminal-2.0.1.tar.bz2) = 514a21a00f9a6b87161f4b90acc553ec3ede02a1
 Size (gnome-terminal-2.0.1.tar.bz2) = 616470 bytes
-SHA1 (patch-aa) = f87211a54c16b23730566c8149a1b3f5efbd6acd
+SHA1 (patch-aa) = 45f8eb55e2ecaaf36ad580c325cf42a146f30f1f
diff --git a/x11/gnome2-terminal/patches/patch-aa b/x11/gnome2-terminal/patches/patch-aa
index ae80e9f9b6f..6a408de3347 100644
--- a/x11/gnome2-terminal/patches/patch-aa
+++ b/x11/gnome2-terminal/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/30 10:32:15 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/14 21:13:35 jmmv Exp $
 
 --- src/Makefile.in.orig	Mon Aug  5 03:05:07 2002
 +++ src/Makefile.in
@@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/10/30 10:32:15 rh Exp $
  	  else :; fi; \
  	done
  
+@@ -603,7 +603,6 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ install-data-local:
+-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ 
+ regenerate-built-sources:
+ 	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh