- 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

4 files changed, 13 insertions, 131 deletions

diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index a451cfe01f48..b6efff544d1c 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,16 +6,14 @@
 #    $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
 
 PORTNAME=	libexo
-PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/exo/${PORTVERSION:R}
 DISTNAME=	exo-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Application library for the Xfce environment
+COMMENT=	Application library for the Xfce desktop environment
 
 BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
@@ -31,14 +29,13 @@ USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack pkgconfig \
 		desktopfileutils
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
-USE_XFCE=	configenv libutil
+USE_XFCE=	configenv libmenu libutil
 USE_XORG=	x11
+
 CONFIGURE_ARGS+=--enable-gio-unix \
-		--with-gio-module-dir=${PREFIX}/lib/gio/modules
-CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
+	--disable-gtk-doc-html
 
 OPTIONS=	APIDOCS	"Install api documentation"		off \
-		PYTHON	"Enable Python support"			off \
 		NLS	"Enable Native Language Support"	on
 
 MAN1=		exo-csource.1 exo-open.1
@@ -53,17 +50,6 @@ CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
 PLIST_SUB+=	APIDOCS=""
 .endif
 
-.if defined(WITH_PYTHON)
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=--enable-python
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2
-PLIST_SUB+=	PYTHON="" EXODIR="exo-0.6"
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
@@ -74,8 +60,6 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-install:
-	${FIND} ${WRKSRC}/docs/reference -type f -regex '.*\.1' \
-	-exec ${INSTALL_MAN} "{}" "${MANPREFIX}/man/man1" \;
 	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 38ad7ef374f2..9f028c332f10 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/exo-0.6.2.tar.bz2) = f49cf6a85546f47a1dddb58ce9a5f9364384a6f173cba99deb879e027c811f39
-SIZE (xfce4/exo-0.6.2.tar.bz2) = 1692288
+SHA256 (xfce4/exo-0.8.0.tar.bz2) = 6e21aa30692affcb45fc8283d034da4a02221d26e3e1facb968d04fed4ba05b0
+SIZE (xfce4/exo-0.8.0.tar.bz2) = 1120701
diff --git a/x11/libexo/pkg-descr b/x11/libexo/pkg-descr
index 8dba913482d4..e06ce364e69b 100644
--- a/x11/libexo/pkg-descr
+++ b/x11/libexo/pkg-descr
@@ -1,6 +1,3 @@
-libexo is the extension library to Xfce developed by os-cillation.
-While Xfce ships with quite a few libraries that are primarly
-targeted at desktop development, libexo is targeted at application
-development, with a focus on applications for Xfce.
+libexo is a support library used in the Xfce desktop environment.
 
-WWW: http://www.os-cillation.de/index.php?id=29&L=5
+WWW: http://docs.xfce.org/xfce/exo/start
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 09e9cc4e52b1..d68d2f24d221 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -27,7 +27,6 @@ include/exo-1/exo/exo-utils.h
 include/exo-1/exo/exo-wrap-table.h
 include/exo-1/exo/exo-xsession-client.h
 include/exo-1/exo/exo.h
-lib/libexo-1.a
 lib/libexo-1.la
 lib/libexo-1.so
 lib/libexo-1.so.0
@@ -39,60 +38,6 @@ share/applications/exo-mail-reader.desktop
 share/applications/exo-preferred-applications.desktop
 share/applications/exo-terminal-emulator.desktop
 share/applications/exo-web-browser.desktop
-%%DOCSDIR%%/html/C/exo-preferred-applications.html
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/C/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/bn/exo-preferred-applications.html
-%%DOCSDIR%%/html/bn/images
-%%DOCSDIR%%/html/ca/exo-preferred-applications.html
-%%DOCSDIR%%/html/ca/images
-%%DOCSDIR%%/html/da/exo-preferred-applications.html
-%%DOCSDIR%%/html/da/images
-%%DOCSDIR%%/html/de/exo-preferred-applications.html
-%%DOCSDIR%%/html/de/images
-%%DOCSDIR%%/html/el/exo-preferred-applications.html
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/el/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/es/exo-preferred-applications.html
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/es/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/exo-preferred-applications.css
-%%DOCSDIR%%/html/fr/exo-preferred-applications.html
-%%DOCSDIR%%/html/fr/images
-%%DOCSDIR%%/html/gl/exo-preferred-applications.html
-%%DOCSDIR%%/html/gl/images
-%%DOCSDIR%%/html/id/exo-preferred-applications.html
-%%DOCSDIR%%/html/id/images
-%%DOCSDIR%%/html/it/exo-preferred-applications.html
-%%DOCSDIR%%/html/it/images
-%%DOCSDIR%%/html/ja/exo-preferred-applications.html
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/ja/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/pt/exo-preferred-applications.html
-%%DOCSDIR%%/html/pt/images
-%%DOCSDIR%%/html/pt_BR/exo-preferred-applications.html
-%%DOCSDIR%%/html/pt_BR/images
-%%DOCSDIR%%/html/ru/exo-preferred-applications.html
-%%DOCSDIR%%/html/ru/images
-%%DOCSDIR%%/html/tr/exo-preferred-applications.html
-%%DOCSDIR%%/html/tr/images
-%%DOCSDIR%%/html/sv/exo-preferred-applications.html
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-internet.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-utilities.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-webbrowser-custom.png
-%%DOCSDIR%%/html/sv/images/exo-preferred-applications-webbrowser-menu.png
-%%DOCSDIR%%/html/ug/exo-preferred-applications.html
-%%DOCSDIR%%/html/ug/images
-%%DOCSDIR%%/html/zh_CN/exo-preferred-applications.html
-%%DOCSDIR%%/html/zh_CN/images
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoIconBar.html
@@ -108,7 +53,6 @@ share/applications/exo-web-browser.desktop
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoWrapTable.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ExoXsessionClient.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/ch01.html
-%%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-1.devhelp2
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
 %%APIDOCS%%share/gtk-doc/html/exo-1/exo-Executing-Applications.html
@@ -173,12 +117,14 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/ja/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/ku/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/mk/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/exo-1.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/exo-1.mo
@@ -199,11 +145,11 @@ share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/exo-1.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/exo-1.mo
 share/pixmaps/exo-1/exo-thumbnail-frame.png
-%%PYTHON%%share/pygtk/2.0/defs/%%EXODIR%%/exo.defs
 share/xfce4/helpers/Terminal.desktop
 share/xfce4/helpers/Thunar.desktop
 share/xfce4/helpers/aterm.desktop
 share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/chromium.desktop
 share/xfce4/helpers/debian-sensible-browser.desktop
 share/xfce4/helpers/debian-x-terminal-emulator.desktop
 share/xfce4/helpers/encompass.desktop
@@ -214,6 +160,7 @@ share/xfce4/helpers/firefox.desktop
 share/xfce4/helpers/galeon.desktop
 share/xfce4/helpers/gnome-terminal.desktop
 share/xfce4/helpers/icedove.desktop
+share/xfce4/helpers/iceweasel.desktop
 share/xfce4/helpers/kmail.desktop
 share/xfce4/helpers/konqueror.desktop
 share/xfce4/helpers/links.desktop
@@ -234,20 +181,6 @@ share/xfce4/helpers/thunderbird.desktop
 share/xfce4/helpers/urxvt.desktop
 share/xfce4/helpers/w3m.desktop
 share/xfce4/helpers/xterm.desktop
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
 @dirrm share/xfce4/helpers
 @dirrmtry share/xfce4
 @dirrm share/pixmaps/exo-1
@@ -272,44 +205,12 @@ share/xfce4/helpers/xterm.desktop
 %%APIDOCS%%@dirrm share/gtk-doc/html/exo-1
 %%APIDOCS%%@dirrmtry share/gtk-doc/html
 %%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrm %%DOCSDIR%%/html/zh_CN
-@dirrm %%DOCSDIR%%/html/ug
-@dirrm %%DOCSDIR%%/html/tr
-@dirrm %%DOCSDIR%%/html/sv/images
-@dirrm %%DOCSDIR%%/html/sv
-@dirrm %%DOCSDIR%%/html/ru
-@dirrm %%DOCSDIR%%/html/pt_BR
-@dirrm %%DOCSDIR%%/html/pt
-@dirrm %%DOCSDIR%%/html/ja/images
-@dirrm %%DOCSDIR%%/html/ja
-@dirrm %%DOCSDIR%%/html/it
-@dirrm %%DOCSDIR%%/html/id
-@dirrm %%DOCSDIR%%/html/gl
-@dirrm %%DOCSDIR%%/html/fr
-@dirrm %%DOCSDIR%%/html/es/images
-@dirrm %%DOCSDIR%%/html/es
-@dirrm %%DOCSDIR%%/html/el/images
-@dirrm %%DOCSDIR%%/html/el
-@dirrm %%DOCSDIR%%/html/de
-@dirrm %%DOCSDIR%%/html/da
-@dirrm %%DOCSDIR%%/html/ca
-@dirrm %%DOCSDIR%%/html/bn
-@dirrm %%DOCSDIR%%/html/C/images
-@dirrm %%DOCSDIR%%/html/C
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrm lib/xfce4/exo-1
 @dirrmtry lib/xfce4
 @dirrm include/exo-1/exo
 @dirrm include/exo-1
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/%%EXODIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/%%EXODIR%%
-%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
-%%PYTHON%%@dirrmtry share/pygtk/2.0
-%%PYTHON%%@dirrmtry share/pygtk
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true