diff options
author | jmcneill <jmcneill> | 2009-03-06 00:08:08 +0000 |
---|---|---|
committer | jmcneill <jmcneill> | 2009-03-06 00:08:08 +0000 |
commit | 1c72379deb9651d3d5e55d2c7e18ec5eafe93f08 (patch) | |
tree | 6582bdb6756de22a77a95a2ea303dc2f4a6a1607 /devel/GConf | |
parent | 07c39936b6ec80f9255f5ce97968978991b52920 (diff) | |
download | pkgsrc-1c72379deb9651d3d5e55d2c7e18ec5eafe93f08.tar.gz |
Pull in policykit and enable the GConf defaults system dbus service. Bump
PKGREVISION.
Diffstat (limited to 'devel/GConf')
-rw-r--r-- | devel/GConf/Makefile | 7 | ||||
-rw-r--r-- | devel/GConf/PLIST | 6 | ||||
-rw-r--r-- | devel/GConf/distinfo | 4 | ||||
-rw-r--r-- | devel/GConf/patches/patch-ae | 13 | ||||
-rw-r--r-- | devel/GConf/patches/patch-af | 13 |
5 files changed, 40 insertions, 3 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 1958db668f6..b635e38056b 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.63 2008/10/09 20:53:48 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2009/03/06 00:08:08 jmcneill Exp $ # .include "../../devel/GConf/Makefile.common" +PKGREVISION= 1 + CONFIGURE_ARGS+= --disable-gtk CONFIGURE_ARGS+= ac_cv_header_ldap_h=no @@ -14,6 +16,8 @@ OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.mandatory EGDIR= ${PREFIX}/share/examples/GConf CONF_FILES= ${EGDIR}/path ${PKG_SYSCONFDIR}/2/path +CONF_FILES+= ${EGDIR}/org.gnome.GConf.Defaults.conf \ + ${PKG_SYSCONFBASEDIR}/dbus-1/system.d/org.gnome.GConf.Defaults.conf PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \ { print "@unexec $${RMDIR} -p %D/" $$2 \ @@ -28,6 +32,7 @@ post-install: BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" +.include "../../security/policykit/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST index fc392f3797e..77d20a42f06 100644 --- a/devel/GConf/PLIST +++ b/devel/GConf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2008/10/09 20:53:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.26 2009/03/06 00:08:08 jmcneill Exp $ bin/gconf-merge-tree bin/gconftool-2 include/gconf/2/gconf/gconf-changeset.h @@ -14,11 +14,15 @@ lib/GConf/2/libgconfbackend-oldxml.la lib/GConf/2/libgconfbackend-xml.la lib/libgconf-2.la lib/pkgconfig/gconf-2.0.pc +libexec/gconf-defaults-mechanism libexec/gconfd-2 man/man1/gconftool-2.1 +share/PolicyKit/policy/org.gnome.gconf.defaults.policy share/aclocal/gconf-2.m4 share/dbus-1/services/org.gnome.GConf.service +share/dbus-1/system-services/org.gnome.GConf.Defaults.service share/examples/GConf/path +share/examples/GConf/org.gnome.GConf.Defaults.conf share/gtk-doc/html/gconf/ch01.html share/gtk-doc/html/gconf/gconf-GConfClient.html share/gtk-doc/html/gconf/gconf-gconf-backend.html diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo index 4c8a3859956..31584b35599 100644 --- a/devel/GConf/distinfo +++ b/devel/GConf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2008/10/09 20:53:48 wiz Exp $ +$NetBSD: distinfo,v 1.20 2009/03/06 00:08:08 jmcneill Exp $ SHA1 (GConf-2.24.0.tar.bz2) = e93ff2609c0278075acabdf609f42aa406e20c8e RMD160 (GConf-2.24.0.tar.bz2) = b4016275e9dffa248620303bc2241f6c0081be06 @@ -6,3 +6,5 @@ Size (GConf-2.24.0.tar.bz2) = 1467817 bytes SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0 SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317 +SHA1 (patch-ae) = 9c91e159d1aadd5e602012fdf18173bbfdf5b4ef +SHA1 (patch-af) = 63bb82324e365e80d689850bcc75f6bd923f8b47 diff --git a/devel/GConf/patches/patch-ae b/devel/GConf/patches/patch-ae new file mode 100644 index 00000000000..6717efbbd65 --- /dev/null +++ b/devel/GConf/patches/patch-ae @@ -0,0 +1,13 @@ +$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 diff --git a/devel/GConf/patches/patch-af b/devel/GConf/patches/patch-af new file mode 100644 index 00000000000..a42b263f657 --- /dev/null +++ b/devel/GConf/patches/patch-af @@ -0,0 +1,13 @@ +$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 |