Updated to Xfce 4.4.1

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

7 files changed, 61 insertions, 41 deletions

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index f5c1d9a569f..74e7d1c067f 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/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:12 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -8,6 +8,7 @@ DISTNAME=	xfprint-${XFCE4_VERSION}
 CATEGORIES=	print
 COMMENT=	Xfce print dialog
 
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc
 CONFIGURE_ARGS+=	--with-printcap=/etc/printcap
 
 .include "options.mk"
diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST
index 20452773f3c..626dbd62bea 100644
--- a/print/xfce4-print/PLIST
+++ b/print/xfce4-print/PLIST
@@ -1,14 +1,38 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/23 11:53:46 martti Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/04/12 09:55:12 martti Exp $
 ${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
-bin/xfprint-manager
 bin/xfprint4
+bin/xfprint4-manager
+include/xfce4/libxfprint/common.h
+include/xfce4/libxfprint/job.h
+include/xfce4/libxfprint/libxfprint.h
+include/xfce4/libxfprint/printer-list-window.h
+include/xfce4/libxfprint/printer-queue-window.h
+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
 share/applications/xfce-xfprint-settings.desktop
 share/applications/xfprint-manager.desktop
 share/applications/xfprint.desktop
-share/icons/hicolor/48x48/apps/xfprint.png
-share/icons/hicolor/scalable/apps/xfprint.svg
-share/locale/af/LC_MESSAGES/xfprint.mo
+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/icons/hicolor/24x24/devices/printer.png
+share/icons/hicolor/48x48/devices/printer.png
+share/icons/hicolor/scalable/devices/printer.svg
 share/locale/ar/LC_MESSAGES/xfprint.mo
 share/locale/az/LC_MESSAGES/xfprint.mo
 share/locale/be/LC_MESSAGES/xfprint.mo
@@ -17,6 +41,7 @@ share/locale/bn_IN/LC_MESSAGES/xfprint.mo
 share/locale/ca/LC_MESSAGES/xfprint.mo
 share/locale/cs/LC_MESSAGES/xfprint.mo
 share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/dz/LC_MESSAGES/xfprint.mo
 share/locale/el/LC_MESSAGES/xfprint.mo
 share/locale/en_GB/LC_MESSAGES/xfprint.mo
 share/locale/es/LC_MESSAGES/xfprint.mo
@@ -26,15 +51,17 @@ share/locale/eu/LC_MESSAGES/xfprint.mo
 share/locale/fa/LC_MESSAGES/xfprint.mo
 share/locale/fi/LC_MESSAGES/xfprint.mo
 share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/gl/LC_MESSAGES/xfprint.mo
 share/locale/gu/LC_MESSAGES/xfprint.mo
 share/locale/he/LC_MESSAGES/xfprint.mo
 share/locale/hi/LC_MESSAGES/xfprint.mo
 share/locale/hu/LC_MESSAGES/xfprint.mo
 share/locale/it/LC_MESSAGES/xfprint.mo
 share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/ka/LC_MESSAGES/xfprint.mo
 share/locale/ko/LC_MESSAGES/xfprint.mo
-share/locale/ku/LC_MESSAGES/xfprint.mo
 share/locale/lt/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/nl/LC_MESSAGES/xfprint.mo
@@ -45,8 +72,6 @@ share/locale/pt_PT/LC_MESSAGES/xfprint.mo
 share/locale/ro/LC_MESSAGES/xfprint.mo
 share/locale/ru/LC_MESSAGES/xfprint.mo
 share/locale/sk/LC_MESSAGES/xfprint.mo
-share/locale/sl/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
@@ -72,13 +97,6 @@ share/xfce4/doc/fr/images/xfprint_prettyprinting.png
 share/xfce4/doc/fr/images/xfprint_sheets.png
 share/xfce4/doc/fr/images/xfprint_virtualpages.png
 share/xfce4/doc/fr/xfprint.html
-share/xfce4/doc/he/images/xfprint-manager-queue.png
-share/xfce4/doc/he/images/xfprint-manager.png
-share/xfce4/doc/he/images/xfprint_headings.png
-share/xfce4/doc/he/images/xfprint_input.png
-share/xfce4/doc/he/images/xfprint_mcs_plugin.png
-share/xfce4/doc/he/images/xfprint_prettyprinting.png
-share/xfce4/doc/he/images/xfprint_sheets.png
-share/xfce4/doc/he/images/xfprint_virtualpages.png
-share/xfce4/doc/he/xfprint.html
+@dirrm share/doc/libxfprint
 @dirrm lib/xfce4/xfprint-plugins
+@dirrm include/xfce4/libxfprint
diff --git a/print/xfce4-print/buildlink3.mk b/print/xfce4-print/buildlink3.mk
index ca3154d8714..4b9b2cba481 100644
--- a/print/xfce4-print/buildlink3.mk
+++ b/print/xfce4-print/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2007/01/23 11:53:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2007/04/12 09:55:12 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PRINT_BUILDLINK3_MK:=	${XFCE4_PRINT_BUILDLINK3_MK}+
@@ -12,13 +12,14 @@ BUILDLINK_PACKAGES+=	xfce4-print
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-print
 
 .if ${XFCE4_PRINT_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.2.4
+BUILDLINK_API_DEPENDS.xfce4-print+=	xfce4-print>=4.4.1
 BUILDLINK_PKGSRCDIR.xfce4-print?=	../../print/xfce4-print
 .endif	# XFCE4_PRINT_BUILDLINK3_MK
 
 .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"
 
 .if !defined(PKG_BUILD_OPTIONS.xfce4-print)
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 98ec8dda9e0..d0bf421496c 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2007/01/23 11:53:46 martti Exp $
+$NetBSD: distinfo,v 1.15 2007/04/12 09:55:12 martti Exp $
 
-SHA1 (xfprint-4.2.4.tar.gz) = ca65948df708453b77a32320671ada7a95b99566
-RMD160 (xfprint-4.2.4.tar.gz) = 7bfc68169925fb82cce0b4c402e522de1deee35e
-Size (xfprint-4.2.4.tar.gz) = 1165393 bytes
-SHA1 (patch-aa) = 09839619deef15afc2eee0a9e4e72109b6191398
-SHA1 (patch-ab) = dc426a6d42dabbef20b46c7d4d73744e5101570d
+SHA1 (xfprint-4.4.1.tar.bz2) = 28da63a9a47ae4ae528ab24b35a035f583efb1e4
+RMD160 (xfprint-4.4.1.tar.bz2) = a81078ff815a39c1b97181727ab4572552276caa
+Size (xfprint-4.4.1.tar.bz2) = 866136 bytes
+SHA1 (patch-aa) = a4aa713289f09642dab208e5c51deab0755eb84c
+SHA1 (patch-ab) = c9a6508cd7fa442a7574144800f8a2d630808fd1
diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk
index fd9cbf0637d..3feeb33e30f 100644
--- a/print/xfce4-print/options.mk
+++ b/print/xfce4-print/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/02/17 06:49:24 martti Exp $
+# $NetBSD: options.mk,v 1.3 2007/04/12 09:55:12 martti Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xfce4-print
 PKG_SUPPORTED_OPTIONS=	cups
diff --git a/print/xfce4-print/patches/patch-aa b/print/xfce4-print/patches/patch-aa
index 6cb52afeab3..2de362c2d12 100644
--- a/print/xfce4-print/patches/patch-aa
+++ b/print/xfce4-print/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1 2005/03/31 18:12:29 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/12 09:55:12 martti Exp $
 
---- xfprint/Makefile.in.orig	2005-03-18 14:06:27.000000000 +0100
-+++ xfprint/Makefile.in
-@@ -266,7 +266,8 @@ xfprint4_CFLAGS = \
+--- xfprint/Makefile.in.orig	2006-07-10 12:16:08.000000000 +0000
++++ xfprint/Makefile.in	2006-07-14 11:16:56.000000000 +0000
+@@ -315,7 +315,8 @@
  xfprint4_LDADD = \
- 	$(top_builddir)/common/libxfprint.la				\
+ 	$(top_builddir)/libxfprint/libxfprint.la			\
  	@LIBXFCE4MCS_CLIENT_LIBS@                                       \
 -	@LIBXFCEGUI4_LIBS@
 +	@LIBXFCEGUI4_LIBS@ \
 +	@GMODULE_LIBS@
  
- EXTRA_DIST = xfprint.desktop
- appsdir = $(datadir)/applications
+ xfprint4_DEPENDENCIES = \
+ 	$(top_builddir)/libxfprint/libxfprint.la
diff --git a/print/xfce4-print/patches/patch-ab b/print/xfce4-print/patches/patch-ab
index e3c69acec5e..3fd931bf471 100644
--- a/print/xfce4-print/patches/patch-ab
+++ b/print/xfce4-print/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2005/03/31 18:12:29 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/12 09:55:12 martti Exp $
 
---- xfprint-manager/Makefile.in.orig	2005-03-18 14:19:47.000000000 +0100
-+++ xfprint-manager/Makefile.in
-@@ -261,7 +261,8 @@ xfprint_manager_CFLAGS = \
- xfprint_manager_LDADD = \
- 	$(top_builddir)/common/libxfprint.la				\
+--- xfprint-manager/Makefile.in.orig	2006-07-10 12:16:07.000000000 +0000
++++ xfprint-manager/Makefile.in	2006-07-14 11:17:25.000000000 +0000
+@@ -295,7 +295,8 @@
+ xfprint4_manager_LDADD = \
+ 	$(top_builddir)/libxfprint/libxfprint.la			\
  	@LIBXFCE4MCS_CLIENT_LIBS@					\
 -	@LIBXFCEGUI4_LIBS@						
 +	@LIBXFCEGUI4_LIBS@ \
 +	@GMODULE_LIBS@						
  
- EXTRA_DIST = xfprint-manager.desktop
  appsdir = $(datadir)/applications
+ apps_in_files = xfprint-manager.desktop.in