7 files changed, 48 insertions, 82 deletions

diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 4b95693db3f8..2aa8e31704f0 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -1,29 +1,35 @@
-# New ports collection makefile for:	mousepad
-# Date created:		19 April 2006
-# Whom:			Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	mousepad
-PORTVERSION=	0.2.16
-PORTREVISION=	11
+PORTVERSION=	0.3.0
 CATEGORIES=	editors xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Simple Xfce editor
+COMMENT=	Simple text editor for the Xfce Desktop
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig desktopfileutils
-USE_XFCE=	configenv libgui
+USES=	desktop-file-utils gettext pathfix pkgconfig
+USE_GNOME=	glib20 gtk20 intltool intlhack gtksourceview2
+USE_XFCE=	configenv
+USE_PERL5=	yes
+
+OPTIONS_DEFINE=	DBUS
+OPTIONS_DEFAULT=	DBUS
+
+.include <bsd.port.options.mk>
 
-post-install:
-	@-update-desktop-database
+.if ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+.else
+CONFIGURE_ARGS+=--disable-dbus
+.endif
 
 .include <bsd.port.mk>
diff --git a/editors/mousepad/distinfo b/editors/mousepad/distinfo
index 903c675564d5..f888f966bf10 100644
--- a/editors/mousepad/distinfo
+++ b/editors/mousepad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/mousepad-0.2.16.tar.bz2) = 86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
-SIZE (xfce4/mousepad-0.2.16.tar.bz2) = 332253
+SHA256 (xfce4/mousepad-0.3.0.tar.bz2) = 10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d
+SIZE (xfce4/mousepad-0.3.0.tar.bz2) = 481125
diff --git a/editors/mousepad/files/patch-mousepad.desktop.in.in b/editors/mousepad/files/patch-mousepad.desktop.in.in
new file mode 100644
index 000000000000..d73cf190101f
--- /dev/null
+++ b/editors/mousepad/files/patch-mousepad.desktop.in.in
@@ -0,0 +1,10 @@
+--- ./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
new file mode 100644
index 000000000000..09d6963967d0
--- /dev/null
+++ b/editors/mousepad/files/patch-mousepad__main.c
@@ -0,0 +1,10 @@
+--- ./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/files/patch-src_search.c b/editors/mousepad/files/patch-src_search.c
deleted file mode 100644
index 9060a7e4d303..000000000000
--- a/editors/mousepad/files/patch-src_search.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/search.c.orig
-+++ src/search.c
-@@ -210,8 +210,11 @@
- 		G_CALLBACK(toggle_sensitivity), NULL);
- 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
- 		G_CALLBACK(toggle_sensitivity), NULL);
--	 if (sd->search.string_find) 
-+	 if (sd->search.string_find) {
- 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+			GTK_RESPONSE_OK, TRUE);
-+	 }
- 
- 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- 	gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
-@@ -275,8 +278,11 @@
- 		G_CALLBACK(toggle_sensitivity), NULL);
- 	 g_signal_connect(G_OBJECT(entry_find), "delete-text",
- 		G_CALLBACK(toggle_sensitivity), NULL);
--	 if (sd->search.string_find) 
-+	 if (sd->search.string_find) {
- 		 gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+		 gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+			GTK_RESPONSE_OK, TRUE);
-+	}
- 	label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
- 	 gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
- 	 gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/editors/mousepad/pkg-descr b/editors/mousepad/pkg-descr
index dddfddc5c285..ea25bffb6251 100644
--- a/editors/mousepad/pkg-descr
+++ b/editors/mousepad/pkg-descr
@@ -1,5 +1,3 @@
-Mousepad is a simple text editor for Xfce based on Leafpad. The initial
-reason for Mousepad was to provide printing support, which would have
-been difficult for Leafpad for various reasons.
+Mousepad is a simple text editor for the Xfce desktop environment.
 
 WWW: http://www.xfce.org/projects/mousepad/
diff --git a/editors/mousepad/pkg-plist b/editors/mousepad/pkg-plist
index b60f501312b8..8bffe5fc27df 100644
--- a/editors/mousepad/pkg-plist
+++ b/editors/mousepad/pkg-plist
@@ -1,60 +1,30 @@
 bin/mousepad
 share/applications/mousepad.desktop
-share/locale/am/LC_MESSAGES/mousepad.mo
 share/locale/ar/LC_MESSAGES/mousepad.mo
-share/locale/be/LC_MESSAGES/mousepad.mo
-share/locale/ca/LC_MESSAGES/mousepad.mo
 share/locale/cs/LC_MESSAGES/mousepad.mo
-share/locale/cy/LC_MESSAGES/mousepad.mo
 share/locale/da/LC_MESSAGES/mousepad.mo
 share/locale/de/LC_MESSAGES/mousepad.mo
-share/locale/dz/LC_MESSAGES/mousepad.mo
-share/locale/el/LC_MESSAGES/mousepad.mo
-share/locale/en_GB/LC_MESSAGES/mousepad.mo
-share/locale/eo/LC_MESSAGES/mousepad.mo
 share/locale/es/LC_MESSAGES/mousepad.mo
-share/locale/et/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/gl/LC_MESSAGES/mousepad.mo
-share/locale/gu/LC_MESSAGES/mousepad.mo
-share/locale/he/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/it/LC_MESSAGES/mousepad.mo
 share/locale/ja/LC_MESSAGES/mousepad.mo
-share/locale/ka/LC_MESSAGES/mousepad.mo
 share/locale/ko/LC_MESSAGES/mousepad.mo
-share/locale/ku/LC_MESSAGES/mousepad.mo
 share/locale/lt/LC_MESSAGES/mousepad.mo
-share/locale/lv/LC_MESSAGES/mousepad.mo
-share/locale/mk/LC_MESSAGES/mousepad.mo
-share/locale/nb/LC_MESSAGES/mousepad.mo
-share/locale/nl/LC_MESSAGES/mousepad.mo
-share/locale/pa/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
-share/locale/pt_PT/LC_MESSAGES/mousepad.mo
+share/locale/ro/LC_MESSAGES/mousepad.mo
 share/locale/ru/LC_MESSAGES/mousepad.mo
-share/locale/si/LC_MESSAGES/mousepad.mo
 share/locale/sk/LC_MESSAGES/mousepad.mo
-share/locale/sl/LC_MESSAGES/mousepad.mo
-share/locale/sq/LC_MESSAGES/mousepad.mo
+share/locale/sr/LC_MESSAGES/mousepad.mo
 share/locale/sv/LC_MESSAGES/mousepad.mo
-share/locale/ta/LC_MESSAGES/mousepad.mo
-share/locale/tr/LC_MESSAGES/mousepad.mo
-share/locale/ur/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
 share/locale/zh_TW/LC_MESSAGES/mousepad.mo
-share/pixmaps/mousepad.png
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/applications
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true