- Remove unneeded dependency from gtk12/gtk20 [1]

- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)

40 files changed, 62 insertions, 76 deletions

diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index b868c078bfb5..ae8418e0960b 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	acroread:${PORTSDIR}/print/acroreadwrapper \
 RESTRICTED=	Must fill out redistribution form at http://www.adobe.com/products/acrobat/distribute.html
 ONLY_FOR_ARCHS=	amd64 i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 #USE_GNOME=	desktopfileutils
 NO_BUILD=	yes
 PLIST=		${PKGDIR}/pkg-plist.${PORTVERSION}
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 7de1eb57bbeb..f90c3124f9fe 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX-base
 USE_OCAML=	yes
 NO_OCAML_RUNDEPENDS=yes
 USE_GHOSTSCRIPT=yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -41,7 +41,7 @@ post-extract:
 	@${REINPLACE_CMD} -E \
 		-e 's,^(COPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \
 		-e 's,^(COPTOPTIONS[[:space:]]*=).*,\1-ccopt "${CFLAGS}",' \
-		-e 's,^(X11_INCLUDES[[:space:]]*=).*,\1-I${X11BASE}/include,' \
+		-e 's,^(X11_INCLUDES[[:space:]]*=).*,\1-I${LOCALBASE}/include,' \
 		-e 's,install -m 644,\$${BSD_INSTALL_DATA},' \
 		-e 's,install -m 755,\$${BSD_INSTALL_PROGRAM},' \
 		${WRKSRC}/Makefile
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index c760152ff52e..2eecfc033b29 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -82,7 +82,7 @@ RUN_DEPENDS+=	htmldoc:${PORTSDIR}/textproc/htmldoc
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-${PAPERSIZE}
 .if !defined(WITHOUT_X11)
 # "xxx to ps" filter utilities that require X
-RUN_DEPENDS+=	${X11BASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
+RUN_DEPENDS+=	${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS+=	dvips:${PORTSDIR}/print/teTeX
 RUN_DEPENDS+=	wmf2eps:${PORTSDIR}/graphics/libwmf
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index 9b968ac24210..037f293b065a 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -113,7 +113,7 @@ while [ "$1" ]; do
 		esac
 		;;
 	\"ACROREAD7\")
-		echo RUN_DEPENDS+=${X11BASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
+		echo RUN_DEPENDS+=${LOCALBASE}/Adobe/Acrobat7.0/ENU/bin/acroread:${PORTSDIR}/print/acroread7
 		;;
 	\"CONVERT\")
 		echo RUN_DEPENDS+=convert:${PORTSDIR}/graphics/ImageMagick
diff --git a/print/asprint/files/patch-aa b/print/asprint/files/patch-aa
index 68521926a3af..4f1ba5fba5f2 100644
--- a/print/asprint/files/patch-aa
+++ b/print/asprint/files/patch-aa
@@ -9,15 +9,15 @@
 -
 +CFLAGS ?= -O2
 +CC ?= gcc
-+XLIB = -L$(X11BASE)/lib  -lXaw -lXmu -lXt
-+XLIB+= -Wl,-rpath,$(X11BASE)/lib
++XLIB = -L$(LOCALBASE)/lib  -lXaw -lXmu -lXt
++XLIB+= -Wl,-rpath,$(LOCALBASE)/lib
  OBJS = asprint.o
 -INCS = 
 -
 -default : asprint  ./makefile
 -clean:
 -	rm -f $(OBJS) *~ asprint core
-+INCS = -I$(X11BASE)/include
++INCS = -I$(LOCALBASE)/include
  
  asprint: $(OBJS)
  	$(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB)
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 9bb2cdd99688..42c94dbbc4f6 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -28,7 +28,7 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost \
 		qt-mt:${PORTSDIR}/x11-toolkits/qt33
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 
 OPTIONS=	ASPELL	"Utilize ASPELL library"	on \
 		ISPELL	"Depend on ISPELL as well"	off
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index cdf7be06e9b4..af63fb6bdf5b 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -27,7 +27,7 @@ USE_XORG=	xext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15:env
 MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
-MAKE_ARGS=	X11_PATH="${X11BASE}"
+MAKE_ARGS=	X11_PATH="${LOCALBASE}"
 
 PLIST_FILES=	${FT_PROGRAMS:S,^,bin/,}
 
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index 9375587700e8..ffc2947ef0d0 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -10,15 +10,13 @@ PORTNAME=	gfontview
 PORTVERSION=	0.5.0
 PORTREVISION=	6
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An outline font viewer
 
 LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 424bef417de1..a976be3d61b7 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ggv
 PORTVERSION=	2.12.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
@@ -18,14 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 ghostscript viewer
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui desktopfileutils
 USE_GETTEXT=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	ggv.schemas
diff --git a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
index e09585bae9f3..41f387c4143e 100644
--- a/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gnu/files/patch-src:unix-gcc.mak
@@ -111,7 +111,7 @@
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -124,7 +124,7 @@
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
diff --git a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
index 2a458b8ffac0..7e9753df3a11 100644
--- a/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -148,7 +148,7 @@
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -161,7 +161,7 @@
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index e09585bae9f3..41f387c4143e 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -111,7 +111,7 @@
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -124,7 +124,7 @@
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
index 2a458b8ffac0..7e9753df3a11 100644
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -148,7 +148,7 @@
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
@@ -161,7 +161,7 @@
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
diff --git a/print/gl2ps/Makefile b/print/gl2ps/Makefile
index cd6e130a92f3..bf6a1fd7603d 100644
--- a/print/gl2ps/Makefile
+++ b/print/gl2ps/Makefile
@@ -32,7 +32,7 @@ do-install:
 	@${SED} -e 's|%%CC%%|${CC}|g; \
 		    s|%%RM%%|${RM}|g; \
 		    s|%%CFLAGS%%|${CFLAGS}|g; \
-		    s|%%X11BASE%%|${X11BASE}|g' \
+		    s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		<${FILESDIR}/Makefile.ex >${EXAMPLESDIR}/Makefile
 
 .ifndef (NOPORTDOCS)
diff --git a/print/gl2ps/files/Makefile.ex b/print/gl2ps/files/Makefile.ex
index a3410bb6393b..6ead2825bec9 100644
--- a/print/gl2ps/files/Makefile.ex
+++ b/print/gl2ps/files/Makefile.ex
@@ -3,8 +3,8 @@
 CC=%%CC%%
 RM=%%RM%%
 
-CFLAGS=		%%CFLAGS%% -DHAVE_ZLIB -O3 -I%%X11BASE%%/include
-LDFLAGS=	-lgl2ps -lGL -lGLU -lglut -L%%X11BASE%%/lib -lX11 -lXi -lXmu -lm -lz
+CFLAGS=		%%CFLAGS%% -DHAVE_ZLIB -O3 -I%%LOCALBASE%%/include
+LDFLAGS=	-lgl2ps -lGL -lGLU -lglut -L%%LOCALBASE%%/lib -lX11 -lXi -lXmu -lm -lz
 
 gl2psTest: gl2psTest.o
 	${CC} ${LDFLAGS} $> -o $@
diff --git a/print/gl2ps/files/Makefile.lib b/print/gl2ps/files/Makefile.lib
index 6d6b2830422e..2d806cb17de4 100644
--- a/print/gl2ps/files/Makefile.lib
+++ b/print/gl2ps/files/Makefile.lib
@@ -1,5 +1,5 @@
-CFLAGS+=	-DHAVE_ZLIB -O3 -fPIC -I${X11BASE}/include
-LDFLAGS=	-shared -E -lGL -L${X11BASE}/lib -lX11 -lXi -lXmu -lm -lz
+CFLAGS+=	-DHAVE_ZLIB -O3 -fPIC -I${LOCALBASE}/include
+LDFLAGS=	-shared -E -lGL -L${LOCALBASE}/lib -lX11 -lXi -lXmu -lm -lz
 
 all: libgl2ps.so libgl2ps.a
 
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index e64a36f766b0..d419e0a29532 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-cups-manager
 PORTVERSION=	0.31
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -23,7 +23,6 @@ RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \
 		desktopfileutils
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index b97db20f14ac..16531a00e5af 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-print
 PORTVERSION=	0.37
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-print/0.37
@@ -27,7 +27,6 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier gnomelibs gnomecanvas
diff --git a/print/gnomephotoprinter/Makefile b/print/gnomephotoprinter/Makefile
index 3d4a5050f2ea..b49ba6d20b01 100644
--- a/print/gnomephotoprinter/Makefile
+++ b/print/gnomephotoprinter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomephotoprinter
 PORTVERSION=	0.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print gnome
 MASTER_SITES=	http://www.fogman.de/gpp/
 DISTNAME=	gpp-${PORTVERSION}
@@ -16,7 +16,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome Photo Printer is intended for printing photos in an easy way
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui libglade2 libgnomeprintui \
 		gnomevfs2
diff --git a/print/gribouy/Makefile b/print/gribouy/Makefile
index 089a5cc939ad..616d35aa7966 100644
--- a/print/gribouy/Makefile
+++ b/print/gribouy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gribouy
 PORTVERSION=	0.0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print gnome
 #MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 #MASTER_SITE_SUBDIR=	gribouy/unstable.pkg/${PORTVERSION:R}
@@ -18,7 +18,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gribouy is a Type1 font editor
 
 USE_GMAKE=	yes
-USE_X_PREFIX=   yes
 USE_GNOME=      gnomeprefix gnomehack libglade2 libgnomeui
 GNU_CONFIGURE=	yes
 
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 18a40d2b4093..4018d5770d4b 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gv
 PORTVERSION=	3.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	A PostScript and PDF previewer
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XORG=	xpm
+USE_XORG=	xpm ice sm xext xmu x11
 USE_GHOSTSCRIPT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index dff2eb952b31..d99a4fe89081 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -34,8 +34,8 @@ PKGNAMESUFFIX=	-nox11
 PREVIEWER=	no_prev
 .else
 USE_XORG=	x11
-CPPFLAGS+=	-DHAS_UNIX_X11 -I${X11BASE}/include
-LDFLAGS+=	-L${X11BASE}/lib -lX11
+CPPFLAGS+=	-DHAS_UNIX_X11 -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
 PREVIEWER=	to_x11
 .endif
 
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 85fdd7fda6ce..5951700bccdf 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	libgnomeprint
 PORTVERSION=	2.18.4
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,7 +30,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \
 		libartlgpl2 ltverhack
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index 3472c63f5b1b..88bca3ed494d 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprintmm
 PORTVERSION=	2.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -21,11 +21,9 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomeprefix gnomehack libgnomeprint
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index ce139958b7f6..2e66ed2f81f9 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A library providing routines for ppd files
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	Yes
+USE_LDCONFIG=	Yes
 USE_GNOME=	glib12
 
 MAN1=		ppdfilt.1
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 1a2c446f48c8..463c98e9a47c 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -31,7 +31,7 @@ INFO=		lilypond lilypond-internals \
 		music-glossary
 
 BROKEN=	does not build with guile-1.8; needs update to 2.10.33
-#INSTALLS_SHLIB not needed for phyton library midi.so
+#USE_LDCONFIG not needed for phyton library midi.so
 
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index 38d97257e23b..543f3eba3f67 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -67,7 +67,7 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
+.if exists(${LOCALBASE}/bin/makepsres)
 PLIST_SUB+=	PSRES=
 .else
 PLIST_SUB+=	PSRES='@comment '
@@ -84,7 +84,7 @@ LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 LIB_DEPENDS+=	forms:${PORTSDIR}/x11-toolkits/xforms
 CONFIGURE_ARGS+=--with-frontend=xforms
@@ -106,7 +106,7 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
-.if exists(${X11BASE}/lib/libqt-mt.prl)
+.if exists(${LOCALBASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
 .else
 QT_PRESENT=	off
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 38d97257e23b..543f3eba3f67 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -67,7 +67,7 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
+.if exists(${LOCALBASE}/bin/makepsres)
 PLIST_SUB+=	PSRES=
 .else
 PLIST_SUB+=	PSRES='@comment '
@@ -84,7 +84,7 @@ LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 LIB_DEPENDS+=	forms:${PORTSDIR}/x11-toolkits/xforms
 CONFIGURE_ARGS+=--with-frontend=xforms
@@ -106,7 +106,7 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
-.if exists(${X11BASE}/lib/libqt-mt.prl)
+.if exists(${LOCALBASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
 .else
 QT_PRESENT=	off
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index 38d97257e23b..543f3eba3f67 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -67,7 +67,7 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
+.if exists(${LOCALBASE}/bin/makepsres)
 PLIST_SUB+=	PSRES=
 .else
 PLIST_SUB+=	PSRES='@comment '
@@ -84,7 +84,7 @@ LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 LIB_DEPENDS+=	forms:${PORTSDIR}/x11-toolkits/xforms
 CONFIGURE_ARGS+=--with-frontend=xforms
@@ -106,7 +106,7 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
-.if exists(${X11BASE}/lib/libqt-mt.prl)
+.if exists(${LOCALBASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
 .else
 QT_PRESENT=	off
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index 2bab36304bef..69247c7ae3bd 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -23,7 +23,7 @@ COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG) (stable)
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX \
 		${LOCALBASE}/share/texmf/tex/latex/prettyref/prettyref.sty:${PORTSDIR}/print/latex-prettyref \
-		${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+		${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost
 
 LATEST_LINK=	lyx15
@@ -93,7 +93,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
+.if exists(${LOCALBASE}/bin/makepsres)
 PLIST_SUB+=	PSRES=
 .else
 PLIST_SUB+=	PSRES='@comment '
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index 38d97257e23b..543f3eba3f67 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -67,7 +67,7 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/bin/makepsres)
+.if exists(${LOCALBASE}/bin/makepsres)
 PLIST_SUB+=	PSRES=
 .else
 PLIST_SUB+=	PSRES='@comment '
@@ -84,7 +84,7 @@ LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 CONFIGURE_ARGS+=	--with-frontend=qt
 CFLAGS+=	${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=	LDFLAGS=${PTHREAD_LIBS}
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/texcm-ttf/cmex10.ttf:${PORTSDIR}/x11-fonts/texcm-ttf
 .else
 LIB_DEPENDS+=	forms:${PORTSDIR}/x11-toolkits/xforms
 CONFIGURE_ARGS+=--with-frontend=xforms
@@ -106,7 +106,7 @@ RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 CONFIGURE_ARGS+=--without-ispell
 .endif
 
-.if exists(${X11BASE}/lib/libqt-mt.prl)
+.if exists(${LOCALBASE}/lib/libqt-mt.prl)
 QT_PRESENT=	on
 .else
 QT_PRESENT=	off
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 6f06164f817f..d3da6b4b7453 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -19,7 +19,6 @@ COMMENT=	A PostScript and PDF previewer
 USE_XORG=	xpm
 USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	X11BASE=${X11BASE}
 CONFIGURE_ARGS=	--enable-optimize \
 		--disable-debug
 PLIST_SUB=	MGV_VERSION=${PORTVERSION}
diff --git a/print/mup/files/Makefile.disp b/print/mup/files/Makefile.disp
index cfc4a0f76b9f..f9b8b00e218a 100644
--- a/print/mup/files/Makefile.disp
+++ b/print/mup/files/Makefile.disp
@@ -8,8 +8,8 @@ SRCS=	do_cmd.c \
 	mupdisp.c \
 	xterm.c
 
-CFLAGS+=-I${X11BASE}/include
-LDADD+=	-L${X11BASE}/lib -lX11
+CFLAGS+=-I${LOCALBASE}/include
+LDADD+=	-L${LOCALBASE}/lib -lX11
 
 .include <bsd.prog.mk>
 
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 9d2d04f02835..b62d0c29ab9d 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -31,7 +31,6 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	SCRIBUS_VERSION=${PORTVERSION}
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 9d2d04f02835..b62d0c29ab9d 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -31,7 +31,6 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 USE_LDCONFIG=	yes
 
 PLIST_SUB+=	SCRIBUS_VERSION=${PORTVERSION}
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 045070879974..c9977325da4e 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	teTeX-base
 PORTVERSION=	3.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:1
@@ -110,7 +110,7 @@ PLIST_SUB?=
 
 .if !defined(WITHOUT_X11)
 PLIST_SUB+=	X11BITS=""
-USE_XLIB=	yes
+USE_XORG=	x11
 .else
 FLAVOR+=	nox11
 CONFIGURE_ARGS+=--without-x11
diff --git a/print/tgif2tex/Makefile b/print/tgif2tex/Makefile
index 463942f0cfe8..0b5d81bc955c 100644
--- a/print/tgif2tex/Makefile
+++ b/print/tgif2tex/Makefile
@@ -31,7 +31,6 @@ DOCSRC=		how-to-use.aux how-to-use.dvi \
 do-build:
 	${REINPLACE_CMD} \
 		-e "s,%%LOCALBASE%%,${LOCALBASE}," \
-		-e "s,%%X11BASE%%,${X11BASE}," \
 		${WRKSRC}/tgif2tex
 
 do-install:
diff --git a/print/tgif2tex/files/patch-tgif2tex b/print/tgif2tex/files/patch-tgif2tex
index b9aee146d01d..3b24e1af4fd2 100644
--- a/print/tgif2tex/files/patch-tgif2tex
+++ b/print/tgif2tex/files/patch-tgif2tex
@@ -10,11 +10,11 @@
 -$pnm_command='/usr/bin/gs -sDEVICE=pnmraw -sOutputFile=- -sNOPAUSE -dBATCH -q -r400';
 -$convert_command='/usr/bin/pnmcrop | /usr/bin/pnmmargin -white 10 | /usr/bin/convert - ';
 +$LOCALBASE='%%LOCALBASE%%';
-+$X11BASE='%%X11BASE%%';
++$LOCALBASE='%%LOCALBASE%%';
 +
 +$latex_command="${LOCALBASE}/bin/platex";	# latex command in your site.
 +$dvips_command="${LOCALBASE}/bin/dvips";
-+$tgif_command="${X11BASE}/bin/tgif";
++$tgif_command="${LOCALBASE}/bin/tgif";
 +$pnm_command="${LOCALBASE}/bin/gs -sDEVICE=pnmraw -sOutputFile=- -sNOPAUSE -dBATCH -q -r400";
 +$convert_command="${LOCALBASE}/bin/pnmcrop | ${LOCALBASE}/bin/pnmmargin -white 10 | ${LOCALBASE}/bin/convert - ";
  
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 0aa689228887..cd310beaa432 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_GHOSTSCRIPT_RUN=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
 
 MAKE_ARGS+=	INSTALLFLAGS="${COPY}" \
diff --git a/print/wmlpq/files/patch-Makefile b/print/wmlpq/files/patch-Makefile
index d3d25d19a2ba..d7c64c46a449 100644
--- a/print/wmlpq/files/patch-Makefile
+++ b/print/wmlpq/files/patch-Makefile
@@ -3,11 +3,11 @@
 @@ -1,13 +1,11 @@
 -prefix=
 -CPPFLAGS = -I/usr/X11R6/include -I/usr/local/include
-+CPPFLAGS = -I$(X11BASE)/include -I/usr/local/include
++CPPFLAGS = -I$(LOCALBASE)/include -I/usr/local/include
  LIBS = -lXpm -lX11 -ldockapp  
 -LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib
 -CFLAGS = -O2 -Wall
-+LDFLAGS = -L$(X11BASE)/lib -L/usr/local/lib
++LDFLAGS = -L$(LOCALBASE)/lib -L/usr/local/lib
 +CFLAGS += -Wall
  DFLAGS = -ggdb3 -Wall