Updated to Xfce 4.4.1

See http://www.xfce.org/documentation/changelogs/4.4.1 for details.

6 files changed, 43 insertions, 33 deletions

diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 0bc0f723e45..c5a479efeb9 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:11 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -17,25 +17,36 @@ WRKSRC=		${WRKDIR}
 do-install:
 	@${DO_NADA}
 
+# Xfce
+.include "../../meta-pkgs/xfce4/buildlink3.mk"
+
+#
+# Do you want to have more plugins? See http://goodies.xfce.org/releases/
+# for all available plugins...
+#
+
 # Additional plugins etc.
 .include "../../audio/xfce4-xmms-plugin/buildlink3.mk"
-.include "../../graphics/xfce4-artwork/buildlink3.mk"
 .include "../../misc/xfce4-weather-plugin/buildlink3.mk"
 .include "../../net/xfce4-wavelan-plugin/buildlink3.mk"
-.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-cpugraph-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-diskperf-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-fsguard-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-minicmd-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-netload-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-quicklauncher-plugin/buildlink3.mk"
-.include "../../sysutils/xfce4-showdesktop-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-systemload-plugin/buildlink3.mk"
 .include "../../sysutils/xfce4-xkb-plugin/buildlink3.mk"
+.include "../../time/xfce4-datetime-plugin/buildlink3.mk"
 .include "../../x11/xfce4-clipman-plugin/buildlink3.mk"
 .include "../../x11/xfce4-notes-plugin/buildlink3.mk"
-.include "../../x11/xfce4-taskbar-plugin/buildlink3.mk"
-.include "../../x11/xfce4-windowlist-plugin/buildlink3.mk"
 
-.include "../../meta-pkgs/xfce4/buildlink3.mk"
+## WHAT TO DO WITH THESE?
+# .include "../../graphics/xfce4-artwork/buildlink3.mk"
+
+## CURRENTLY NO SUPPORT FOR 4.4
+# .include "../../sysutils/xfce4-minicmd-plugin/buildlink3.mk"
+# .include "../../sysutils/xfce4-showdesktop-plugin/buildlink3.mk"
+# .include "../../x11/xfce4-taskbar-plugin/buildlink3.mk"
+# .include "../../x11/xfce4-windowlist-plugin/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4-extras/PLIST b/meta-pkgs/xfce4-extras/PLIST
index 6e2f27f7a49..d8baefce540 100644
--- a/meta-pkgs/xfce4-extras/PLIST
+++ b/meta-pkgs/xfce4-extras/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/23 14:04:45 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/12 09:55:11 martti Exp $
 @comment This PLIST is intentionally left empty
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index db2463060d1..651d70aa73e 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: Makefile,v 1.26 2007/04/12 09:55:10 martti Exp $
 
 .include "Makefile.common"
 
-XFCE4_VERSION=	4.2.4
-
 DISTNAME=	xfce4-${XFCE4_VERSION}
 DISTFILES=	# empty
-#PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce
 
@@ -20,21 +17,19 @@ do-install:
 	@${DO_NADA}
 
 .include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../editors/xfce4-mousepad/buildlink3.mk"
 .include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../graphics/xfce4-iconbox/buildlink3.mk"
 .include "../../print/xfce4-print/buildlink3.mk"
 .include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-fm/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
+.include "../../time/xfce4-orage/buildlink3.mk"
 .include "../../wm/xfce4-wm-themes/buildlink3.mk"
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-toys/buildlink3.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-terminal/buildlink3.mk"
 .include "../../x11/xfce4-utils/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 237089b4cf8..f2c9ba74aa3 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile.common,v 1.33 2007/02/01 13:03:53 joerg Exp $
+# $NetBSD: Makefile.common,v 1.34 2007/04/12 09:55:11 martti Exp $
 
-MASTER_SITES=		http://www.xfce.org/archive/xfce-4.2.4/src/ \
-			http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.4/src/
+MASTER_SITES=		http://www.xfce.org/archive/xfce-4.4.1/src/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.xfce.org/
 
-XFCE4_VERSION=		4.2.4
+XFCE4_VERSION=		4.4.1
 
 # Do NOT put a PKGREVISION statement in this file!
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake pkg-config msgfmt perl
 
 .if ${MACHINE_ARCH} == "alpha"
 GCC_REQD+=		3.0
@@ -21,6 +21,9 @@ GCC_REQD+=		3.0
 
 XFCE4_EGBASE=		${PREFIX}/share/examples/xfce4
 
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 ## # Use the latest GNU tar when the native tar is buggy
diff --git a/meta-pkgs/xfce4/PLIST b/meta-pkgs/xfce4/PLIST
index efadb39196c..d8baefce540 100644
--- a/meta-pkgs/xfce4/PLIST
+++ b/meta-pkgs/xfce4/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/26 10:29:52 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/12 09:55:11 martti Exp $
 @comment This PLIST is intentionally left empty
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index cd3b6d9735f..fcb892a5feb 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/04/12 09:55:11 martti Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFCE4_BUILDLINK3_MK:=	${XFCE4_BUILDLINK3_MK}+
@@ -12,27 +12,28 @@ BUILDLINK_PACKAGES+=	xfce4
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4
 
 .if ${XFCE4_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4+=	xfce4>=4.4.1
 BUILDLINK_PKGSRCDIR.xfce4?=	../../meta-pkgs/xfce4
 .endif	# XFCE4_BUILDLINK3_MK
 
 .include "../../audio/xfce4-mixer/buildlink3.mk"
+.include "../../editors/xfce4-mousepad/buildlink3.mk"
 .include "../../graphics/xfce4-icon-theme/buildlink3.mk"
-.include "../../graphics/xfce4-iconbox/buildlink3.mk"
 .include "../../print/xfce4-print/buildlink3.mk"
 .include "../../sysutils/xfce4-appfinder/buildlink3.mk"
-.include "../../sysutils/xfce4-fm/buildlink3.mk"
-.include "../../sysutils/xfce4-systray/buildlink3.mk"
-.include "../../time/xfce4-calendar/buildlink3.mk"
+.include "../../sysutils/xfce4-xarchiver/buildlink3.mk"
+.include "../../time/xfce4-orage/buildlink3.mk"
 .include "../../wm/xfce4-wm-themes/buildlink3.mk"
 .include "../../wm/xfce4-wm/buildlink3.mk"
 .include "../../x11/xfce4-desktop/buildlink3.mk"
 .include "../../x11/xfce4-gtk2-engine/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../x11/xfce4-session/buildlink3.mk"
-.include "../../x11/xfce4-toys/buildlink3.mk"
-.include "../../x11/xfce4-trigger-launcher/buildlink3.mk"
+.include "../../x11/xfce4-terminal/buildlink3.mk"
 .include "../../x11/xfce4-utils/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}