summaryrefslogtreecommitdiff
path: root/devel/dconf
diff options
context:
space:
mode:
authorprlw1 <prlw1>2014-10-28 07:36:21 +0000
committerprlw1 <prlw1>2014-10-28 07:36:21 +0000
commit65daccbd1830df80892149a25fb1ca61f39aaf10 (patch)
tree1b5412f2f1d23b02514facd607d862922541730b /devel/dconf
parent3af1ecb10e92fb671f53c11dd93ea671381c3183 (diff)
downloadpkgsrc-65daccbd1830df80892149a25fb1ca61f39aaf10.tar.gz
Replace revision 1.4 change inadvertently removed in last update.
Fixes use of database.mk - reported by obata@
Diffstat (limited to 'devel/dconf')
-rw-r--r--devel/dconf/Makefile4
-rw-r--r--devel/dconf/Makefile.common11
2 files changed, 13 insertions, 2 deletions
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index f2336fa2006..9f15868c91b 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2014/09/10 10:54:46 prlw1 Exp $
+# $NetBSD: Makefile,v 1.23 2014/10/28 07:36:21 prlw1 Exp $
.include "Makefile.common"
+PKGREVISION= 1
+
CONFIGURE_ARGS+= --disable-editor
PKGCONFIG_OVERRIDE+= client/dconf.pc.in dbus-1/dconf-dbus-1.pc.in
diff --git a/devel/dconf/Makefile.common b/devel/dconf/Makefile.common
index 2c7ef385d5d..e31e1310046 100644
--- a/devel/dconf/Makefile.common
+++ b/devel/dconf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2014/09/10 10:54:46 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.6 2014/10/28 07:36:21 prlw1 Exp $
#
# used by devel/dconf-editor/Makefile
@@ -16,3 +16,12 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c99
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt
+
+SUBST_CLASSES+= sysdir
+SUBST_MESSAGE.sysdir= Fixes hard-coded dconf database directory name
+SUBST_STAGE.sysdir= post-configure
+SUBST_FILES.sysdir= engine/dconf-engine-source-system.c
+SUBST_FILES.sysdir+= tests/engine.c
+SUBST_FILES.sysdir+= bin/dconf-update.c
+SUBST_FILES.sysdir+= bin/dconf-update.vala
+SUBST_SED.sysdir= -e s,/etc/dconf,${PKG_SYSCONFDIR}/dconf,g