4 files changed, 63 insertions, 74 deletions

diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 77804d185461..98c4ed2ff559 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -6,37 +6,31 @@
 #
 
 PORTNAME=	xfce4-print
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	4.4.0
 CATEGORIES=	print xfce
-MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
-		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	${MASTER_SITES_XFCE}
 DISTNAME=	xfprint-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 graphical frontend for printing
 
-BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
-		xfce4mcs-client.2:${PORTSDIR}/x11/libxfce4mcs
-RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-
-USE_GETTEXT=	yes
-USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
-		CPPFLAGS=-I${LOCALBASE}/include \
-		LIBS=-L${LOCALBASE}/lib
-OPTIONS=	LPR	"Use lpr as printing system"	on\
-		CUPS	"Use cups as printing system"	off
+INSTALLS_ICONS= yes
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG=	yes
+USE_XFCE=	configenv libgui libmcs libutil mcsmanager
+USE_XLIB=	yes
+
+OPTIONS=	LPR	"Use lpr as printing system"		on \
+		CUPS	"Use cups as printing system"		off \
+		LETTER	"Use letter paper format instead of A4" off
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
 
 .if defined(WITH_CUPS)
 CONFIGURE_ARGS+=--enable-cups
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 0e6f45972cb1..879ae4ee6b8d 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfprint-4.2.3.tar.gz) = 64c983a6d7778cbd5d6c93ee1dbbd3f9
-SHA256 (xfce4/xfprint-4.2.3.tar.gz) = f0b815f526ce4a7117217d7b45c4bcf1599df5ed94ff1c1e3974087ca9297398
-SIZE (xfce4/xfprint-4.2.3.tar.gz) = 1169874
+MD5 (xfce4/xfprint-4.4.0.tar.bz2) = 4b6d8f5381e73e912abddf2fdbf9888f
+SHA256 (xfce4/xfprint-4.4.0.tar.bz2) = a7843194252411674e3ab30d7ac20c4c11ff2ab279bd5a6565685be1db4c85f9
+SIZE (xfce4/xfprint-4.4.0.tar.bz2) = 873477
diff --git a/print/xfce4-print/pkg-descr b/print/xfce4-print/pkg-descr
index 8fe54f54402d..4d969bbde10f 100644
--- a/print/xfce4-print/pkg-descr
+++ b/print/xfce4-print/pkg-descr
@@ -1,4 +1,4 @@
 XFce 4 print dialog. Provides a graphical frontend for printing. Includes
 xfprint4 and xfprint-manager.
 
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 304354469591..ce1201fb0779 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -1,5 +1,16 @@
-bin/xfprint-manager
+bin/xfprint4-manager
 bin/xfprint4
+include/xfce4/libxfprint/common.h
+include/xfce4/libxfprint/job.h
+include/xfce4/libxfprint/libxfprint.h
+include/xfce4/libxfprint/printer.h
+include/xfce4/libxfprint/printer-list-window.h
+include/xfce4/libxfprint/printer-queue-window.h
+include/xfce4/libxfprint/printing-system.h
+lib/libxfprint.so.0
+lib/libxfprint.so
+lib/libxfprint.la
+lib/libxfprint.a
 lib/xfce4/mcs-plugins/xfprint_plugin.a
 lib/xfce4/mcs-plugins/xfprint_plugin.la
 lib/xfce4/mcs-plugins/xfprint_plugin.so
@@ -9,12 +20,28 @@ lib/xfce4/mcs-plugins/xfprint_plugin.so
 %%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.a
 %%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.la
 %%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
+libdata/pkgconfig/xfprint-1.0.pc
 share/applications/xfprint.desktop
 share/applications/xfprint-manager.desktop
 share/applications/xfce-xfprint-settings.desktop
-share/icons/hicolor/scalable/apps/xfprint.svg
-share/icons/hicolor/48x48/apps/xfprint.png
-share/locale/af/LC_MESSAGES/xfprint.mo
+share/gtk-doc/html/libxfprint
+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/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
 share/locale/ar/LC_MESSAGES/xfprint.mo
 share/locale/az/LC_MESSAGES/xfprint.mo
 share/locale/be/LC_MESSAGES/xfprint.mo
@@ -23,6 +50,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
@@ -32,15 +60,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
@@ -51,7 +81,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/sv/LC_MESSAGES/xfprint.mo
 share/locale/ta/LC_MESSAGES/xfprint.mo
 share/locale/tr/LC_MESSAGES/xfprint.mo
@@ -77,56 +106,22 @@ 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_headings.png
-share/xfce4/doc/he/images/xfprint_input.png
-share/xfce4/doc/he/images/xfprint-manager.png
-share/xfce4/doc/he/images/xfprint-manager-queue.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 include/xfce4/libxfprint
+@dirrmtry include/xfce4
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4/xfprint-plugins
 @dirrmtry lib/xfce4
 @dirrmtry share/applications
+@dirrm share/gtk-doc/html/libxfprint
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images
 @dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
 @dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be