Index: Makefile =================================================================== RCS file: /cvs/ports/devel/gconf2/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 28 Oct 2006 11:19:20 -0000 1.19 +++ Makefile 14 Nov 2006 08:47:06 -0000 @@ -2,21 +2,22 @@ COMMENT= "configuration database system for GNOME" -VERSION= 2.10.1 +VERSION= 2.16.0 DISTNAME= GConf-${VERSION} -PKGNAME= gconf2-${VERSION}p2 -SHARED_LIBS += gconf-2 5.0 # .5.0 +PKGNAME= gconf2-${VERSION} +SHARED_LIBS= gconf-2 6.0 CATEGORIES= devel HOMEPAGE= http://www.gnome.org/projects/gconf/ -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.10/} -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.16/} +EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext -BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \ + :p5-XML-Parser-*:textproc/p5-XML-Parser LIB_DEPENDS= ORBit-2::devel/ORBit2 \ gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ xml2.>=6::textproc/libxml @@ -26,11 +27,11 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xrender Xext atk-1.0 c m \ - fontconfig freetype glib-2.0 gmodule-2.0 \ - gobject-2.0 gthread-2.0 pango-1.0 \ - pangoft2-1.0 pangocairo-1.0 cairo glitz png \ - popt pthread z +WANTLIB= ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr \ + Xrender asn1 com_err crypto gssapi krb5 ssl atk-1.0 \ + c m fontconfig freetype glib-2.0 gmodule-2.0 \ + gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \ + pangocairo-1.0 cairo glitz png popt pthread z DEFAULT_GCONF_SOURCE= xml::/var/db/gconf/gconf.xml.defaults @@ -41,7 +42,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --disable-gtk-conf CONFIGURE_ARGS+= --enable-gconf-source=${DEFAULT_GCONF_SOURCE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" post-install: Index: distinfo =================================================================== RCS file: /cvs/ports/devel/gconf2/distinfo,v retrieving revision 1.9 diff -u -p -r1.9 distinfo --- distinfo 13 Nov 2005 16:53:48 -0000 1.9 +++ distinfo 14 Nov 2006 08:13:39 -0000 @@ -1,4 +1,4 @@ -MD5 (GConf-2.10.1.tar.bz2) = c411bd6e9e25362ea613bb9a084be904 -RMD160 (GConf-2.10.1.tar.bz2) = 5f13846cda3f4e13268de51f3c467057aad012be -SHA1 (GConf-2.10.1.tar.bz2) = a28f95b9162e71083386ea13f5a4c9bc42c4fdf3 -SIZE (GConf-2.10.1.tar.bz2) = 1797862 +MD5 (GConf-2.16.0.tar.bz2) = b1a202f36661c0d9c87f8fe27a28bd52 +RMD160 (GConf-2.16.0.tar.bz2) = b3c429a45ac96cf79b7231666ecb8e1de645a4f8 +SHA1 (GConf-2.16.0.tar.bz2) = 4fbd2aa7e0d6deb1673c3c6db64892491edcdb6a +SIZE (GConf-2.16.0.tar.bz2) = 1307732 Index: patches/patch-doc_gconf_Makefile_in =================================================================== RCS file: patches/patch-doc_gconf_Makefile_in diff -N patches/patch-doc_gconf_Makefile_in --- patches/patch-doc_gconf_Makefile_in 30 Dec 2004 04:30:12 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-doc_gconf_Makefile_in,v 1.6 2004/12/30 04:30:12 marcm Exp $ ---- doc/gconf/Makefile.in.orig Tue Oct 12 09:49:08 2004 -+++ doc/gconf/Makefile.in Wed Dec 22 18:48:43 2004 -@@ -432,6 +432,7 @@ uninstall-am: uninstall-info-am uninstal - - - @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp -+@ENABLE_GTK_DOC_FALSE@all-local: - - #### scan #### - Index: patches/patch-gconf_Makefile_in =================================================================== RCS file: /cvs/ports/devel/gconf2/patches/patch-gconf_Makefile_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-gconf_Makefile_in --- patches/patch-gconf_Makefile_in 30 Dec 2004 04:30:12 -0000 1.7 +++ patches/patch-gconf_Makefile_in 14 Nov 2006 08:21:58 -0000 @@ -1,9 +1,9 @@ ---- gconf/Makefile.in.orig Tue Oct 12 09:49:08 2004 -+++ gconf/Makefile.in Wed Dec 22 18:48:43 2004 -@@ -208,6 +208,7 @@ INCLUDES = \ +--- gconf/Makefile.in.orig Thu Oct 5 14:54:51 2006 ++++ gconf/Makefile.in Tue Nov 14 09:21:49 2006 +@@ -241,6 +241,7 @@ INCLUDES = \ -DVERSION=\""$(VERSION)"\" \ -DGCONF_ENABLE_INTERNALS=1 \ - -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \ + -DGCONFD=\""$(GCONFD_BINARY_NAME)$(EXEEXT)"\" \ + -DGCONF_CONFIG_SOURCE=\""$(GCONF_CONFIG_SOURCE)"\" \ $(NULL) Index: patches/patch-gconf_default_path_in =================================================================== RCS file: /cvs/ports/devel/gconf2/patches/patch-gconf_default_path_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-gconf_default_path_in --- patches/patch-gconf_default_path_in 30 Dec 2004 04:30:12 -0000 1.4 +++ patches/patch-gconf_default_path_in 14 Nov 2006 08:21:58 -0000 @@ -1,19 +1,19 @@ ---- gconf/default.path.in.orig Thu Jul 8 22:44:44 2004 -+++ gconf/default.path.in Wed Dec 22 18:48:43 2004 +--- gconf/default.path.in.orig Thu Oct 5 14:37:28 2006 ++++ gconf/default.path.in Tue Nov 14 09:20:34 2006 @@ -6,7 +6,7 @@ # See the GConf manual for details # Look first in systemwide mandatory settings directory --xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.mandatory +-xml:readonly:@sysgconfdir@/gconf.xml.mandatory +xml:readonly:/var/db/gconf/gconf.xml.mandatory # To read in any mandatory settings that the Sys Admin may have created # prior to a desktop system upgrade. The SysAdmin can stick read-only system @@ -26,7 +26,7 @@ xml:readwrite:$(HOME)/.gconf - include @EXPANDED_SYSGCONFDIR@/2/local-defaults.path + include @sysgconfdir@/2/local-defaults.path # Finally, look at the systemwide defaults --xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.defaults +-xml:readonly:@sysgconfdir@/gconf.xml.defaults +xml:readonly:/var/db/gconf/gconf.xml.defaults Index: patches/patch-gconf_gconftool_c =================================================================== RCS file: /cvs/ports/devel/gconf2/patches/patch-gconf_gconftool_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-gconf_gconftool_c --- patches/patch-gconf_gconftool_c 30 Dec 2004 04:30:12 -0000 1.5 +++ patches/patch-gconf_gconftool_c 14 Nov 2006 08:21:58 -0000 @@ -1,11 +1,11 @@ $OpenBSD: patch-gconf_gconftool_c,v 1.5 2004/12/30 04:30:12 marcm Exp $ ---- gconf/gconftool.c.orig Mon Aug 30 00:35:33 2004 -+++ gconf/gconftool.c Wed Dec 22 18:48:43 2004 -@@ -4008,7 +4008,7 @@ do_get_default_source (const gchar** arg +--- gconf/gconftool.c.orig Thu Oct 5 14:37:28 2006 ++++ gconf/gconftool.c Tue Nov 14 09:21:23 2006 +@@ -4046,7 +4046,7 @@ do_get_default_source (const gchar** arg } /* Use default database */ -- source = g_strconcat("xml::", GCONF_ETCDIR, "/gconf.xml.defaults", NULL); +- source = g_strconcat("xml:merged:", GCONF_ETCDIR, "/gconf.xml.defaults", NULL); + source = g_strconcat(GCONF_CONFIG_SOURCE, NULL); g_print ("%s\n", source); g_free(source); Index: pkg/PFRAG.shared =================================================================== RCS file: /cvs/ports/devel/gconf2/pkg/PFRAG.shared,v retrieving revision 1.3 diff -u -p -r1.3 PFRAG.shared --- pkg/PFRAG.shared 6 Jan 2006 17:51:02 -0000 1.3 +++ pkg/PFRAG.shared 14 Nov 2006 08:25:07 -0000 @@ -1,3 +1,4 @@ @comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/06 17:51:02 bernd Exp $ +lib/GConf/2/libgconfbackend-evoldap.so lib/GConf/2/libgconfbackend-xml.so @lib lib/libgconf-2.so.${LIBgconf-2_VERSION} Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/gconf2/pkg/PLIST,v retrieving revision 1.15 diff -u -p -r1.15 PLIST --- pkg/PLIST 6 Jan 2006 17:51:02 -0000 1.15 +++ pkg/PLIST 14 Nov 2006 08:29:01 -0000 @@ -15,6 +15,8 @@ include/gconf/2/gconf/gconf-value.h include/gconf/2/gconf/gconf.h lib/GConf/ lib/GConf/2/ +lib/GConf/2/libgconfbackend-evoldap.a +lib/GConf/2/libgconfbackend-evoldap.la lib/GConf/2/libgconfbackend-oldxml.a lib/GConf/2/libgconfbackend-oldxml.la lib/GConf/2/libgconfbackend-oldxml.so @@ -27,12 +29,17 @@ lib/pkgconfig/gconf-2.0.pc libexec/gconf-sanity-check-2 libexec/gconfd-2 @man man/man1/gconftool-2.1 +share/GConf/ +share/GConf/schema/ +share/GConf/schema/evoldap.schema share/aclocal/gconf-2.m4 share/examples/gconf2/ share/examples/gconf2/gconf/ @sample ${SYSCONFDIR}/gconf/ share/examples/gconf2/gconf/2/ @sample ${SYSCONFDIR}/gconf/2/ +share/examples/gconf2/gconf/2/evoldap.conf +@sample ${SYSCONFDIR}/gconf/2/evoldap.conf share/examples/gconf2/gconf/2/path @sample ${SYSCONFDIR}/gconf/2/path @sample /var/db/gconf/ @@ -57,6 +64,7 @@ share/gtk-doc/html/gconf/gconf-gconf-sou share/gtk-doc/html/gconf/gconf-gconf-value.html share/gtk-doc/html/gconf/gconf-gconf.html share/gtk-doc/html/gconf/gconf.devhelp +share/gtk-doc/html/gconf/gconf.devhelp2 share/gtk-doc/html/gconf/home.png share/gtk-doc/html/gconf/index.html share/gtk-doc/html/gconf/index.sgml @@ -78,6 +86,9 @@ share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/bn/ share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/GConf2.mo +share/locale/bn_IN/ +share/locale/bn_IN/LC_MESSAGES/ +share/locale/bn_IN/LC_MESSAGES/GConf2.mo share/locale/bs/ share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/GConf2.mo @@ -110,15 +121,25 @@ share/locale/gl/LC_MESSAGES/GConf2.mo share/locale/gu/ share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/GConf2.mo +share/locale/he/LC_MESSAGES/GConf2.mo share/locale/hi/ share/locale/hi/LC_MESSAGES/ share/locale/hi/LC_MESSAGES/GConf2.mo share/locale/hr/LC_MESSAGES/GConf2.mo share/locale/hu/LC_MESSAGES/GConf2.mo share/locale/id/LC_MESSAGES/GConf2.mo +share/locale/is/ +share/locale/is/LC_MESSAGES/ +share/locale/is/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo +share/locale/ka/ +share/locale/ka/LC_MESSAGES/ +share/locale/ka/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo +share/locale/ku/ +share/locale/ku/LC_MESSAGES/ +share/locale/ku/LC_MESSAGES/GConf2.mo share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/GConf2.mo @@ -141,7 +162,9 @@ share/locale/ne/LC_MESSAGES/ share/locale/ne/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo -share/locale/no/LC_MESSAGES/GConf2.mo +share/locale/or/ +share/locale/or/LC_MESSAGES/ +share/locale/or/LC_MESSAGES/GConf2.mo share/locale/pa/ share/locale/pa/LC_MESSAGES/ share/locale/pa/LC_MESSAGES/GConf2.mo @@ -166,6 +189,9 @@ share/locale/sv/LC_MESSAGES/GConf2.mo share/locale/ta/ share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/GConf2.mo +share/locale/th/ +share/locale/th/LC_MESSAGES/ +share/locale/th/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo @@ -176,6 +202,9 @@ share/locale/yi/ share/locale/yi/LC_MESSAGES/ share/locale/yi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo +share/locale/zh_HK/ +share/locale/zh_HK/LC_MESSAGES/ +share/locale/zh_HK/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo share/sgml/ share/sgml/gconf/