Upgrading Xfce to 4.6.1.

This is for PR #40984. This is based on work from
dieter roelants. Thank you Dieter.
Also I had done some work independently on this.
Hopefully, I am getting this all committed at one time.

The changelogs are at
http://www.xfce.org/documentation/changelogs/4.6.1
http://www.xfce.org/documentation/changelogs/4.6.0

Also don't need the xfce4-dev-tools for building. (It is only
needed when building from SVN source.)

4 files changed, 12 insertions, 17 deletions

diff --git a/editors/xfce4-mousepad/Makefile b/editors/xfce4-mousepad/Makefile
index 87964677906..be919900d00 100644
--- a/editors/xfce4-mousepad/Makefile
+++ b/editors/xfce4-mousepad/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: Makefile,v 1.8 2009/09/16 01:15:33 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.2.14
+XFCE4_VERSION=	0.2.16
 
 DISTNAME=	mousepad-${XFCE4_VERSION}
 PKGNAME=	xfce4-mousepad-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	editors
 COMMENT=	Xfce text editor
 
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xfce4-mousepad/PLIST b/editors/xfce4-mousepad/PLIST
index 9f1f87b9fe1..70c814434de 100644
--- a/editors/xfce4-mousepad/PLIST
+++ b/editors/xfce4-mousepad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/12/18 14:18:14 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/09/16 01:15:33 reed Exp $
 bin/mousepad
 share/applications/mousepad.desktop
 share/locale/am/LC_MESSAGES/mousepad.mo
@@ -7,6 +7,7 @@ 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
@@ -30,13 +31,12 @@ 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_NO/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_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
@@ -44,7 +44,6 @@ share/locale/sl/LC_MESSAGES/mousepad.mo
 share/locale/sq/LC_MESSAGES/mousepad.mo
 share/locale/sv/LC_MESSAGES/mousepad.mo
 share/locale/ta/LC_MESSAGES/mousepad.mo
-share/locale/th/LC_MESSAGES/mousepad.mo
 share/locale/tr/LC_MESSAGES/mousepad.mo
 share/locale/uk/LC_MESSAGES/mousepad.mo
 share/locale/ur/LC_MESSAGES/mousepad.mo
diff --git a/editors/xfce4-mousepad/buildlink3.mk b/editors/xfce4-mousepad/buildlink3.mk
index 2df78137f55..698ebce6519 100644
--- a/editors/xfce4-mousepad/buildlink3.mk
+++ b/editors/xfce4-mousepad/buildlink3.mk
@@ -1,17 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:06 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:33 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-mousepad
 
 .if !defined(XFCE4_MOUSEPAD_BUILDLINK3_MK)
 XFCE4_MOUSEPAD_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-mousepad+=	xfce4-mousepad>=0.2.14nb1
-BUILDLINK_ABI_DEPENDS.xfce4-mousepad?=	xfce4-mousepad>=0.2.14nb2
+BUILDLINK_API_DEPENDS.xfce4-mousepad+=	xfce4-mousepad>=0.2.16
 BUILDLINK_PKGSRCDIR.xfce4-mousepad?=	../../editors/xfce4-mousepad
 
-.include "../../x11/libxfce4gui/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_MOUSEPAD_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-mousepad
diff --git a/editors/xfce4-mousepad/distinfo b/editors/xfce4-mousepad/distinfo
index d6ca4b5dc3e..53ccddcc885 100644
--- a/editors/xfce4-mousepad/distinfo
+++ b/editors/xfce4-mousepad/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.4 2009/09/16 01:15:33 reed Exp $
 
-SHA1 (mousepad-0.2.14.tar.bz2) = 0b9f0fbd8f85eb31ec89f897265b60589779a356
-RMD160 (mousepad-0.2.14.tar.bz2) = 9f5168bcdff163e27cd113418da4673a29ec9947
-Size (mousepad-0.2.14.tar.bz2) = 352485 bytes
+SHA1 (mousepad-0.2.16.tar.bz2) = 4e63033e0a71578f3ec9a0d2e6a505efd0424ef9
+RMD160 (mousepad-0.2.16.tar.bz2) = 673a52a38dfa60388db11322cd08189c1b2c10e3
+Size (mousepad-0.2.16.tar.bz2) = 332253 bytes