Updated Xfce to 4.4.2

Lots of bug fixes. For the official ChangeLog, please see
http://www.xfce.org/documentation/changelogs/4.4.2

4 files changed, 15 insertions, 11 deletions

diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index c609598f6bf..59b28475dbc 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/04/12 09:55:23 martti Exp $
+# $NetBSD: Makefile,v 1.31 2007/12/07 19:43:30 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 .include "../../mk/compiler.mk"
@@ -8,7 +8,7 @@ DISTNAME=		xfce4-panel-${XFCE4_VERSION}
 CATEGORIES=		x11
 COMMENT=		Xfce panel
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
@@ -24,6 +24,10 @@ SUBST_SED.launcher=	-e 's|-O |-O0 |g'
 SUBST_SED.launcher+=	-e 's|-O[123s] |-O0 |g'
 .endif
 
+post-install:
+	@${ECHO} "Removing the dummy files"
+	rm -f ${PREFIX}/bin/xfce4-iconbox ${PREFIX}/bin/xftaskbar4
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index acdabcec2c9..3b9bb7a3701 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:23 martti Exp $
-bin/xfce4-iconbox
+@comment $NetBSD: PLIST,v 1.17 2007/12/07 19:43:30 martti Exp $
 bin/xfce4-panel
 bin/xfce4-popup-windowlist
-bin/xftaskbar4
 etc/xdg/xfce4/panel/clock-14.rc
 etc/xdg/xfce4/panel/launcher-10.rc
 etc/xdg/xfce4/panel/launcher-7.rc
@@ -66,6 +64,7 @@ share/icons/hicolor/48x48/apps/xfce-mouse.png
 share/icons/hicolor/48x48/apps/xfce4-iconbox.png
 share/icons/hicolor/48x48/apps/xfce4-panel.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
+share/locale/am/LC_MESSAGES/xfce4-panel.mo
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
 share/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -96,6 +95,7 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ka/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/lv/LC_MESSAGES/xfce4-panel.mo
 share/locale/mk/LC_MESSAGES/xfce4-panel.mo
 share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index 67d2bf45c6a..888b8846714 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:23 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2007/12/07 19:43:30 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-panel
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-panel
 
 .if ${XFCE4_PANEL_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.4.1
+BUILDLINK_API_DEPENDS.xfce4-panel+=	xfce4-panel>=4.4.2
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 197e1fa2252..6754b7b8826 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2007/04/12 09:55:23 martti Exp $
+$NetBSD: distinfo,v 1.16 2007/12/07 19:43:30 martti Exp $
 
-SHA1 (xfce4-panel-4.4.1.tar.bz2) = 5a0ca0dee7f8d525120f65cc8fd199a3e673f60c
-RMD160 (xfce4-panel-4.4.1.tar.bz2) = 53d804b18b363e3571d065435163a6f74df6b3ed
-Size (xfce4-panel-4.4.1.tar.bz2) = 767669 bytes
+SHA1 (xfce4-panel-4.4.2.tar.bz2) = f66a5f46abc21324e5a375e52a37b98757eae121
+RMD160 (xfce4-panel-4.4.2.tar.bz2) = 6bcbc27d3de95d631ee3f556cf79ed89450769eb
+Size (xfce4-panel-4.4.2.tar.bz2) = 757724 bytes