Make sure PKG_SYSCONFDIR/gconf.xml.system is created, and patch up hardcoded

search path of /etc/gconf in 2/path.
This commit is contained in:
jmcneill 2009-03-17 10:12:25 +00:00
parent 76cc46899b
commit 0058181f49
3 changed files with 19 additions and 2 deletions

View file

@ -1,8 +1,10 @@
# $NetBSD: Makefile,v 1.65 2009/03/17 08:54:30 jmcneill Exp $
# $NetBSD: Makefile,v 1.66 2009/03/17 10:12:25 jmcneill Exp $
#
.include "../../devel/GConf/Makefile.common"
PKGREVISION= 1
CONFIGURE_ARGS+= --disable-gtk
CONFIGURE_ARGS+= ac_cv_header_ldap_h=no
@ -11,6 +13,7 @@ CONFLICTS+= GConf2-[0-9]*
OWN_DIRS= ${PKG_SYSCONFDIR}/2
OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults
OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory
OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.system
EGDIR= ${PREFIX}/share/examples/GConf
CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.21 2009/03/17 08:54:30 jmcneill Exp $
$NetBSD: distinfo,v 1.22 2009/03/17 10:12:25 jmcneill Exp $
SHA1 (GConf-2.26.0.tar.bz2) = 317fd4504cc4104b7b914326cbb3b73d61234b4c
RMD160 (GConf-2.26.0.tar.bz2) = 0673a347b42519f411a7ba247aad12e8249f754d
@ -8,3 +8,4 @@ SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef
SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47
SHA1 (patch-ag) = d9a4347443f114785f236c76881cce1b8881c81d

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1 2009/03/17 10:12:25 jmcneill Exp $
--- gconf/default.path.in.orig 2009-02-16 14:34:10.000000000 -0500
+++ gconf/default.path.in
@@ -21,7 +21,7 @@ include "$(HOME)/.gconf.path"
xml:readwrite:$(HOME)/.gconf
# Location for system-wide settings that are set by the defaults mechanism
-xml:readonly:/etc/gconf/gconf.xml.system
+xml:readonly:@sysgconfdir@/gconf.xml.system
# To read in any defaults settings that the Sys Admin may have created
# prior to a desktop system upgrade. The SysAdmin can stick default values