Update to 3.2.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16796 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 34 insertions, 12 deletions

diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index cda3bebd4..7db91850a 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.130 2011/10/15 16:05:22 kwm Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.131 2011/10/26 20:37:12 kwm Exp $
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	3.2.2
+PORTVERSION=	3.2.5
 PORTREVISION=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -36,8 +36,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		gconftool-2.1 gsettings-data-convert.1 \
 		gsettings-schema-convert.1
 
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 71b5e5ba9..a0b7a55a7 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/GConf-3.2.2.tar.xz) = bca02495552b40d2f3867b66d490283481417ec0e489ba0cbff9e0f48b82822d
-SIZE (gnome2/GConf-3.2.2.tar.xz) = 1567184
+SHA256 (gnome2/GConf-3.2.5.tar.xz) = 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
+SIZE (gnome2/GConf-3.2.5.tar.xz) = 1525188
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 234dfe043..6ec30e4f1 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -40,6 +40,27 @@ libexec/gconfd-2
 share/aclocal/gconf-2.m4
 share/dbus-1/system-services/org.gnome.GConf.Defaults.service
 share/dbus-1/services/org.gnome.GConf.service
+share/doc/gconf/ch01.html
+share/doc/gconf/gconf-gconf-backend.html
+share/doc/gconf/gconf-gconf-changeset.html
+share/doc/gconf/gconf-gconf-client.html
+share/doc/gconf/gconf-gconf-engine.html
+share/doc/gconf/gconf-gconf-error.html
+share/doc/gconf/gconf-gconf-internals.html
+share/doc/gconf/gconf-gconf-listeners.html
+share/doc/gconf/gconf-gconf-locale.html
+share/doc/gconf/gconf-gconf-schema.html
+share/doc/gconf/gconf-gconf-sources.html
+share/doc/gconf/gconf-gconf-value.html
+share/doc/gconf/gconf-gconf.html
+share/doc/gconf/gconf.devhelp2
+share/doc/gconf/home.png
+share/doc/gconf/index.html
+share/doc/gconf/index.sgml
+share/doc/gconf/left.png
+share/doc/gconf/right.png
+share/doc/gconf/style.css
+share/doc/gconf/up.png
 share/gir-1.0/GConf-2.0.gir
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
@@ -129,12 +150,6 @@ share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/polkit-1/actions/org.gnome.gconf.defaults.policy
 share/sgml/gconf/gconf-1.0.dtd
 @dirrm share/sgml/gconf
-%%LDAP%%@dirrm share/GConf/schema
-%%LDAP%%@dirrm share/GConf
-@dirrm lib/GConf/2
-@dirrm include/gconf/2/gconf
-@dirrm include/gconf/2
-@dirrm etc/gconf/2
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -175,5 +190,12 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm share/doc/gconf
+%%LDAP%%@dirrm share/GConf/schema
+%%LDAP%%@dirrm share/GConf
+@dirrm lib/GConf/2
+@dirrm include/gconf/2/gconf
+@dirrm include/gconf/2
+@dirrm etc/gconf/2
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true