- Welcome XFCE 4.10 to the portstree!

Special Thanks to:      rene, Olivier Duchateau <duchateau.olivier@gmail.com>
Submitted by:	 	Olivier Duchateau <duchateau.olivier@gmail.com>

Tested by:	phw

3 files changed, 17 insertions, 48 deletions

diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index acfefab0b636..6b1c228c31b9 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxfce4gui
-PORTVERSION=	4.8.1
+PORTVERSION=	4.10.0
 CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/archive/libxfcegui4/${PORTVERSION:R}
@@ -26,9 +26,10 @@ USE_LDCONFIG=	yes
 USE_XFCE=	configenv libutil
 USE_XORG=	sm x11
 
+CONFIGURE_ARGS+=--disable-gtk-doc-html
+
 OPTIONS=	NLS	"Enable Native Language Support"	on  \
 		STARTUP	"Use libstartup-notification"		on  \
-		GLADEUI	"Glade interface designer"		off \
 		APIDOCS	"Install api documentation"		off
 
 .include <bsd.port.pre.mk>
@@ -49,15 +50,6 @@ CONFIGURE_ARGS+=--enable-startup-notification
 CONFIGURE_ARGS+=--disable-startup-notification
 .endif
 
-.if defined(WITH_GLADEUI)
-LIB_DEPENDS+=	gladeui-1.10:${PORTSDIR}/devel/glade3
-CONFIGURE_ARGS+=--enable-gladeui
-PLIST_SUB+=	GLADE3=""
-.else
-CONFIGURE_ARGS+=--disable-gladeui
-PLIST_SUB+=	GLADE3="@comment "
-.endif
-
 .if defined(WITHOUT_APIDOCS)
 CONFIGURE_ARGS+=--without-html-dir
 PLIST_SUB+=	APIDOCS="@comment "
@@ -65,8 +57,5 @@ PLIST_SUB+=	APIDOCS="@comment "
 CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
 .endif
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(GMSGFMT)|$$(MSGFMT)|g' \
-		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 9ce7e2e3ce9c..c0e081006883 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/libxfcegui4-4.8.1.tar.bz2) = 309a81823cdfdb7301bc6a5199e14f0df29b58dae89a9302c7839b9b94812443
-SIZE (xfce4/libxfcegui4-4.8.1.tar.bz2) = 686338
+SHA256 (xfce4/libxfcegui4-4.10.0.tar.bz2) = 2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533
+SIZE (xfce4/libxfcegui4-4.10.0.tar.bz2) = 691012
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index 6189fcfcde53..efae3a931c54 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -43,29 +43,14 @@ include/xfce4/libxfcegui4/xfce_scaled_image.h
 include/xfce4/libxfcegui4/xfce_systemtray.h
 include/xfce4/libxfcegui4/xfce_togglebutton.h
 include/xfce4/libxfcegui4/xinerama.h
+lib/libglade/2.0/libxfce4.a
+lib/libglade/2.0/libxfce4.la
+lib/libglade/2.0/libxfce4.so
 lib/libxfcegui4.a
 lib/libxfcegui4.la
 lib/libxfcegui4.so
 lib/libxfcegui4.so.7
-%%GLADE3%%lib/glade3/modules/libgladexfce4.a
-%%GLADE3%%lib/glade3/modules/libgladexfce4.la
-%%GLADE3%%lib/glade3/modules/libgladexfce4.so
-lib/libglade/2.0/libxfce4.a
-lib/libglade/2.0/libxfce4.la
-lib/libglade/2.0/libxfce4.so
 libdata/pkgconfig/libxfcegui4-1.0.pc
-%%GLADE3%%share/glade3/catalogs/xfce4.xml
-%%GLADE3%%share/glade3/catalogs/xfce4.xml.in
-%%GLADE3%%share/glade3/pixmaps/hicolor/16x16/actions/widget-xfce4-xfce-app-menu-item.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/16x16/actions/widget-xfce4-xfce-heading.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/16x16/actions/widget-xfce4-xfce-movehandler.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/16x16/actions/widget-xfce4-xfce-scaled-image.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/16x16/actions/widget-xfce4-xfce-titled-dialog.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/22x22/actions/widget-xfce4-xfce-app-menu-item.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/22x22/actions/widget-xfce4-xfce-heading.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/22x22/actions/widget-xfce4-xfce-movehandler.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/22x22/actions/widget-xfce4-xfce-scaled-image.png
-%%GLADE3%%share/glade3/pixmaps/hicolor/22x22/actions/widget-xfce4-xfce-titled-dialog.png
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/XfceFramebox.html
@@ -85,7 +70,6 @@ libdata/pkgconfig/libxfcegui4-1.0.pc
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
-%%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/reference.html
 %%APIDOCS%%share/gtk-doc/html/libxfcegui4/right.png
@@ -128,9 +112,11 @@ share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 %%NLS%%share/locale/gl/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/gu/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/he/LC_MESSAGES/libxfcegui4.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/hy/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libxfcegui4.mo
+%%NLS%%share/locale/is/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/it/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/libxfcegui4.mo
@@ -143,6 +129,7 @@ share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 %%NLS%%share/locale/mr/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libxfcegui4.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/libxfcegui4.mo
@@ -154,6 +141,7 @@ share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 %%NLS%%share/locale/sq/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/libxfcegui4.mo
+%%NLS%%share/locale/te/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/libxfcegui4.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/libxfcegui4.mo
@@ -182,20 +170,12 @@ share/icons/hicolor/scalable/apps/xfce-filemanager.svg
 %%NLS%%@dirrmtry share/locale/hy
 %%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
 %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ast
-%%APIDOCS%%@dirrm share/gtk-doc/html/libxfcegui4
+%%APIDOCS%%@dirrmtry share/gtk-doc/html/libxfcegui4
 %%APIDOCS%%@dirrmtry share/gtk-doc/html
-%%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrm include/xfce4/libxfcegui4
+%%APIDOCS%%@dirrmtry share/gtk-doc 
+@dirrmtry include/xfce4/libxfcegui4
 @dirrmtry include/xfce4
-@dirrmtry lib/glade3/modules
-@dirrmtry lib/glade3
-@dirrmtry share/glade3/catalogs
-@dirrmtry share/glade3
-@dirrm glade3/pixmaps/hicolor/22x22/actions
-@dirrm glade3/pixmaps/hicolor/22x22
-@dirrm glade3/pixmaps/hicolor/16x16/actions
-@dirrm glade3/pixmaps/hicolor/16x16
-@dirrm glade3/pixmaps/hicolor
-@dirrm glade3/pixmaps