Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

7 files changed, 73 insertions, 15 deletions

diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index f32465ff9719..ddf8f080c4f9 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	ft2demos
-PORTVERSION=	2.1.10
+PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -32,7 +33,7 @@ MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
 
 FREETYPE_WRKSRC!=	cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC
 
-FT_PROGRAMS=	ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview testname
+FT_PROGRAMS=	ftbench ftchkwd ftdump ftgamma ftlint ftmemchk ftmulti ftstring fttimer ftvalid ftview
 
 do-install:
 	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${PREFIX}/bin)
diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo
index adc556814c0c..411d2d5f0d24 100644
--- a/print/ft2demos/distinfo
+++ b/print/ft2demos/distinfo
@@ -1,3 +1,3 @@
-MD5 (ft2demos-2.1.10.tar.bz2) = 4edaff5721fedcf1932e76935f3029b3
-SHA256 (ft2demos-2.1.10.tar.bz2) = e1ceeb1e2fd62e2212d6eec1fea299a30d4c53da2abdf728ae09456436e5bf0f
-SIZE (ft2demos-2.1.10.tar.bz2) = 122842
+MD5 (ft2demos-2.2.1.tar.bz2) = 64f5fa4425cd8241b130c0be35ba6760
+SHA256 (ft2demos-2.2.1.tar.bz2) = 1c4349ed98f2c6384cb99399f16572e1049c2c15e9691e9dc2cef2ba137acd3e
+SIZE (ft2demos-2.2.1.tar.bz2) = 138604
diff --git a/print/ft2demos/pkg-plist b/print/ft2demos/pkg-plist
index 5d0bd211674b..6d8f1a045ad3 100644
--- a/print/ft2demos/pkg-plist
+++ b/print/ft2demos/pkg-plist
@@ -9,4 +9,3 @@ bin/ftstring
 bin/fttimer
 bin/ftvalid
 bin/ftview
-bin/testname
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 921f0ad61893..ab97e549da2e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/print/gnome-print/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
 #
 
 PORTNAME=	gnome-print
 PORTVERSION=	0.37
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
@@ -25,12 +26,12 @@ USE_GHOSTSCRIPT_RUN=	yes
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/gnome-print/pkg-plist b/print/gnome-print/pkg-plist
index 0ebdefdb5faa..f1ffc683a34e 100644
--- a/print/gnome-print/pkg-plist
+++ b/print/gnome-print/pkg-plist
@@ -119,3 +119,33 @@ share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/fonts/afms
 @dirrm include/gnome-1.0/libgnomeprint
 @dirrm etc/gnome/fonts
+@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/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index e20c5ad2dba1..77804d185461 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,6 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 7ec2cc8277ec..304354469591 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -90,10 +90,6 @@ share/xfce4/doc/he/xfprint.html
 @dirrmtry lib/xfce4/xfprint-plugins
 @dirrmtry lib/xfce4
 @dirrmtry share/applications
-@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
@@ -102,3 +98,35 @@ share/xfce4/doc/he/xfprint.html
 @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