The FreeBSD Xfce team proudly presents Xfce 4.12.

Announce: http://www.xfce.org/about/news/?post=1425081600

Global changes:
- Switch to USES= xfce (D677)
- Reorganize options helper
- Fix USES= gettext-* when NLS option is not set [1], [2]
- Add LICENSE (when missing)

Update:
- to 4.12 (core components)
- audio/xfce4-mpc-plugin to 0.4.5
- deskutils/xfce4-tumbler to 0.1.31
- deskutils/xfce4-xkb-plugin to 0.7.1
- editors/mousepad to 0.4.0
- graphics/ristretto to 0.8.0
- multimedia/xfce4-parole to 0.8.0
- sysutils/garcon to 0.4.0
- sysutils/xfce4-diskperf-plugin to 2.5.5 [3]
- sysutils/xfce4-fsguard-plugin to 1.0.2
- sysutils/xfce4-power-manager to 1.4.3
- sysutils/xfce4-wavelan-plugin to 0.5.12
- x11/libexo to 0.10.3
- x11-fm/thunar to 1.6.6
- x11-themes/gtk-xfce-engine to 3.2.0

PR:		196003 [1], 197251 [2], 198132
Differential Revision:	https://reviews.freebsd.org/D677
Submitted by:	Kamil Szczesny [1], amdmi3@ [2], myself
Exp-run by:	antoine@
Approved by:	danilo@ (maintainer) [3]
Tested by:	Ivan <enitarzi@gmail.com>

6 files changed, 32 insertions, 37 deletions

diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 6bbe48ad8ef7..8d5172c7aa84 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mousepad
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	editors xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -14,21 +14,19 @@ COMMENT=	Simple text editor for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-GNU_CONFIGURE=	yes
-USES=	desktop-file-utils gettext gmake pathfix pkgconfig perl5 tar:bzip2
-USE_GNOME=	glib20 gtk20 intltool intlhack gtksourceview2
-USE_XFCE=	configenv
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-OPTIONS_DEFINE=	DBUS
-OPTIONS_DEFAULT=	DBUS
+GNU_CONFIGURE=	yes
+USES=	desktop-file-utils gettext gmake libtool pkgconfig perl5 tar:bzip2
+USE_GNOME=	glib20 intltool intlhack
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	GTK3
+GTK3_CONFIGURE_ENABLE=	gtk3
+GTK3_USE=	gnome=gtk30,gtksourceview3
+GTK3_USES=	xfce:gtk3
+GTK3_USE_OFF=	gnome=gtk20,gtksourceview2
+GTK3_USES_OFF=	xfce
 
-.if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
-.else
-CONFIGURE_ARGS+=--disable-dbus
-.endif
+GLIB_SCHEMAS=	org.xfce.mousepad.gschema.xml
 
 .include <bsd.port.mk>
diff --git a/editors/mousepad/distinfo b/editors/mousepad/distinfo
index f888f966bf10..5e8fe9c4855f 100644
--- a/editors/mousepad/distinfo
+++ b/editors/mousepad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/mousepad-0.3.0.tar.bz2) = 10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d
-SIZE (xfce4/mousepad-0.3.0.tar.bz2) = 481125
+SHA256 (xfce4/mousepad-0.4.0.tar.bz2) = 60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132
+SIZE (xfce4/mousepad-0.4.0.tar.bz2) = 578483
diff --git a/editors/mousepad/files/patch-mousepad.desktop.in.in b/editors/mousepad/files/patch-mousepad.desktop.in.in
deleted file mode 100644
index d73cf190101f..000000000000
--- a/editors/mousepad/files/patch-mousepad.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./mousepad.desktop.in.in.orig	2012-12-30 11:04:01.000000000 +0000
-+++ ./mousepad.desktop.in.in	2012-12-30 15:36:39.000000000 +0000
-@@ -9,5 +9,5 @@
- Terminal=false
- StartupNotify=true
- Type=Application
--Categories=Application;Utility;TextEditor;GTK;
--MimeType=text/plain
-+Categories=Utility;TextEditor;GTK;
-+MimeType=text/plain;
diff --git a/editors/mousepad/files/patch-mousepad__main.c b/editors/mousepad/files/patch-mousepad__main.c
deleted file mode 100644
index 09d6963967d0..000000000000
--- a/editors/mousepad/files/patch-mousepad__main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./mousepad/main.c.orig	2012-12-30 11:04:01.000000000 +0000
-+++ ./mousepad/main.c	2012-12-30 15:35:18.000000000 +0000
-@@ -72,6 +72,7 @@
- 
-   /* bind the text domain to the locale directory */
-   bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- 
-   /* set the package textdomain */
-   textdomain (GETTEXT_PACKAGE);
diff --git a/editors/mousepad/pkg-descr b/editors/mousepad/pkg-descr
index ea25bffb6251..8edb21825765 100644
--- a/editors/mousepad/pkg-descr
+++ b/editors/mousepad/pkg-descr
@@ -1,3 +1,3 @@
 Mousepad is a simple text editor for the Xfce desktop environment.
 
-WWW: http://www.xfce.org/projects/mousepad/
+WWW: http://goodies.xfce.org/projects/applications/mousepad
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index 018deffb1595..c884380000e0 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -1,17 +1,31 @@
 bin/mousepad
 share/applications/mousepad.desktop
 share/locale/ar/LC_MESSAGES/mousepad.mo
+share/locale/ast/LC_MESSAGES/mousepad.mo
+share/locale/bg/LC_MESSAGES/mousepad.mo
 share/locale/cs/LC_MESSAGES/mousepad.mo
 share/locale/da/LC_MESSAGES/mousepad.mo
 share/locale/de/LC_MESSAGES/mousepad.mo
+share/locale/el/LC_MESSAGES/mousepad.mo
+share/locale/en_AU/LC_MESSAGES/mousepad.mo
+share/locale/en_GB/LC_MESSAGES/mousepad.mo
 share/locale/es/LC_MESSAGES/mousepad.mo
+share/locale/eu/LC_MESSAGES/mousepad.mo
+share/locale/fi/LC_MESSAGES/mousepad.mo
 share/locale/fr/LC_MESSAGES/mousepad.mo
+share/locale/hu/LC_MESSAGES/mousepad.mo
 share/locale/hr/LC_MESSAGES/mousepad.mo
 share/locale/id/LC_MESSAGES/mousepad.mo
+share/locale/is/LC_MESSAGES/mousepad.mo
 share/locale/it/LC_MESSAGES/mousepad.mo
 share/locale/ja/LC_MESSAGES/mousepad.mo
+share/locale/kk/LC_MESSAGES/mousepad.mo
 share/locale/ko/LC_MESSAGES/mousepad.mo
 share/locale/lt/LC_MESSAGES/mousepad.mo
+share/locale/ms/LC_MESSAGES/mousepad.mo
+share/locale/nb/LC_MESSAGES/mousepad.mo
+share/locale/nl/LC_MESSAGES/mousepad.mo
+share/locale/oc/LC_MESSAGES/mousepad.mo
 share/locale/pl/LC_MESSAGES/mousepad.mo
 share/locale/pt/LC_MESSAGES/mousepad.mo
 share/locale/pt_BR/LC_MESSAGES/mousepad.mo
@@ -20,6 +34,9 @@ share/locale/ru/LC_MESSAGES/mousepad.mo
 share/locale/sk/LC_MESSAGES/mousepad.mo
 share/locale/sr/LC_MESSAGES/mousepad.mo
 share/locale/sv/LC_MESSAGES/mousepad.mo
+share/locale/te/LC_MESSAGES/mousepad.mo
+share/locale/th/LC_MESSAGES/mousepad.mo
+share/locale/tr/LC_MESSAGES/mousepad.mo
 share/locale/ug/LC_MESSAGES/mousepad.mo
 share/locale/uk/LC_MESSAGES/mousepad.mo
 share/locale/zh_CN/LC_MESSAGES/mousepad.mo