Updated to Xfce 4.4.1

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

5 files changed, 42 insertions, 38 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index e626338a763..491f1a2b9c4 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,31 +1,26 @@
-# $NetBSD: Makefile,v 1.18 2007/02/03 09:27:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/04/12 09:55:24 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=	xfce4-session-${XFCE4_VERSION}
-#PKGREVISION=	1
-CATEGORIES=	x11
-COMMENT=	Xfce session manager
-
+DISTNAME=		xfce4-session-${XFCE4_VERSION}
+CATEGORIES=		x11
+COMMENT=		Xfce session manager
 
 PKG_SYSCONFSUBDIR=	xdg/xfce4-session
 EGDIR=			${XFCE4_EGBASE}/session
 CONF_FILES=		${EGDIR:Q}/xfce4-session.rc \
 			${PKG_SYSCONFDIR:Q}/xfce4-session.rc
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q} \
-			ICEAUTH=${TOOLS_PATH.iceauth:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
+CONFIGURE_ARGS+=	ICEAUTH=${TOOLS_PATH.iceauth:Q}
 
 REQD_DIRS+=		${XFCE4_EGBASE} ${EGDIR}
+BUILD_DEFS+=		PKG_SYSCONFBASE
 
-USE_DIRS+=	xdg-1.4
-USE_TOOLS+=	iceauth:run
-
-BUILDLINK_DEPMETHOD.libXt?=	build
+USE_TOOLS+=		iceauth:run
+USE_TOOLS+=		intltool
+USE_DIRS+=		xdg-1.4
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index d921216eaab..9d12f916286 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2007/01/23 11:53:47 martti Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/04/12 09:55:24 martti Exp $
+bin/xfce4-autostart-editor
 bin/xfce4-session
 bin/xfce4-session-logout
+bin/xfce4-tips
+etc/xdg/autostart/xfce4-tips-autostart.desktop
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
 include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
 lib/libxfsm-4.2.la
@@ -17,25 +20,27 @@ man/man1/xfce4-session-logout.1
 man/man1/xfce4-session.1
 share/applications/xfce-session-settings.desktop
 share/applications/xfce-splash-settings.desktop
+share/applications/xfce4-autostart-editor.desktop
 share/examples/xfce4/session/xfce4-session.rc
 share/icons/hicolor/128x128/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
 share/icons/hicolor/48x48/apps/xfce4-splash.png
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
 share/icons/hicolor/48x48/apps/xfsm-shutdown.png
 share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
 share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
 share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
 share/icons/hicolor/scalable/apps/xfce4-session.svg
 share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-share/locale/af/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/az/LC_MESSAGES/xfce4-session.mo
 share/locale/be/LC_MESSAGES/xfce4-session.mo
 share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
 share/locale/ca/LC_MESSAGES/xfce4-session.mo
 share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
 share/locale/de/LC_MESSAGES/xfce4-session.mo
+share/locale/dz/LC_MESSAGES/xfce4-session.mo
 share/locale/el/LC_MESSAGES/xfce4-session.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
 share/locale/eo/LC_MESSAGES/xfce4-session.mo
@@ -46,15 +51,17 @@ share/locale/eu/LC_MESSAGES/xfce4-session.mo
 share/locale/fa/LC_MESSAGES/xfce4-session.mo
 share/locale/fi/LC_MESSAGES/xfce4-session.mo
 share/locale/fr/LC_MESSAGES/xfce4-session.mo
+share/locale/gl/LC_MESSAGES/xfce4-session.mo
 share/locale/gu/LC_MESSAGES/xfce4-session.mo
 share/locale/he/LC_MESSAGES/xfce4-session.mo
 share/locale/hi/LC_MESSAGES/xfce4-session.mo
 share/locale/hu/LC_MESSAGES/xfce4-session.mo
 share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
+share/locale/ka/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/ku/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
+share/locale/mk/LC_MESSAGES/xfce4-session.mo
 share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
 share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
@@ -66,8 +73,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
 share/locale/ro/LC_MESSAGES/xfce4-session.mo
 share/locale/ru/LC_MESSAGES/xfce4-session.mo
 share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sl/LC_MESSAGES/xfce4-session.mo
-share/locale/sq/LC_MESSAGES/xfce4-session.mo
 share/locale/sv/LC_MESSAGES/xfce4-session.mo
 share/locale/ta/LC_MESSAGES/xfce4-session.mo
 share/locale/tr/LC_MESSAGES/xfce4-session.mo
@@ -85,12 +90,15 @@ share/xfce4/doc/fr/images/xfsm-advanced.png
 share/xfce4/doc/fr/images/xfsm-general.png
 share/xfce4/doc/fr/images/xfsm-splash.png
 share/xfce4/doc/fr/xfce4-session.html
-share/xfce4/doc/he/images/xfsm-advanced.png
-share/xfce4/doc/he/images/xfsm-general.png
-share/xfce4/doc/he/images/xfsm-splash.png
-share/xfce4/doc/he/xfce4-session.html
+share/xfce4/tips/tips
+share/xfce4/tips/tips.dat
+@dirrm share/xfce4/tips
 @dirrm share/themes/Default/balou
+@dirrm share/examples/xfce4/session
 @dirrm lib/xfce4/splash/engines
 @dirrm lib/xfce4/splash
 @dirrm include/xfce4/xfce4-session-4.2/libxfsm
 @dirrm include/xfce4/xfce4-session-4.2
+@dirrm etc/xdg/xfce4-session
+@dirrm etc/xdg/autostart
+@unexec ${RMDIR} %D/etc/xdg 2>/dev/null || ${TRUE}
diff --git a/x11/xfce4-session/buildlink3.mk b/x11/xfce4-session/buildlink3.mk
index bf8510c97cc..898c06f97f1 100644
--- a/x11/xfce4-session/buildlink3.mk
+++ b/x11/xfce4-session/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/01/23 11:53:47 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/04/12 09:55:24 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_SESSION_BUILDLINK3_MK:=	${XFCE4_SESSION_BUILDLINK3_MK}+
@@ -12,12 +12,13 @@ BUILDLINK_PACKAGES+=	xfce4-session
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-session
 
 .if ${XFCE4_SESSION_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-session+=	xfce4-session>=4.4.1
 BUILDLINK_PKGSRCDIR.xfce4-session?=	../../x11/xfce4-session
 .endif	# XFCE4_SESSION_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 8ffff22458f..6e6319328d3 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2007/01/23 11:53:48 martti Exp $
+$NetBSD: distinfo,v 1.8 2007/04/12 09:55:24 martti Exp $
 
-SHA1 (xfce4-session-4.2.4.tar.gz) = 61e20cbf624e74f69f65c8a338c0599c4bd44040
-RMD160 (xfce4-session-4.2.4.tar.gz) = c715e5ed4055e8689e5a0ac1d80e2e5f157b6c90
-Size (xfce4-session-4.2.4.tar.gz) = 1595909 bytes
-SHA1 (patch-aa) = acf3953b39f632423fddd799ba66eb8b4b6893bc
+SHA1 (xfce4-session-4.4.1.tar.bz2) = 05a47d55830a9f9b91498a6a3fd1bf3eb197d42a
+RMD160 (xfce4-session-4.4.1.tar.bz2) = 76450c7b53d6b81d378649d52035dcbd3d68a999
+Size (xfce4-session-4.4.1.tar.bz2) = 1289278 bytes
+SHA1 (patch-aa) = 7fcb05e5884f979b015ac7e853df66ca79190195
diff --git a/x11/xfce4-session/patches/patch-aa b/x11/xfce4-session/patches/patch-aa
index 63f9b350f8f..af69a182f1d 100644
--- a/x11/xfce4-session/patches/patch-aa
+++ b/x11/xfce4-session/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2005/06/15 09:03:28 hira Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:24 martti Exp $
 
---- Makefile.in.orig	2005-06-13 18:25:08.000000000 +0900
-+++ Makefile.in	2005-06-13 18:26:18.000000000 +0900
-@@ -249,7 +249,7 @@
- 	xfce4-session-logout						\
+--- Makefile.in.orig	2006-07-10 12:12:02.000000000 +0000
++++ Makefile.in	2006-07-14 09:28:20.000000000 +0000
+@@ -278,7 +278,7 @@
+ 	xfce4-tips							\
  	xfsm-shutdown-helper
  
 -configdir = $(sysconfdir)/xdg/xfce4-session
 +configdir = $(datadir)/examples/xfce4/session
  config_DATA = xfce4-session.rc
  EXTRA_DIST = \
- 	$(config_DATA)							\
+ 	BUGS								\