Install configuration files into ${PKG_SYSCONFDIR} and add fontilus,

themus schemas into GCONF2_SCHEMAS.

5 files changed, 73 insertions, 3 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 861db082986..81e357d96c1 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/12/14 23:25:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2003/12/15 02:55:53 xtraeme Exp $
 #
 
 DISTNAME=	control-center-2.4.0
@@ -16,16 +16,36 @@ DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 USE_X11=		yes
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GCONF2_SCHEMAS= 	apps_gnome_settings_daemon_default_editor.schemas
 GCONF2_SCHEMAS+=	apps_gnome_settings_daemon_screensaver.schemas
 GCONF2_SCHEMAS+=	desktop_gnome_font_rendering.schemas
+GCONF2_SCHEMAS+=	themus.schemas
+GCONF2_SCHEMAS+=	fontilus.schemas
+
+PKG_SYSCONFSUBDIR=	gnome-vfs-2.0/modules
+
+EGDIR=			${PREFIX}/share/examples/gnome2-control-center
+CONF_FILES=		${EGDIR}/theme-method.conf \
+			${PKG_SYSCONFDIR}/theme-method.conf
+CONF_FILES+=		${EGDIR}/font-method.conf \
+			${PKG_SYSCONFDIR}/font-method.conf
+
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vfs-methods/themus/theme-method.conf \
+		${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \
+		${EGDIR}
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 5770d9939a5..ba2af9ad89a 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/14 23:25:56 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/15 02:55:53 xtraeme Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -20,10 +20,12 @@ bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
+bin/themus-theme-applier
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
 lib/bonobo/libthemus-theme-properties-view.a
 lib/bonobo/libthemus-theme-properties-view.la
+lib/bonobo/libthemus-theme-properties-view.so
 lib/bonobo/servers/GNOME_SettingsDaemon.server
 lib/bonobo/servers/Themus_Properties_View.server
 lib/bonobo/servers/fontilus.server
@@ -32,6 +34,7 @@ lib/gnome-vfs-2.0/modules/libfont-method.la
 lib/gnome-vfs-2.0/modules/libfont-method.so
 lib/gnome-vfs-2.0/modules/libtheme-method.a
 lib/gnome-vfs-2.0/modules/libtheme-method.la
+lib/gnome-vfs-2.0/modules/libtheme-method.so
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
@@ -129,9 +132,13 @@ share/control-center-2.0/xrdb/Motif.ad
 share/control-center-2.0/xrdb/Tk.ad
 share/control-center-2.0/xrdb/Xaw.ad
 share/control-center/apply-font.glade
+share/examples/gnome2-control-center/font-method.conf
+share/examples/gnome2-control-center/theme-method.conf
 share/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
+share/gconf/schemas/fontilus.schemas
+share/gconf/schemas/themus.schemas
 share/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 13a4b9f830f..11ad2472ea2 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.6 2003/12/14 23:25:56 xtraeme Exp $
+$NetBSD: distinfo,v 1.7 2003/12/15 02:55:53 xtraeme Exp $
 
 SHA1 (control-center-2.4.0.tar.bz2) = f858040bb793a7385100eadd2a9de68f387ed879
 Size (control-center-2.4.0.tar.bz2) = 2042574 bytes
 SHA1 (patch-aa) = a0fd0bff85be1b18cee001fe273b4a82efe8580a
+SHA1 (patch-ab) = 51b51831410ea1642dfbec1e540848e6c6ed08f9
+SHA1 (patch-ac) = a8b88935b80f0a96bda42f1b697b4c51bdd2868f
diff --git a/x11/gnome2-control-center/patches/patch-ab b/x11/gnome2-control-center/patches/patch-ab
new file mode 100644
index 00000000000..95f198bb28a
--- /dev/null
+++ b/x11/gnome2-control-center/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2003/12/15 02:55:53 xtraeme Exp $
+
+--- vfs-methods/fontilus/Makefile.in.orig	2003-12-15 03:25:37.000000000 +0100
++++ vfs-methods/fontilus/Makefile.in	2003-12-15 03:28:58.000000000 +0100
+@@ -215,14 +215,13 @@
+ appregdir = $(datadir)/application-registry
+ appreg_DATA = fontilus.applications
+ 
+-schemasdir = $(sysconfdir)/gconf/schemas
++schemasdir = $(datadir)/gconf/schemas
+ schemas_DATA = fontilus.schemas
+ 
+ serverdir = $(libdir)/bonobo/servers
+ server_DATA = fontilus.server
+ 
+ EXTRA_DIST = \
+-  font-method.conf \
+   font-method.directory.in \
+   fontilus.keys \
+   fontilus.mime \
diff --git a/x11/gnome2-control-center/patches/patch-ac b/x11/gnome2-control-center/patches/patch-ac
new file mode 100644
index 00000000000..0266cc58d58
--- /dev/null
+++ b/x11/gnome2-control-center/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2003/12/15 02:55:53 xtraeme Exp $
+
+--- vfs-methods/themus/Makefile.in.orig	2003-12-15 03:29:42.000000000 +0100
++++ vfs-methods/themus/Makefile.in	2003-12-15 03:30:13.000000000 +0100
+@@ -236,7 +236,7 @@
+ vfsdirectorydir = $(datadir)/gnome/vfolders
+ vfsdirectory_DATA = theme-method.directory
+ 
+-schemasdir = $(sysconfdir)/gconf/schemas
++schemasdir = $(datadir)/gconf/schemas
+ schemas_in_files = themus.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+ 
+@@ -255,7 +255,6 @@
+ EXTRA_DIST = \
+   apply-font.glade \
+   theme-method.directory.in \
+-  theme-method.conf \
+   themus.schemas.in \
+   Themus_Properties_View.server.in.in \
+   themus.applications \