4 files changed, 44 insertions, 48 deletions

diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index a7726e9d95b0..2096bdba7d4e 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,38 +6,36 @@
 #
 
 PORTNAME=	libxfce4gui
-PORTVERSION=	4.2.3
-PORTREVISION=	3
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-toolkits xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	libxfcegui4-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
 
-LIB_DEPENDS=	dbh-4.5.4:${PORTSDIR}/databases/dbh \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util
-
-USE_GNOME=	gtk20 gnomehack
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -L${X11BASE}/lib" \
-		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
-CONFIGURE_ARGS=	--enable-xinerama
-INSTALLS_SHLIB=	yes
+INSTALLS_ICONS=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	libutil
+USE_XLIB=	yes
+
+OPTIONS=	GTKDOC	"install the library documentation"	off
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_GTKDOC)
 BUILD_DEPENDS+=	gtkdocize:${PORTSDIR}/textproc/gtk-doc
 CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+=	GTK_DOC=""
 .else
 CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+=	GTK_DOC="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} 's|dbh-1\.0|dbh|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index fc1e5276e58f..5b48be95610f 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfcegui4-4.2.3.tar.gz) = 5d2bae78c5ef66e914ae7a930bbdeb57
-SHA256 (xfce4/libxfcegui4-4.2.3.tar.gz) = 655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142
-SIZE (xfce4/libxfcegui4-4.2.3.tar.gz) = 883443
+MD5 (xfce4/libxfcegui4-4.4.0.tar.bz2) = 130cf67881f79c4f6ec4881a1d0d588f
+SHA256 (xfce4/libxfcegui4-4.4.0.tar.bz2) = 80abd4d3d21825d8cea362f13dc03a53cec902dd20b908afd8a1d7da7640dac1
+SIZE (xfce4/libxfcegui4-4.4.0.tar.bz2) = 562299
diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr
index cf3114a65506..115d30694072 100644
--- a/x11-toolkits/libxfce4gui/pkg-descr
+++ b/x11-toolkits/libxfce4gui/pkg-descr
@@ -1,3 +1,3 @@
 XFce 4 widget library required by the xfce4 and xfwm4 modules.
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index 955e67e9475f..73ec3dce5b5c 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -1,6 +1,7 @@
 include/xfce4/libxfcegui4/dialogs.h
 include/xfce4/libxfcegui4/gtk_style.h
 include/xfce4/libxfcegui4/gtktoxevent.h
+include/xfce4/libxfcegui4/gui-enum-types.h
 include/xfce4/libxfcegui4/icons.h
 include/xfce4/libxfcegui4/libnetk.h
 include/xfce4/libxfcegui4/libxfcegui4.h
@@ -36,42 +37,25 @@ include/xfce4/libxfcegui4/xfce-exec.h
 include/xfce4/libxfcegui4/xfce-filechooser.h
 include/xfce4/libxfcegui4/xfce-gdk-extensions.h
 include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-heading.h
 include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/xfce-startup-notification.h
+include/xfce4/libxfcegui4/xfce-titled-dialog.h
+include/xfce4/libxfcegui4/xfce-widget-helpers.h
 include/xfce4/libxfcegui4/netk-class-group.h
 include/xfce4/libxfcegui4/netk-window-action-menu.h
 include/xfce4/libxfcegui4/xinerama.h
-include/xfce4/xfce4-modules/constants.h
-include/xfce4/xfce4-modules/mime_icons.h
-include/xfce4/xfce4-modules/combo.h
-include/xfce4/xfce4-modules/mime.h
 lib/libxfcegui4.a
 lib/libxfcegui4.la
 lib/libxfcegui4.so
-lib/libxfcegui4.so.3
-lib/xfce4/modules/libxfce4_combo.a
-lib/xfce4/modules/libxfce4_combo.la
-lib/xfce4/modules/libxfce4_combo.so
-lib/xfce4/modules/libxfce4_combo.so.0
-lib/xfce4/modules/libxfce4_mime.a
-lib/xfce4/modules/libxfce4_mime.la
-lib/xfce4/modules/libxfce4_mime.so
-lib/xfce4/modules/libxfce4_mime.so.0
-lib/xfce4/modules/libxfce4_mime_icons.a
-lib/xfce4/modules/libxfce4_mime_icons.la
-lib/xfce4/modules/libxfce4_mime_icons.so
-lib/xfce4/modules/libxfce4_mime_icons.so.0
+lib/libxfcegui4.so.6
 libdata/pkgconfig/libxfcegui4-1.0.pc
-share/xfce4/mime/applications.xml
-share/xfce4/mime/freedesktop.org.xml
-share/xfce4/mime/gnome.mime.xml
-share/xfce4/mime/hicolor.mime.xml
-share/xfce4/mime/types.xml
-share/xfce4/mime/xfce.org.xml
-share/xfce4/xfce-svg-test.svg
 share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
 share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
 share/gtk-doc/html/libxfcegui4/XfceFramebox.html
+share/gtk-doc/html/libxfcegui4/XfceHeading.html
 share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
+share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html
 share/gtk-doc/html/libxfcegui4/home.png
 share/gtk-doc/html/libxfcegui4/index.html
 share/gtk-doc/html/libxfcegui4/index.sgml
@@ -88,8 +72,22 @@ share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
 share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
 share/gtk-doc/html/libxfcegui4/reference.html
 share/gtk-doc/html/libxfcegui4/right.png
+share/gtk-doc/html/libxfcegui4/style.css
 share/gtk-doc/html/libxfcegui4/up.png
-share/xfce4/hicolor-index.theme
+share/icons/hicolor/48x48/apps/xfce-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 @dirrm include/xfce4/libxfcegui4
 @dirrmtry include/xfce4/xfce4-modules
 @dirrmtry include/xfce4