Update to 4.8.2

Changelog:	http://mail.xfce.org/pipermail/xfce/2011-September/029146.html
PR:		ports/160792
Submitted by:	Olivier Duchateau [duchateau.olivier gmail]

3 files changed, 44 insertions, 36 deletions

diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index a20910c16227..b4f11c85a598 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	libxfce4util
-PORTVERSION=	4.8.1
+PORTVERSION=	4.8.2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -19,13 +20,12 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack intltool intlhack pkgconfig
+USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv
 
-CONFIGURE_ARGS=	--enable-gtk-doc-html=no \
-		--disable-debug
-
-OPTIONS=	NLS "Enable Native Language Support" on
+OPTIONS=	NLS "Enable Native Language Support" on \
+	APIDOCS "Install api documentation" off
 
 .include <bsd.port.pre.mk>
 
@@ -38,4 +38,12 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.if defined(WITHOUT_APIDOCS)
+CONFIGURE_ARGS+=--without-html-dir
+PLIST_SUB+=	APIDOCS="@comment "
+.else
+CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
+PLIST_SUB+=	APIDOCS=""
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 2bb5d83ba8d0..12468cf985aa 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfce4util-4.8.1.tar.bz2) = 732aeb4f845fb92efb5487e49662f5b8544ea5feb9f1e4bd7629e726aaa70c81
-SIZE (xfce4/libxfce4util-4.8.1.tar.bz2) = 441032
+SHA256 (xfce4/libxfce4util-4.8.2.tar.bz2) = 05a149841575cb961588742c8c9795c6f0d09f27d59546dd8a933b010d2ac816
+SIZE (xfce4/libxfce4util-4.8.2.tar.bz2) = 436692
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index cb9176a3c983..4efcf9862424 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -22,32 +22,32 @@ lib/libxfce4util.so
 lib/libxfce4util.so.5
 libdata/pkgconfig/libxfce4util-1.0.pc
 sbin/xfce4-kiosk-query
-share/gtk-doc/html/libxfce4util/home.png
-share/gtk-doc/html/libxfce4util/index.html
-share/gtk-doc/html/libxfce4util/index.sgml
-share/gtk-doc/html/libxfce4util/left.png
-share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
-share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-core.html
-share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
-share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
-share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
-share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
-share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
-share/gtk-doc/html/libxfce4util/reference.html
-share/gtk-doc/html/libxfce4util/right.png
-share/gtk-doc/html/libxfce4util/style.css
-share/gtk-doc/html/libxfce4util/up.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/home.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/index.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/index.sgml
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/left.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Desktop-entries.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-File-Utilities.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-core.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-datatypes.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-fundamentals.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/libxfce4util.devhelp2
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/reference.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/right.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/style.css
+%%APIDOCS%%share/gtk-doc/html/libxfce4util/up.png
 %%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
@@ -114,8 +114,8 @@ share/gtk-doc/html/libxfce4util/up.png
 %%NLS%%@dirrmtry share/locale/dz
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-@dirrm share/gtk-doc/html/libxfce4util
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%APIDOCS%%@dirrm share/gtk-doc/html/libxfce4util
+%%APIDOCS%%@dirrmtry share/gtk-doc/html
+%%APIDOCS%%@dirrmtry share/gtk-doc
 @dirrm include/xfce4/libxfce4util
 @dirrmtry include/xfce4