3 files changed, 70 insertions, 80 deletions

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 4af4a927ea84..af60827341fb 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,56 +6,39 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.8.2
+PORTVERSION=	4.8.3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=/src/xfce/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
 
 LIB_DEPENDS=	wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
-		cairo.2:${PORTSDIR}/graphics/cairo
+		cairo.2:${PORTSDIR}/graphics/cairo \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 CONFLICTS=	xfce4-systray-*
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack pkgconfig \
+		desktopfileutils
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
-USE_XFCE=	configenv garcon libexo libgui libutil libmenu
+USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
 
-CONFIGURE_ARGS=	--enable-gtk-doc-html=no \
-		--disable-debug
+CONFIGURE_ARGS=	--enable-gtk-doc-html=no
 
-OPTIONS=	GTKDOC	"install the library documentation"	off \
-		STARTUP "Enable startup notification support"	on \
-		NLS	"Enable Native Language Support" 	on
+OPTIONS=	NLS	"Enable Native Language Support" 	on \
+		APIDOCS	"Install api documentation"		off
 
 .include <bsd.port.pre.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
-
-.if !defined(WITHOUT_STARTUP)
-LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
-.else
-CONFIGURE_ARGS+=--disable-startup-notification
-.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
@@ -65,7 +48,15 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's| manual||g' ${WRKSRC}/docs/Makefile.in
+.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
+
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 51f488732b42..049b1e972c9e 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-panel-4.8.2.tar.bz2) = 497e88067a79ed02976663f5ed3082b56d3ce1de4c55d77bc462bd6fa380bb66
-SIZE (xfce4/xfce4-panel-4.8.2.tar.bz2) = 1179686
+SHA256 (xfce4/xfce4-panel-4.8.3.tar.bz2) = 2f436a62eee65221608b2f51876a70f34ddff409e0503f28760fb4788e8e7776
+SIZE (xfce4/xfce4-panel-4.8.3.tar.bz2) = 1253433
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index e47e65eeb171..c5c9ccb39bf2 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -58,6 +58,11 @@ libdata/pkgconfig/libxfce4panel-1.0.pc
 share/applications/panel-desktop-handler.desktop
 share/applications/panel-preferences.desktop
 %%DOCSDIR%%/README.gtkrc-2.0
+%%DOCSDIR%%/html/C/actions.html
+%%DOCSDIR%%/html/C/add-new-items.html
+%%DOCSDIR%%/html/C/applicationsmenu.html
+%%DOCSDIR%%/html/C/clock.html
+%%DOCSDIR%%/html/C/directorymenu.html
 %%DOCSDIR%%/html/C/figures/actions.png
 %%DOCSDIR%%/html/C/figures/add-new-items.png
 %%DOCSDIR%%/html/C/figures/applicationsmenu.png
@@ -70,12 +75,6 @@ share/applications/panel-preferences.desktop
 %%DOCSDIR%%/html/C/figures/systray.png
 %%DOCSDIR%%/html/C/figures/tasklist.png
 %%DOCSDIR%%/html/C/figures/windowmenu.png
-%%DOCSDIR%%/html/xfce4-panel.css
-%%DOCSDIR%%/html/C/actions.html
-%%DOCSDIR%%/html/C/add-new-items.html
-%%DOCSDIR%%/html/C/applicationsmenu.html
-%%DOCSDIR%%/html/C/clock.html
-%%DOCSDIR%%/html/C/directorymenu.html
 %%DOCSDIR%%/html/C/getting-started.html
 %%DOCSDIR%%/html/C/index.html
 %%DOCSDIR%%/html/C/launcher.html
@@ -88,45 +87,46 @@ share/applications/panel-preferences.desktop
 %%DOCSDIR%%/html/C/tasklist.html
 %%DOCSDIR%%/html/C/theming.html
 %%DOCSDIR%%/html/C/windowmenu.html
-share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html
-share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html
-share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html
-share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html
-share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html
-share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html
-share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html
-share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html
-share/gtk-doc/html/libxfce4panel-1.0/home.png
-share/gtk-doc/html/libxfce4panel-1.0/index.html
-share/gtk-doc/html/libxfce4panel-1.0/index.sgml
-share/gtk-doc/html/libxfce4panel-1.0/left.png
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html
-share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html
-share/gtk-doc/html/libxfce4panel-1.0/right.png
-share/gtk-doc/html/libxfce4panel-1.0/style.css
-share/gtk-doc/html/libxfce4panel-1.0/up.png
-%%NLS%%share/icons/hicolor/16x16/apps/xfce4-panel-menu.png
-%%NLS%%share/icons/hicolor/16x16/apps/xfce4-panel.png
-%%NLS%%share/icons/hicolor/22x22/apps/xfce4-panel-menu.png
-%%NLS%%share/icons/hicolor/22x22/apps/xfce4-panel.png
-%%NLS%%share/icons/hicolor/24x24/apps/xfce4-panel-menu.png
-%%NLS%%share/icons/hicolor/24x24/apps/xfce4-panel.png
-%%NLS%%share/icons/hicolor/32x32/apps/xfce4-panel-menu.png
-%%NLS%%share/icons/hicolor/32x32/apps/xfce4-panel.png
-%%NLS%%share/icons/hicolor/48x48/apps/xfce4-panel-menu.png
-%%NLS%%share/icons/hicolor/48x48/apps/xfce4-panel.png
-%%NLS%%share/icons/hicolor/scalable/apps/xfce4-panel.svg
+%%DOCSDIR%%/html/xfce4-panel.css
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/home.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/index.sgml
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/left.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/right.png
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/style.css
+%%APIDOCS%%share/gtk-doc/html/libxfce4panel-1.0/up.png
+share/icons/hicolor/16x16/apps/xfce4-panel-menu.png
+share/icons/hicolor/16x16/apps/xfce4-panel.png
+share/icons/hicolor/22x22/apps/xfce4-panel-menu.png
+share/icons/hicolor/22x22/apps/xfce4-panel.png
+share/icons/hicolor/24x24/apps/xfce4-panel-menu.png
+share/icons/hicolor/24x24/apps/xfce4-panel.png
+share/icons/hicolor/32x32/apps/xfce4-panel-menu.png
+share/icons/hicolor/32x32/apps/xfce4-panel.png
+share/icons/hicolor/48x48/apps/xfce4-panel-menu.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/icons/hicolor/scalable/apps/xfce4-panel.svg
 %%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
@@ -227,14 +227,13 @@ share/xfce4/panel/plugins/windowmenu.desktop
 %%NLS%%@dirrmtry share/locale/bn_IN
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-@dirrmtry share/gtk-doc/html/libxfce4panel-1.0
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%APIDOCS%%@dirrm share/gtk-doc/html/libxfce4panel-1.0
+%%APIDOCS%%@dirrmtry share/gtk-doc/html
+%%APIDOCS%%@dirrmtry share/gtk-doc
 @dirrm %%DOCSDIR%%/html/C/figures
 @dirrm %%DOCSDIR%%/html/C
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
-@dirrmtry share/applications
 @dirrmtry lib/xfce4/panel/plugins
 @dirrmtry lib/xfce4/panel
 @dirrmtry lib/xfce4