[pkgsrc/trunk]: pkgsrc/x11/gnome2-control-center clean up config file stuff: ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/981b4565c8d8
branches:  trunk
changeset: 527972:981b4565c8d8
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Apr 17 15:59:50 2007 +0000

description:
clean up config file stuff: use explicit paths instead of
PKG_SYSCONFSUBDIR and use CONF_FILES for gnomecc.menu,
should fix error seen in bulk build

diffstat:

 x11/gnome2-control-center/Makefile |  12 ++++++------
 x11/gnome2-control-center/PLIST    |   3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r e2514eff795f -r 981b4565c8d8 x11/gnome2-control-center/Makefile
--- a/x11/gnome2-control-center/Makefile        Tue Apr 17 15:04:44 2007 +0000
+++ b/x11/gnome2-control-center/Makefile        Tue Apr 17 15:59:50 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2007/04/11 17:48:09 drochner Exp $
+# $NetBSD: Makefile,v 1.78 2007/04/17 15:59:50 drochner Exp $
 #
 
 DISTNAME=      control-center-2.18.1
@@ -21,7 +21,6 @@
 CONFIGURE_ARGS+=       --disable-hal
 CONFIGURE_ARGS+=       --enable-aboutme
 CONFIGURE_ARGS+=       --with-gstreamer=0.10
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
 CPPFLAGS+=             -DDBUS_API_SUBJECT_TO_CHANGE
 
@@ -30,6 +29,7 @@
 
 INSTALL_MAKE_FLAGS+=   ${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=   vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
+INSTALL_MAKE_FLAGS+=   menudir=${PREFIX}/share/examples/${PKGBASE}
 
 GCONF2_SCHEMAS=        apps_gnome_settings_daemon_default_editor.schemas
 GCONF2_SCHEMAS+=       apps_gnome_settings_daemon_keybindings.schemas
@@ -39,13 +39,13 @@
 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
+                       ${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/theme-method.conf
 CONF_FILES+=           ${EGDIR}/font-method.conf \
-                       ${PKG_SYSCONFDIR}/font-method.conf
+                       ${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/font-method.conf
+CONF_FILES+=           ${EGDIR}/gnomecc.menu \
+                       ${PKG_SYSCONFDIR}/xdg/menus/gnomecc.menu
 
 BUILDLINK_API_DEPENDS.glib2=   glib2>=2.8.0
 BUILDLINK_API_DEPENDS.gstreamer0.10=           gstreamer0.10>=0.10.1.2
diff -r e2514eff795f -r 981b4565c8d8 x11/gnome2-control-center/PLIST
--- a/x11/gnome2-control-center/PLIST   Tue Apr 17 15:04:44 2007 +0000
+++ b/x11/gnome2-control-center/PLIST   Tue Apr 17 15:59:50 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/04/11 17:48:10 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/04/17 15:59:50 drochner Exp $
 bin/gnome-about-me
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
@@ -116,6 +116,7 @@
 share/desktop-directories/gnomecc.directory
 share/desktop-directories/theme-method.directory
 share/examples/gnome2-control-center/font-method.conf
+share/examples/gnome2-control-center/gnomecc.menu
 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_keybindings.schemas