From 381733f2969470face57649b98e3ab7a0fac5d0a Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Wed, 16 Sep 2009 01:15:32 +0000
Subject: 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.)
---
 graphics/xfce4-icon-theme/Makefile      | 5 +++--
 graphics/xfce4-icon-theme/PLIST         | 4 +++-
 graphics/xfce4-icon-theme/buildlink3.mk | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'graphics')

diff --git a/graphics/xfce4-icon-theme/Makefile b/graphics/xfce4-icon-theme/Makefile
index d0e339fd93d..e484a3d44cd 100644
--- a/graphics/xfce4-icon-theme/Makefile
+++ b/graphics/xfce4-icon-theme/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2009/08/26 20:19:17 sno Exp $
+# $NetBSD: Makefile,v 1.10 2009/09/16 01:15:33 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
+XFCE4_VERSION=	4.4.3
+
 DISTNAME=	xfce4-icon-theme-${XFCE4_VERSION}
-PKGREVISION=	1
 CATEGORIES=	graphics
 COMMENT=	Xfce icon themes
 
diff --git a/graphics/xfce4-icon-theme/PLIST b/graphics/xfce4-icon-theme/PLIST
index f1a50826218..3c512122465 100644
--- a/graphics/xfce4-icon-theme/PLIST
+++ b/graphics/xfce4-icon-theme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 20:05:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/09/16 01:15:33 reed Exp $
 lib/pkgconfig/xfce4-icon-theme-1.0.pc
 share/icons/Rodent/48x48/apps/applets-screenshooter.png
 share/icons/Rodent/48x48/apps/bluefish-icon.png
@@ -1610,3 +1610,5 @@ share/icons/Rodent/scalable/stock/volume-min.svg
 share/icons/Rodent/scalable/stock/volume-mute.svg
 share/icons/Rodent/scalable/stock/volume-zero.svg
 share/xfce4/mime/Rodent.mime.xml
+@unexec ${RMDIR} %D/share/xfce4/mime 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/xfce4 2>/dev/null || ${TRUE}
diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk
index d2a98f00c55..cbafd7ee4ac 100644
--- a/graphics/xfce4-icon-theme/buildlink3.mk
+++ b/graphics/xfce4-icon-theme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/08/26 19:56:58 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/09/16 01:15:33 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-icon-theme
 
@@ -6,11 +6,9 @@ BUILDLINK_TREE+=	xfce4-icon-theme
 XFCE4_ICON_THEME_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-icon-theme+=	xfce4-icon-theme>=4.4.3
-BUILDLINK_ABI_DEPENDS.xfce4-icon-theme?=	xfce4-icon-theme>=4.4.3nb1
 BUILDLINK_PKGSRCDIR.xfce4-icon-theme?=	../../graphics/xfce4-icon-theme
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-- 
cgit v1.2.3