diff options
| author | drochner <drochner@pkgsrc.org> | 2007-04-17 15:59:50 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-04-17 15:59:50 +0000 |
| commit | bd1dc40f3bc7aca2013070f1587bb2654222faf9 (patch) | |
| tree | 11a339d773397c00841c643aa144259493c2a520 | |
| parent | 1733259badaed51645a1351037d3cbc65a6e0b80 (diff) | |
| download | pkgsrc-bd1dc40f3bc7aca2013070f1587bb2654222faf9.tar.gz | |
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
| -rw-r--r-- | x11/gnome2-control-center/Makefile | 12 | ||||
| -rw-r--r-- | x11/gnome2-control-center/PLIST | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 5a436f2b45a..b52fc53917d 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -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-alsa 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 @@ PKGCONFIG_OVERRIDE+= libwindow-settings/gnome-window-settings-2.0.pc 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+= 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 + ${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 --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST index 3ea54dbd600..16b618b6b3d 100644 --- a/x11/gnome2-control-center/PLIST +++ b/x11/gnome2-control-center/PLIST @@ -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/font-method.directory 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 |