diff options
-rw-r--r-- | devel/GConf-ui/Makefile | 4 | ||||
-rw-r--r-- | devel/GConf/Makefile | 5 | ||||
-rw-r--r-- | devel/GConf/Makefile.common | 8 | ||||
-rw-r--r-- | devel/GConf/PLIST | 7 | ||||
-rw-r--r-- | devel/GConf/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/GConf/distinfo | 10 | ||||
-rw-r--r-- | devel/GConf/patches/patch-ac | 8 |
7 files changed, 28 insertions, 18 deletions
diff --git a/devel/GConf-ui/Makefile b/devel/GConf-ui/Makefile index 023b879de3f..b3059f83bab 100644 --- a/devel/GConf-ui/Makefile +++ b/devel/GConf-ui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/10/31 19:46:18 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/09 20:53:48 wiz Exp $ # .include "../../devel/GConf/Makefile.common" @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.GConf+= GConf>=${GCONF_VERSION} CONFIGURE_ARGS+= --enable-gtk -BUILD_DIRS= ${WRKSRC}/gconf +BUILD_DIRS= gconf BUILD_TARGET= gconfmarshal.h gconfmarshal.c GConfX.h gconf-sanity-check-2 INSTALLATION_DIRS= libexec diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index 62db3b3e9a3..1958db668f6 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2007/10/31 19:46:17 drochner Exp $ +# $NetBSD: Makefile,v 1.63 2008/10/09 20:53:48 wiz Exp $ # .include "../../devel/GConf/Makefile.common" @@ -25,8 +25,11 @@ PRINT_PLIST_AWK+= /^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \ post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/gconf/schemas +BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.74 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common index 52542c9eff7..c8b64b4064a 100644 --- a/devel/GConf/Makefile.common +++ b/devel/GConf/Makefile.common @@ -1,11 +1,13 @@ -# $NetBSD: Makefile.common,v 1.4 2008/04/30 13:38:14 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.5 2008/10/09 20:53:48 wiz Exp $ # +# used by devel/GConf/Makefile +# used by devel/GConf-ui/Makefile -GCONF_VERSION= 2.22.0 +GCONF_VERSION= 2.24.0 DISTNAME= GConf-${GCONF_VERSION} CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.22/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.24/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST index 3594078c639..fc392f3797e 100644 --- a/devel/GConf/PLIST +++ b/devel/GConf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2008/04/10 16:27:47 drochner Exp $ +@comment $NetBSD: PLIST,v 1.25 2008/10/09 20:53:48 wiz Exp $ bin/gconf-merge-tree bin/gconftool-2 include/gconf/2/gconf/gconf-changeset.h @@ -17,6 +17,7 @@ lib/pkgconfig/gconf-2.0.pc libexec/gconfd-2 man/man1/gconftool-2.1 share/aclocal/gconf-2.m4 +share/dbus-1/services/org.gnome.GConf.service share/examples/GConf/path share/gtk-doc/html/gconf/ch01.html share/gtk-doc/html/gconf/gconf-GConfClient.html @@ -76,10 +77,12 @@ share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ka/LC_MESSAGES/GConf2.mo +share/locale/kn/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/LC_MESSAGES/GConf2.mo share/locale/lv/LC_MESSAGES/GConf2.mo +share/locale/mai/LC_MESSAGES/GConf2.mo share/locale/mg/LC_MESSAGES/GConf2.mo share/locale/mk/LC_MESSAGES/GConf2.mo share/locale/ml/LC_MESSAGES/GConf2.mo @@ -104,7 +107,7 @@ share/locale/sk/LC_MESSAGES/GConf2.mo share/locale/sl/LC_MESSAGES/GConf2.mo share/locale/sq/LC_MESSAGES/GConf2.mo share/locale/sr/LC_MESSAGES/GConf2.mo -share/locale/sr@Latn/LC_MESSAGES/GConf2.mo +share/locale/sr@latin/LC_MESSAGES/GConf2.mo share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/te/LC_MESSAGES/GConf2.mo diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk index 55c6cd603c7..bf2c088432b 100644 --- a/devel/GConf/buildlink3.mk +++ b/devel/GConf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 12:58:13 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2008/10/09 20:53:48 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+ @@ -20,6 +20,8 @@ BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/buildlink3.mk" diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo index 3b7a53cfbd8..4c8a3859956 100644 --- a/devel/GConf/distinfo +++ b/devel/GConf/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2008/04/10 16:27:47 drochner Exp $ +$NetBSD: distinfo,v 1.19 2008/10/09 20:53:48 wiz Exp $ -SHA1 (GConf-2.22.0.tar.bz2) = 2a9ca649ef58394e425a030dc99b863b499a8a56 -RMD160 (GConf-2.22.0.tar.bz2) = 71f0c6f20882681efdffc957f6d86affd4a29a80 -Size (GConf-2.22.0.tar.bz2) = 1416685 bytes +SHA1 (GConf-2.24.0.tar.bz2) = e93ff2609c0278075acabdf609f42aa406e20c8e +RMD160 (GConf-2.24.0.tar.bz2) = b4016275e9dffa248620303bc2241f6c0081be06 +Size (GConf-2.24.0.tar.bz2) = 1467817 bytes SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0 -SHA1 (patch-ac) = de94ecba73ae748f609f4e4790df8eb856793d7b +SHA1 (patch-ac) = a810c943fc6408cd4f6024be65f9973d42028e1a SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317 diff --git a/devel/GConf/patches/patch-ac b/devel/GConf/patches/patch-ac index 9dd60dbd6c6..00eeaa96479 100644 --- a/devel/GConf/patches/patch-ac +++ b/devel/GConf/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.10 2008/04/10 16:27:47 drochner Exp $ +$NetBSD: patch-ac,v 1.11 2008/10/09 20:53:48 wiz Exp $ ---- gconf/Makefile.in.orig 2008-03-10 15:54:18.000000000 +0100 +--- gconf/Makefile.in.orig 2008-09-22 18:03:55.000000000 +0000 +++ gconf/Makefile.in -@@ -795,12 +795,8 @@ default.path: $(srcdir)/default.path.in - <$(srcdir)/default.path.in >default.path +@@ -829,12 +829,8 @@ org.gnome.GConf.service: $(srcdir)/org. + <$(srcdir)/org.gnome.GConf.service.in >org.gnome.GConf.service install-data-local: default.path - $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION) |