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.)

6 files changed, 56 insertions, 51 deletions

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 809f6d0d5d4..47d9267aeee 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/08/26 19:56:52 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:34 reed Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -6,14 +6,18 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKGNAME=	xfce4-print-${XFCE4_VERSION}
 DISTNAME=	xfprint-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	print
 COMMENT=	Xfce print dialog
-HOMEPAGE=	http://www.xfce.org/projects/xfprint/
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc
+PKGCONFIG_OVERRIDE+=	libxfprint/xfprint-1.0.pc.in
+
 CONFIGURE_ARGS+=	--with-printcap=/etc/printcap
 
+MAKE_DIRS+=	${PREFIX}/include/xfce4 ${PREFIX}/lib/xfce4
+MAKE_DIRS+=	${PREFIX}/share/xfce4 ${PREFIX}/share/xfce4/doc
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/C ${PREFIX}/share/xfce4/doc/C/images
+MAKE_DIRS+=	${PREFIX}/share/xfce4/doc/fr ${PREFIX}/share/xfce4/doc/fr/images
+
 .include "options.mk"
 
 PLIST_VARS+=	bsdlpr
@@ -21,7 +25,10 @@ PLIST_VARS+=	bsdlpr
 PLIST.bsdlpr=	yes
 .endif
 
+.include "../../devel/xfconf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../print/a2ps/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST
index 3d9f1f40cbd..56a091d8dc0 100644
--- a/print/xfce4-print/PLIST
+++ b/print/xfce4-print/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 18:12:03 joerg Exp $
-${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
+@comment $NetBSD: PLIST,v 1.22 2009/09/16 01:15:34 reed Exp $
+bin/xfprint-settings
 bin/xfprint4
 bin/xfprint4-manager
 include/xfce4/libxfprint/common.h
@@ -11,26 +11,26 @@ include/xfce4/libxfprint/printer.h
 include/xfce4/libxfprint/printing-system.h
 lib/libxfprint.la
 lib/pkgconfig/xfprint-1.0.pc
-lib/xfce4/mcs-plugins/xfprint_plugin.la
+${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
 ${PLIST.cups}lib/xfce4/xfprint-plugins/cups_plugin.la
-share/applications/xfce-xfprint-settings.desktop
 share/applications/xfprint-manager.desktop
+share/applications/xfprint-settings.desktop
 share/applications/xfprint.desktop
-share/doc/libxfprint/PrinterListWindow.html
-share/doc/libxfprint/PrinterQueueWindow.html
-share/doc/libxfprint/PrintingSystem.html
-share/doc/libxfprint/ch01.html
-share/doc/libxfprint/home.png
-share/doc/libxfprint/index.html
-share/doc/libxfprint/index.sgml
-share/doc/libxfprint/left.png
-share/doc/libxfprint/libxfprint-Job.html
-share/doc/libxfprint/libxfprint-Printer.html
-share/doc/libxfprint/libxfprint.devhelp
-share/doc/libxfprint/libxfprint.devhelp2
-share/doc/libxfprint/right.png
-share/doc/libxfprint/style.css
-share/doc/libxfprint/up.png
+share/gtk-doc/html/libxfprint/PrinterListWindow.html
+share/gtk-doc/html/libxfprint/PrinterQueueWindow.html
+share/gtk-doc/html/libxfprint/PrintingSystem.html
+share/gtk-doc/html/libxfprint/ch01.html
+share/gtk-doc/html/libxfprint/home.png
+share/gtk-doc/html/libxfprint/index.html
+share/gtk-doc/html/libxfprint/index.sgml
+share/gtk-doc/html/libxfprint/left.png
+share/gtk-doc/html/libxfprint/libxfprint-Job.html
+share/gtk-doc/html/libxfprint/libxfprint-Printer.html
+share/gtk-doc/html/libxfprint/libxfprint.devhelp
+share/gtk-doc/html/libxfprint/libxfprint.devhelp2
+share/gtk-doc/html/libxfprint/right.png
+share/gtk-doc/html/libxfprint/style.css
+share/gtk-doc/html/libxfprint/up.png
 share/icons/hicolor/24x24/devices/printer.png
 share/icons/hicolor/48x48/devices/printer.png
 share/icons/hicolor/scalable/devices/printer.svg
@@ -70,16 +70,16 @@ share/locale/lv/LC_MESSAGES/xfprint.mo
 share/locale/mk/LC_MESSAGES/xfprint.mo
 share/locale/mr/LC_MESSAGES/xfprint.mo
 share/locale/ms/LC_MESSAGES/xfprint.mo
-share/locale/nb_NO/LC_MESSAGES/xfprint.mo
 share/locale/nl/LC_MESSAGES/xfprint.mo
 share/locale/pa/LC_MESSAGES/xfprint.mo
 share/locale/pl/LC_MESSAGES/xfprint.mo
+share/locale/pt/LC_MESSAGES/xfprint.mo
 share/locale/pt_BR/LC_MESSAGES/xfprint.mo
-share/locale/pt_PT/LC_MESSAGES/xfprint.mo
 share/locale/ro/LC_MESSAGES/xfprint.mo
 share/locale/ru/LC_MESSAGES/xfprint.mo
 share/locale/si/LC_MESSAGES/xfprint.mo
 share/locale/sk/LC_MESSAGES/xfprint.mo
+share/locale/sq/LC_MESSAGES/xfprint.mo
 share/locale/sv/LC_MESSAGES/xfprint.mo
 share/locale/ta/LC_MESSAGES/xfprint.mo
 share/locale/tr/LC_MESSAGES/xfprint.mo
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index 4c48e51f9ea..7a0eadc86d4 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,19 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.26 2009/08/26 19:56:52 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2009/09/16 01:15:34 reed Exp $
 
 BUILDLINK_TREE+=	xfce4-print
 
 .if !defined(XFCE4_PRINT_BUILDLINK3_MK)
 XFCE4_PRINT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.4.3nb1
-BUILDLINK_ABI_DEPENDS.xfce4-print?=	xfce4-print>=4.4.3nb2
+BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.6.0
+BUILDLINK_ABI_DEPENDS.xfce4-print+=	xfce4-print>=4.6.0
 BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
 
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../print/a2ps/buildlink3.mk"
-.include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
-.include "../../devel/xfce4-dev-tools/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../x11/libxfce4gui/buildlink3.mk"
+.include "../../x11/libxfce4util/buildlink3.mk"
 
 pkgbase := xfce4-print
 .include "../../mk/pkg-build-options.mk"
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index c0468e83c54..39fc652534f 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2008/12/17 12:50:03 hira Exp $
+$NetBSD: distinfo,v 1.18 2009/09/16 01:15:34 reed Exp $
 
-SHA1 (xfprint-4.4.3.tar.bz2) = a1670dd247a04dcd3ba897cc32977f0828926900
-RMD160 (xfprint-4.4.3.tar.bz2) = 3acdb7442da91df9c715193b6ba83f10d1db4e64
-Size (xfprint-4.4.3.tar.bz2) = 842716 bytes
-SHA1 (patch-aa) = 2d165843610510198a23773e0b93351edc24c6b6
-SHA1 (patch-ab) = d17b4373fe318f371a9ba8064546a6b6d3383379
+SHA1 (xfprint-4.6.1.tar.bz2) = 4ce98c49d49b2d4c1a8fb5d76597b8e9ab9a51e8
+RMD160 (xfprint-4.6.1.tar.bz2) = 8df81375cbc72eabd95911997210c8fa864bcf0b
+Size (xfprint-4.6.1.tar.bz2) = 842675 bytes
+SHA1 (patch-aa) = 825cc96436a358b94883c9c5ef232fd8c12ceb4f
+SHA1 (patch-ab) = 8cdda358cff094ace2f8acd06b85ebd66c817478
diff --git a/print/xfce4-print/patches/patch-aa b/print/xfce4-print/patches/patch-aa
index 042d661180a..af34f51546d 100644
--- a/print/xfce4-print/patches/patch-aa
+++ b/print/xfce4-print/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2007/12/07 19:43:22 martti Exp $
+$NetBSD: patch-aa,v 1.4 2009/09/16 01:15:34 reed Exp $
 
---- xfprint/Makefile.in.orig	2007-11-17 19:55:13.000000000 +0000
-+++ xfprint/Makefile.in	2007-12-04 09:52:06.000000000 +0000
-@@ -314,7 +314,8 @@
+--- xfprint/Makefile.in.orig	2009-02-25 06:37:08.000000000 +0000
++++ xfprint/Makefile.in
+@@ -310,7 +310,8 @@ xfprint4_LDFLAGS = \
  xfprint4_LDADD = \
  	$(top_builddir)/libxfprint/libxfprint.la			\
- 	@LIBXFCE4MCS_CLIENT_LIBS@                                       \
+ 	@XFCONF_LIBS@							\
 -	@LIBXFCEGUI4_LIBS@
 +	@LIBXFCEGUI4_LIBS@ \
 +	@GMODULE_LIBS@
diff --git a/print/xfce4-print/patches/patch-ab b/print/xfce4-print/patches/patch-ab
index f4c578dcc98..6798fddbd15 100644
--- a/print/xfce4-print/patches/patch-ab
+++ b/print/xfce4-print/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.3 2007/12/07 19:43:22 martti Exp $
+$NetBSD: patch-ab,v 1.4 2009/09/16 01:15:34 reed Exp $
 
---- xfprint-manager/Makefile.in.orig	2007-11-17 19:55:13.000000000 +0000
-+++ xfprint-manager/Makefile.in	2007-12-04 09:52:10.000000000 +0000
-@@ -294,7 +294,8 @@
+--- xfprint-manager/Makefile.in.orig	2009-02-25 06:37:04.000000000 +0000
++++ xfprint-manager/Makefile.in
+@@ -290,7 +290,8 @@ xfprint4_manager_LDFLAGS = \
  xfprint4_manager_LDADD = \
  	$(top_builddir)/libxfprint/libxfprint.la			\
- 	@LIBXFCE4MCS_CLIENT_LIBS@					\
+ 	@XFCONF_LIBS@							\
 -	@LIBXFCEGUI4_LIBS@						
-+	@LIBXFCEGUI4_LIBS@ \
-+	@GMODULE_LIBS@						
++	@LIBXFCEGUI4_LIBS@						\
++	@GMODULE_LIBS@
  
  appsdir = $(datadir)/applications
  apps_in_files = xfprint-manager.desktop.in