4 files changed, 135 insertions, 166 deletions

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 305d22aa7196..5f4918658c99 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,31 +6,44 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-wm 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}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 panel module
 
-BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
-		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-USE_GETTEXT=	yes
-USE_GNOME=	gtk20 gnomehack
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	configenv libgui libmcs libutil mcsmanager
+USE_XLIB=	yes
+
+OPTIONS=	GTKDOC	"install the library documentation"	off \
+		STARTUP "Enable startup notification support"	on
+
+.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
+
+.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
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 2d89182c9b9c..68f11b89fac5 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.2.3.tar.gz) = 3027c4601f208d290a988befed66a49f
-SHA256 (xfce4/xfce4-panel-4.2.3.tar.gz) = cac07e51513ea3f1cf298b2be7dd9500bb81aae3806aaff64de8c15e19003262
-SIZE (xfce4/xfce4-panel-4.2.3.tar.gz) = 1395852
+MD5 (xfce4/xfce4-panel-4.4.0.tar.bz2) = c46925d2df393dba8f16979ba87d4776
+SHA256 (xfce4/xfce4-panel-4.4.0.tar.bz2) = 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926
+SIZE (xfce4/xfce4-panel-4.4.0.tar.bz2) = 818534
diff --git a/x11-wm/xfce4-panel/pkg-descr b/x11-wm/xfce4-panel/pkg-descr
index a97aa4e52311..a08bc3b5ed10 100644
--- a/x11-wm/xfce4-panel/pkg-descr
+++ b/x11-wm/xfce4-panel/pkg-descr
@@ -1,4 +1,4 @@
 The XFce 4 panel provides program launchers, a workspace switcher, a clock,
 subpanels and more.
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index deca268261b4..533ba7173110 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,77 +1,82 @@
+bin/xfce4-iconbox
 bin/xfce4-panel
-etc/xdg/xfce4/panel/contents.xml
-etc/xdg/xfce4/panel/contents.xml.ar
-etc/xdg/xfce4/panel/contents.xml.az
-etc/xdg/xfce4/panel/contents.xml.ca
-etc/xdg/xfce4/panel/contents.xml.da
-etc/xdg/xfce4/panel/contents.xml.el
-etc/xdg/xfce4/panel/contents.xml.eu
-etc/xdg/xfce4/panel/contents.xml.fi
-etc/xdg/xfce4/panel/contents.xml.fr
-etc/xdg/xfce4/panel/contents.xml.he
-etc/xdg/xfce4/panel/contents.xml.hu
-etc/xdg/xfce4/panel/contents.xml.it
-etc/xdg/xfce4/panel/contents.xml.ja
-etc/xdg/xfce4/panel/contents.xml.ko
-etc/xdg/xfce4/panel/contents.xml.lt
-etc/xdg/xfce4/panel/contents.xml.ms
-etc/xdg/xfce4/panel/contents.xml.nl
-etc/xdg/xfce4/panel/contents.xml.pl
-etc/xdg/xfce4/panel/contents.xml.ro
-etc/xdg/xfce4/panel/contents.xml.ru
-etc/xdg/xfce4/panel/contents.xml.sk
-etc/xdg/xfce4/panel/contents.xml.sv
-etc/xdg/xfce4/panel/contents.xml.tr
-etc/xdg/xfce4/panel/contents.xml.vi
-etc/xdg/xfce4/panel/contents.xml.zh_CN
-etc/xdg/xfce4/panel/contents.xml.zh_TW
-include/xfce4/panel/add-control-dialog.h
-include/xfce4/panel/controls.h
-include/xfce4/panel/global.h
-include/xfce4/panel/icons.h
-include/xfce4/panel/main.h
-include/xfce4/panel/panel.h
-include/xfce4/panel/item.h
-include/xfce4/panel/item_dialog.h
-include/xfce4/panel/plugins.h
-include/xfce4/panel/xfce_support.h
-include/xfce4/panel/xfce.h
+bin/xfce4-popup-windowlist
+bin/xftaskbar4
+etc/xdg/xfce4/panel/clock-14.rc
+etc/xdg/xfce4/panel/launcher-10.rc
+etc/xdg/xfce4/panel/launcher-7.rc
+etc/xdg/xfce4/panel/launcher-8.rc
+etc/xdg/xfce4/panel/launcher-9.rc
+etc/xdg/xfce4/panel/panels.xml
+etc/xdg/xfce4/panel/systray-4.rc
+etc/xdg/xfce4/panel/xfce4-menu-5.rc
+include/xfce4/libxfce4panel/xfce-arrow-button.h
+include/xfce4/libxfce4panel/xfce-hvbox.h
+include/xfce4/libxfce4panel/xfce-itembar.h
+include/xfce4/libxfce4panel/xfce-panel-convenience.h
+include/xfce4/libxfce4panel/xfce-panel-enum-types.h
+include/xfce4/libxfce4panel/xfce-panel-enums.h
+include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-macros.h
+include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h
+include/xfce4/libxfce4panel/xfce-panel-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-window.h
+lib/libxfce4panel.la
+lib/libxfce4panel.so
+lib/libxfce4panel.so.2
 lib/xfce4/mcs-plugins/libxfce4settings.la
 lib/xfce4/mcs-plugins/libxfce4settings.so
+lib/xfce4/panel-plugins/libactions.la
+lib/xfce4/panel-plugins/libactions.so
 lib/xfce4/panel-plugins/libclock.la
 lib/xfce4/panel-plugins/libclock.so
-lib/xfce4/panel-plugins/libmailcheck.la
-lib/xfce4/panel-plugins/libmailcheck.so
+lib/xfce4/panel-plugins/libiconbox.la
+lib/xfce4/panel-plugins/libiconbox.so
+lib/xfce4/panel-plugins/liblauncher.la
+lib/xfce4/panel-plugins/liblauncher.so
 lib/xfce4/panel-plugins/libpager.la
 lib/xfce4/panel-plugins/libpager.so
 lib/xfce4/panel-plugins/libseparator.la
 lib/xfce4/panel-plugins/libseparator.so
-lib/xfce4/panel-plugins/libswitcher.la
-lib/xfce4/panel-plugins/libswitcher.so
-lib/xfce4/panel-plugins/libsystembuttons.la
-lib/xfce4/panel-plugins/libsystembuttons.so
-libdata/pkgconfig/xfce4-panel-1.0.pc
+lib/xfce4/panel-plugins/libshowdesktop.la
+lib/xfce4/panel-plugins/libshowdesktop.so
+lib/xfce4/panel-plugins/libsystray.la
+lib/xfce4/panel-plugins/libsystray.so
+lib/xfce4/panel-plugins/libtasklist.la
+lib/xfce4/panel-plugins/libtasklist.so
+lib/xfce4/panel-plugins/libwindowlist.la
+lib/xfce4/panel-plugins/libwindowlist.so
+libdata/pkgconfig/libxfce4panel-1.0.pc
+share/applications/xfce4-panel-manager.desktop
+share/gtk-doc/html/libxfce4panel/XfceArrowButton.html
+share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceHVBox.html
+share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceItembar.html
+share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html
+share/gtk-doc/html/libxfce4panel/ch01.html
+share/gtk-doc/html/libxfce4panel/home.png
+share/gtk-doc/html/libxfce4panel/index.html
+share/gtk-doc/html/libxfce4panel/index.sgml
+share/gtk-doc/html/libxfce4panel/left.png
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Functions.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Writing-Plugins.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp
+share/gtk-doc/html/libxfce4panel/right.png
+share/gtk-doc/html/libxfce4panel/style.css
+share/gtk-doc/html/libxfce4panel/up.png
 share/icons/hicolor/16x16/apps/xfce-system-exit.png
 share/icons/hicolor/16x16/apps/xfce-system-info.png
 share/icons/hicolor/16x16/apps/xfce-system-lock.png
 share/icons/hicolor/16x16/apps/xfce-system-settings.png
-share/icons/hicolor/48x48/apps/xfce4-panel.png
-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-mail.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/applications/xfce-panel-settings.desktop
-share/locale/af/LC_MESSAGES/xfce4-panel.mo
+share/icons/hicolor/48x48/apps/xfce-mouse.png
+share/icons/hicolor/48x48/apps/xfce4-iconbox.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/icons/hicolor/48x48/apps/xfce4-taskbar.png
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
 share/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -79,8 +84,8 @@ share/locale/bg/LC_MESSAGES/xfce4-panel.mo
 share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
 share/locale/ca/LC_MESSAGES/xfce4-panel.mo
 share/locale/cs/LC_MESSAGES/xfce4-panel.mo
-share/locale/da/LC_MESSAGES/xfce4-panel.mo
 share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/dz/LC_MESSAGES/xfce4-panel.mo
 share/locale/el/LC_MESSAGES/xfce4-panel.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 share/locale/eo/LC_MESSAGES/xfce4-panel.mo
@@ -91,6 +96,7 @@ share/locale/eu/LC_MESSAGES/xfce4-panel.mo
 share/locale/fa/LC_MESSAGES/xfce4-panel.mo
 share/locale/fi/LC_MESSAGES/xfce4-panel.mo
 share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+share/locale/gl/LC_MESSAGES/xfce4-panel.mo
 share/locale/gu/LC_MESSAGES/xfce4-panel.mo
 share/locale/he/LC_MESSAGES/xfce4-panel.mo
 share/locale/hi/LC_MESSAGES/xfce4-panel.mo
@@ -98,9 +104,10 @@ share/locale/hu/LC_MESSAGES/xfce4-panel.mo
 share/locale/hy/LC_MESSAGES/xfce4-panel.mo
 share/locale/it/LC_MESSAGES/xfce4-panel.mo
 share/locale/ja/LC_MESSAGES/xfce4-panel.mo
+share/locale/ka/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
-share/locale/ku/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/mk/LC_MESSAGES/xfce4-panel.mo
 share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
@@ -112,7 +119,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
 share/locale/ro/LC_MESSAGES/xfce4-panel.mo
 share/locale/ru/LC_MESSAGES/xfce4-panel.mo
 share/locale/sk/LC_MESSAGES/xfce4-panel.mo
-share/locale/sl/LC_MESSAGES/xfce4-panel.mo
 share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 share/locale/tr/LC_MESSAGES/xfce4-panel.mo
@@ -120,96 +126,46 @@ share/locale/uk/LC_MESSAGES/xfce4-panel.mo
 share/locale/vi/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
-share/xfce4/doc/C/images/add-item-dialog.png
-share/xfce4/doc/C/images/clock-properties.png
-share/xfce4/doc/C/images/default_panel.png
-share/xfce4/doc/C/images/handle-popup.png
-share/xfce4/doc/C/images/item-popup.png
-share/xfce4/doc/C/images/launcher-properties.png
-share/xfce4/doc/C/images/mailcheck-properties.png
-share/xfce4/doc/C/images/menuitem-properties.png
-share/xfce4/doc/C/images/nooptions-properties.png
-share/xfce4/doc/C/images/pager-properties.png
-share/xfce4/doc/C/images/panel-settings.png
-share/xfce4/doc/C/images/systembuttons-properties.png
+share/xfce4/doc/C/images/default_top_panel.png
+share/xfce4/doc/C/images/default_bottom_panel.png
+share/xfce4/doc/C/images/item_popup.png
+share/xfce4/doc/C/images/add_item_dialog.png
+share/xfce4/doc/C/images/launcher_properties.png
+share/xfce4/doc/C/images/panel_manager.png
 share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/add-item-dialog.png
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/pager-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/doc/he/images/add-item-dialog.png
-share/xfce4/doc/he/images/clock-properties.png
-share/xfce4/doc/he/images/default_panel.png
-share/xfce4/doc/he/images/handle-popup.png
-share/xfce4/doc/he/images/item-popup.png
-share/xfce4/doc/he/images/launcher-properties.png
-share/xfce4/doc/he/images/mailcheck-properties.png
-share/xfce4/doc/he/images/menuitem-properties.png
-share/xfce4/doc/he/images/nooptions-properties.png
-share/xfce4/doc/he/images/pager-properties.png
-share/xfce4/doc/he/images/panel-settings.png
-share/xfce4/doc/he/images/systembuttons-properties.png
-share/xfce4/doc/he/xfce4-panel.html
+share/xfce4/panel-plugins/actions.desktop
+share/xfce4/panel-plugins/clock.desktop
+share/xfce4/panel-plugins/iconbox.desktop
+share/xfce4/panel-plugins/launcher.desktop
+share/xfce4/panel-plugins/pager.desktop
+share/xfce4/panel-plugins/separator.desktop
+share/xfce4/panel-plugins/showdesktop.desktop
+share/xfce4/panel-plugins/systray.desktop
+share/xfce4/panel-plugins/tasklist.desktop
+share/xfce4/panel-plugins/windowlist.desktop
 @dirrm etc/xdg/xfce4/panel
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
-@dirrmtry etc/xfce4
-@dirrm include/xfce4/panel
+@dirrm include/xfce4/libxfce4panel
 @dirrmtry include/xfce4
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4/panel-plugins
 @dirrmtry lib/xfce4
-@dirrmtry share/applications
+@dirrm share/gtk-doc/html/libxfce4panel
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
 @dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/panel-plugins
 @dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16