Fri Mar 6 00:08:09 2009 UTC ()
Pull in policykit and enable the GConf defaults system dbus service. Bump
PKGREVISION.


(jmcneill)
diff -r1.63 -r1.64 pkgsrc/devel/GConf/Makefile
diff -r1.25 -r1.26 pkgsrc/devel/GConf/PLIST
diff -r1.19 -r1.20 pkgsrc/devel/GConf/distinfo
diff -r0 -r1.6 pkgsrc/devel/GConf/patches/patch-ae
diff -r0 -r1.1 pkgsrc/devel/GConf/patches/patch-af
cvs diff -r1.63 -r1.64 pkgsrc/devel/GConf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/GConf/Makefile 2008/10/09 20:53:48 1.63
+++ pkgsrc/devel/GConf/Makefile 2009/03/06 00:08:08 1.64
@@ -1,35 +1,40 @@ @@ -1,35 +1,40 @@
1# $NetBSD: Makefile,v 1.63 2008/10/09 20:53:48 wiz Exp $ 1# $NetBSD: Makefile,v 1.64 2009/03/06 00:08:08 jmcneill Exp $
2# 2#
3 3
4.include "../../devel/GConf/Makefile.common" 4.include "../../devel/GConf/Makefile.common"
5 5
 6PKGREVISION= 1
 7
6CONFIGURE_ARGS+= --disable-gtk 8CONFIGURE_ARGS+= --disable-gtk
7CONFIGURE_ARGS+= ac_cv_header_ldap_h=no 9CONFIGURE_ARGS+= ac_cv_header_ldap_h=no
8 10
9CONFLICTS+= GConf2-[0-9]* 11CONFLICTS+= GConf2-[0-9]*
10 12
11OWN_DIRS= ${PKG_SYSCONFDIR}/2 13OWN_DIRS= ${PKG_SYSCONFDIR}/2
12OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults 14OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults
13OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory 15OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory
14 16
15EGDIR= ${PREFIX}/share/examples/GConf 17EGDIR= ${PREFIX}/share/examples/GConf
16CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path 18CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
 19CONF_FILES+= ${EGDIR}/org.gnome.GConf.Defaults.conf \
 20 ${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.gnome.GConf.Defaults.conf
17 21
18PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \ 22PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \
19 { print "@unexec $${RMDIR} -p %D/" $$2 \ 23 { print "@unexec $${RMDIR} -p %D/" $$2 \
20 " 2>/dev/null || $${TRUE}"; next} 24 " 2>/dev/null || $${TRUE}"; next}
21 25
22# XXX: We need to use XML_CATALOGS here to register the installed DTD. 26# XXX: We need to use XML_CATALOGS here to register the installed DTD.
23# But we have to wait until a public identifier is choosen for it. 27# But we have to wait until a public identifier is choosen for it.
24 28
25post-install: 29post-install:
26 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas 30 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas
27 31
28BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74 32BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74
29.include "../../devel/gettext-lib/buildlink3.mk" 33.include "../../devel/gettext-lib/buildlink3.mk"
30.include "../../net/ORBit2/buildlink3.mk" 34.include "../../net/ORBit2/buildlink3.mk"
 35.include "../../security/policykit/buildlink3.mk"
31.include "../../sysutils/dbus/buildlink3.mk" 36.include "../../sysutils/dbus/buildlink3.mk"
32.include "../../sysutils/dbus-glib/buildlink3.mk" 37.include "../../sysutils/dbus-glib/buildlink3.mk"
33.include "../../textproc/libxml2/buildlink3.mk" 38.include "../../textproc/libxml2/buildlink3.mk"
34.include "../../textproc/xmlcatmgr/buildlink3.mk" 39.include "../../textproc/xmlcatmgr/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/devel/GConf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/GConf/PLIST 2008/10/09 20:53:48 1.25
+++ pkgsrc/devel/GConf/PLIST 2009/03/06 00:08:08 1.26
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1@comment $NetBSD: PLIST,v 1.25 2008/10/09 20:53:48 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.26 2009/03/06 00:08:08 jmcneill Exp $
2bin/gconf-merge-tree 2bin/gconf-merge-tree
3bin/gconftool-2 3bin/gconftool-2
4include/gconf/2/gconf/gconf-changeset.h 4include/gconf/2/gconf/gconf-changeset.h
5include/gconf/2/gconf/gconf-client.h 5include/gconf/2/gconf/gconf-client.h
6include/gconf/2/gconf/gconf-engine.h 6include/gconf/2/gconf/gconf-engine.h
7include/gconf/2/gconf/gconf-enum-types.h 7include/gconf/2/gconf/gconf-enum-types.h
8include/gconf/2/gconf/gconf-error.h 8include/gconf/2/gconf/gconf-error.h
9include/gconf/2/gconf/gconf-listeners.h 9include/gconf/2/gconf/gconf-listeners.h
10include/gconf/2/gconf/gconf-schema.h 10include/gconf/2/gconf/gconf-schema.h
11include/gconf/2/gconf/gconf-value.h 11include/gconf/2/gconf/gconf-value.h
12include/gconf/2/gconf/gconf.h 12include/gconf/2/gconf/gconf.h
13lib/GConf/2/libgconfbackend-oldxml.la 13lib/GConf/2/libgconfbackend-oldxml.la
14lib/GConf/2/libgconfbackend-xml.la 14lib/GConf/2/libgconfbackend-xml.la
15lib/libgconf-2.la 15lib/libgconf-2.la
16lib/pkgconfig/gconf-2.0.pc 16lib/pkgconfig/gconf-2.0.pc
 17libexec/gconf-defaults-mechanism
17libexec/gconfd-2 18libexec/gconfd-2
18man/man1/gconftool-2.1 19man/man1/gconftool-2.1
 20share/PolicyKit/policy/org.gnome.gconf.defaults.policy
19share/aclocal/gconf-2.m4 21share/aclocal/gconf-2.m4
20share/dbus-1/services/org.gnome.GConf.service 22share/dbus-1/services/org.gnome.GConf.service
 23share/dbus-1/system-services/org.gnome.GConf.Defaults.service
21share/examples/GConf/path 24share/examples/GConf/path
 25share/examples/GConf/org.gnome.GConf.Defaults.conf
22share/gtk-doc/html/gconf/ch01.html 26share/gtk-doc/html/gconf/ch01.html
23share/gtk-doc/html/gconf/gconf-GConfClient.html 27share/gtk-doc/html/gconf/gconf-GConfClient.html
24share/gtk-doc/html/gconf/gconf-gconf-backend.html 28share/gtk-doc/html/gconf/gconf-gconf-backend.html
25share/gtk-doc/html/gconf/gconf-gconf-changeset.html 29share/gtk-doc/html/gconf/gconf-gconf-changeset.html
26share/gtk-doc/html/gconf/gconf-gconf-engine.html 30share/gtk-doc/html/gconf/gconf-gconf-engine.html
27share/gtk-doc/html/gconf/gconf-gconf-error.html 31share/gtk-doc/html/gconf/gconf-gconf-error.html
28share/gtk-doc/html/gconf/gconf-gconf-internals.html 32share/gtk-doc/html/gconf/gconf-gconf-internals.html
29share/gtk-doc/html/gconf/gconf-gconf-listeners.html 33share/gtk-doc/html/gconf/gconf-gconf-listeners.html
30share/gtk-doc/html/gconf/gconf-gconf-locale.html 34share/gtk-doc/html/gconf/gconf-gconf-locale.html
31share/gtk-doc/html/gconf/gconf-gconf-schema.html 35share/gtk-doc/html/gconf/gconf-gconf-schema.html
32share/gtk-doc/html/gconf/gconf-gconf-sources.html 36share/gtk-doc/html/gconf/gconf-gconf-sources.html
33share/gtk-doc/html/gconf/gconf-gconf-value.html 37share/gtk-doc/html/gconf/gconf-gconf-value.html
34share/gtk-doc/html/gconf/gconf-gconf.html 38share/gtk-doc/html/gconf/gconf-gconf.html
cvs diff -r1.19 -r1.20 pkgsrc/devel/GConf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/GConf/distinfo 2008/10/09 20:53:48 1.19
+++ pkgsrc/devel/GConf/distinfo 2009/03/06 00:08:08 1.20
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.19 2008/10/09 20:53:48 wiz Exp $ 1$NetBSD: distinfo,v 1.20 2009/03/06 00:08:08 jmcneill Exp $
2 2
3SHA1 (GConf-2.24.0.tar.bz2) = e93ff2609c0278075acabdf609f42aa406e20c8e 3SHA1 (GConf-2.24.0.tar.bz2) = e93ff2609c0278075acabdf609f42aa406e20c8e
4RMD160 (GConf-2.24.0.tar.bz2) = b4016275e9dffa248620303bc2241f6c0081be06 4RMD160 (GConf-2.24.0.tar.bz2) = b4016275e9dffa248620303bc2241f6c0081be06
5Size (GConf-2.24.0.tar.bz2) = 1467817 bytes 5Size (GConf-2.24.0.tar.bz2) = 1467817 bytes
6SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0 6SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
7SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a 7SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a
8SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317 8SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
 9SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef
 10SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47
File Added: pkgsrc/devel/GConf/patches/patch-ae
$NetBSD: patch-ae,v 1.6 2009/03/06 00:08:08 jmcneill Exp $

--- defaults/Makefile.am.orig	2008-08-19 05:26:21.000000000 -0400
+++ defaults/Makefile.am
@@ -24,7 +24,7 @@ gconf_defaults_mechanism_LDADD = \
 BUILT_SOURCES = gconf-defaults-glue.h
 
 dbus_servicesdir = $(datadir)/dbus-1/system-services
-dbus_confdir = $(sysconfdir)/dbus-1/system.d
+dbus_confdir = $(PREFIX)/share/examples/GConf
 polkitdir = $(datadir)/PolicyKit/policy
 
 dbus_services_in_files = org.gnome.GConf.Defaults.service.in
File Added: pkgsrc/devel/GConf/patches/patch-af
$NetBSD: patch-af,v 1.1 2009/03/06 00:08:08 jmcneill Exp $

--- defaults/Makefile.in.orig	2009-03-05 18:35:30.000000000 -0500
+++ defaults/Makefile.in
@@ -282,7 +282,7 @@ gconf_defaults_mechanism_LDADD = \
 
 BUILT_SOURCES = gconf-defaults-glue.h
 dbus_servicesdir = $(datadir)/dbus-1/system-services
-dbus_confdir = $(sysconfdir)/dbus-1/system.d
+dbus_confdir = $(PREFIX)/share/examples/GConf
 polkitdir = $(datadir)/PolicyKit/policy
 dbus_services_in_files = org.gnome.GConf.Defaults.service.in
 polkit_in_files = org.gnome.gconf.defaults.policy.in