summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig>2006-05-31 13:31:34 +0000
committerrillig <rillig>2006-05-31 13:31:34 +0000
commit11243397d5ed6a2df47d05f4ecec0a9db586adee (patch)
tree866970418de36b7204f34d5749490c456dcc84e4
parent9249f78988d75d197649e603b6a6928884b91485 (diff)
downloadpkgsrc-11243397d5ed6a2df47d05f4ecec0a9db586adee.tar.gz
Fixed pkglint warnings, including a configuration file issue. Bumped
PKGREVISION.
-rw-r--r--devel/GConf/Makefile13
-rw-r--r--devel/GConf/PLIST4
-rw-r--r--devel/GConf/buildlink3.mk4
3 files changed, 13 insertions, 8 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index b595295fbfd..eac2af43849 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/05/31 13:31:34 rillig Exp $
#
DISTNAME= GConf-1.0.9
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/1.0/}
EXTRACT_SUFX= .tar.bz2
@@ -23,9 +23,14 @@ PKGCONFIG_OVERRIDE= gconf.pc.in
PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
+EGDIR= ${PREFIX}/share/examples/gconf
REQD_DIRS+= ${PKG_SYSCONFDIR}/gconf ${PKG_SYSCONFDIR}/gconf/1
-CONF_FILES+= ${PREFIX}/share/examples/gconf/default.path \
- ${PKG_SYSCONFDIR}/gconf/1/path
+REQD_DIRS+= ${PKG_SYSCONFDIR}/gconf/schemas
+CONF_FILES+= ${EGDIR}/default.path ${PKG_SYSCONFDIR}/gconf/1/path
+CONF_FILES+= ${EGDIR}/desktop.schemas \
+ ${PKG_SYSCONFDIR}/gconf/schemas/desktop.schemas
+
+INSTALL_MAKE_FLAGS+= schemadir=${EGDIR}
pre-build:
${RM} -f ${WRKSRC}/gconf/libxml
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index a0667ed6aac..4bd0aa22dcb 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.19 2006/04/17 07:07:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/05/31 13:31:34 rillig Exp $
bin/gconf-config
bin/gconf-config-1
bin/gconf-sanity-check-1
bin/gconfd-1
bin/gconftool
bin/gconftool-1
-etc/gconf/schemas/desktop.schemas
include/gconf/1/gconf/gconf-changeset.h
include/gconf/1/gconf/gconf-client.h
include/gconf/1/gconf/gconf-engine.h
@@ -22,6 +21,7 @@ lib/pkgconfig/gconf.pc
lib/pkgconfig/gconfgtk.pc
share/aclocal/gconf-1.m4
share/examples/gconf/default.path
+share/examples/gconf/desktop.schemas
share/locale/az/LC_MESSAGES/GConf.mo
share/locale/ca/LC_MESSAGES/GConf.mo
share/locale/cs/LC_MESSAGES/GConf.mo
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index 5054b92cb94..6b40fc287d3 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/04/17 13:46:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/05/31 13:31:34 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= GConf
.if !empty(GCONF_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.GConf+= GConf>=1.0.9nb7
-BUILDLINK_ABI_DEPENDS.GConf?= GConf>=1.0.9nb10
+BUILDLINK_ABI_DEPENDS.GConf+= GConf>=1.0.9nb10
BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
.endif # GCONF_BUILDLINK3_MK