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, 37 insertions, 20 deletions

diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 2ed970610a4..2fdfc55523f 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/16 01:15:34 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,11 +6,19 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DISTNAME=	orage-${XFCE4_VERSION}
 PKGNAME=	xfce4-orage-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	time
 COMMENT=	Xfce time managing application
 
+CONFIGURE_ARGS+=	--disable-libxfce4mcs
+
+MAKE_DIRS+=	${PREFIX}/libexec/xfce4 ${PREFIX}/libexec/xfce4/panel-plugins
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/panel-plugins
+
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/libnotify/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xfce4-orage/PLIST b/time/xfce4-orage/PLIST
index 2efae587493..6580699f293 100644
--- a/time/xfce4-orage/PLIST
+++ b/time/xfce4-orage/PLIST
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 21:38:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/09/16 01:15:34 reed Exp $
+bin/globaltime
 bin/orage
-lib/xfce4/mcs-plugins/orage_plugin.la
 libexec/xfce4/panel-plugins/orageclock
+man/man1/globaltime.1
+man/man1/orage.1
 share/applications/xfcalendar.desktop
 share/applications/xfce-xfcalendar-settings.desktop
+share/dbus-1/services/org.xfce.calendar.service
+share/dbus-1/services/org.xfce.orage.service
 share/icons/hicolor/48x48/apps/xfcalendar.png
 share/icons/hicolor/scalable/apps/xfcalendar.svg
 share/locale/am/LC_MESSAGES/orage.mo
@@ -38,20 +42,22 @@ share/locale/it/LC_MESSAGES/orage.mo
 share/locale/ja/LC_MESSAGES/orage.mo
 share/locale/ka/LC_MESSAGES/orage.mo
 share/locale/ko/LC_MESSAGES/orage.mo
+share/locale/ku/LC_MESSAGES/orage.mo
 share/locale/lt/LC_MESSAGES/orage.mo
 share/locale/lv/LC_MESSAGES/orage.mo
 share/locale/mk/LC_MESSAGES/orage.mo
 share/locale/mr/LC_MESSAGES/orage.mo
 share/locale/ms/LC_MESSAGES/orage.mo
-share/locale/nb_NO/LC_MESSAGES/orage.mo
+share/locale/nb/LC_MESSAGES/orage.mo
 share/locale/nl/LC_MESSAGES/orage.mo
 share/locale/pa/LC_MESSAGES/orage.mo
 share/locale/pl/LC_MESSAGES/orage.mo
+share/locale/pt/LC_MESSAGES/orage.mo
 share/locale/pt_BR/LC_MESSAGES/orage.mo
-share/locale/pt_PT/LC_MESSAGES/orage.mo
 share/locale/ro/LC_MESSAGES/orage.mo
 share/locale/ru/LC_MESSAGES/orage.mo
 share/locale/sk/LC_MESSAGES/orage.mo
+share/locale/sq/LC_MESSAGES/orage.mo
 share/locale/sv/LC_MESSAGES/orage.mo
 share/locale/ta/LC_MESSAGES/orage.mo
 share/locale/tr/LC_MESSAGES/orage.mo
@@ -68,12 +74,15 @@ share/orage/doc/C/images/orage_calendar_edit_menu.png
 share/orage/doc/C/images/orage_calendar_file_menu.png
 share/orage/doc/C/images/orage_calendar_help_menu.png
 share/orage/doc/C/images/orage_calendar_view_menu.png
+share/orage/doc/C/images/orage_daylist.png
 share/orage/doc/C/images/orage_desktop_menuitem.png
 share/orage/doc/C/images/orage_eventlist.png
-share/orage/doc/C/images/orage_preferences_archives.png
+share/orage/doc/C/images/orage_exchange_foreign.png
+share/orage/doc/C/images/orage_exchange_impexp.png
+share/orage/doc/C/images/orage_exchange_oragefiles.png
 share/orage/doc/C/images/orage_preferences_display.png
-share/orage/doc/C/images/orage_preferences_sound.png
-share/orage/doc/C/images/orage_preferences_timezone.png
+share/orage/doc/C/images/orage_preferences_extra.png
+share/orage/doc/C/images/orage_preferences_main.png
 share/orage/doc/C/orage.html
 share/orage/sounds/Boiling.wav
 share/orage/sounds/KDE_Beep_Digital_1.ogg
@@ -140,6 +149,11 @@ share/orage/zoneinfo/America/Anchorage.ics
 share/orage/zoneinfo/America/Anguilla.ics
 share/orage/zoneinfo/America/Antigua.ics
 share/orage/zoneinfo/America/Araguaina.ics
+share/orage/zoneinfo/America/Argentina/Buenos_Aires.ics
+share/orage/zoneinfo/America/Argentina/Catamarca.ics
+share/orage/zoneinfo/America/Argentina/Cordoba.ics
+share/orage/zoneinfo/America/Argentina/Jujuy.ics
+share/orage/zoneinfo/America/Argentina/Mendoza.ics
 share/orage/zoneinfo/America/Aruba.ics
 share/orage/zoneinfo/America/Asuncion.ics
 share/orage/zoneinfo/America/Barbados.ics
diff --git a/time/xfce4-orage/buildlink3.mk b/time/xfce4-orage/buildlink3.mk
index df7e0b6b01c..fa37d1ddec0 100644
--- a/time/xfce4-orage/buildlink3.mk
+++ b/time/xfce4-orage/buildlink3.mk
@@ -1,18 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/08/26 19:57:05 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/09/16 01:15:34 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-orage
 
 .if !defined(XFCE4_ORAGE_BUILDLINK3_MK)
 XFCE4_ORAGE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-orage+=	xfce4-orage>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-orage?=	xfce4-orage>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-orage+=	xfce4-orage>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-orage?=	../../time/xfce4-orage
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/xfce4-panel/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .endif # XFCE4_ORAGE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xfce4-orage
diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo
index bd988a6e830..6379138d03f 100644
--- a/time/xfce4-orage/distinfo
+++ b/time/xfce4-orage/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:34 reed Exp $
 
-SHA1 (orage-4.4.3.tar.bz2) = 716cbe76e992a787c6acb2c6320293e0455b41d2
-RMD160 (orage-4.4.3.tar.bz2) = ebe9377fd961ef83bf20ab2de82ff791fac3d1a2
-Size (orage-4.4.3.tar.bz2) = 1579582 bytes
+SHA1 (orage-4.6.1.tar.bz2) = 2db15404197ef9aa6f588c0eebac9fc4f68426df
+RMD160 (orage-4.6.1.tar.bz2) = 7724992e2e177487c71597a15d7faf7f865bb56b
+Size (orage-4.6.1.tar.bz2) = 1937593 bytes