summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjmmv <jmmv>2004-09-04 16:10:12 +0000
committerjmmv <jmmv>2004-09-04 16:10:12 +0000
commit654175d86efd41a8b1f3f6fd5de7a3d90995a212 (patch)
treeb4cbe071d1773480ab6c6ec8ee08cbf8aee1599b /editors
parent45263dd9eaa9e74e82615c6cf04f2b1063d25ddb (diff)
downloadpkgsrc-654175d86efd41a8b1f3f6fd5de7a3d90995a212.tar.gz
Set the path to GConf2's configuration database manually, to fix multiple
crashes. The problem is that the configure script is picking the gconftool-2 binary from the buildlink directory, which does nothing, so it gets an incorrect configuration. Bump PKGREVISION to 1.
Diffstat (limited to 'editors')
-rw-r--r--editors/gconf-editor/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 3a967f425fd..314428a1956 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/06/28 13:34:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/09/04 16:10:12 jmmv Exp $
#
DISTNAME= gconf-editor-2.6.2
+PKGREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gconf-editor/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +21,10 @@ USE_PKGLOCALEDIR= YES
USE_GNU_TOOLS+= make
USE_X11= YES
-.include "../../devel/GConf2/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE}
+CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
+
+.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"