- 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)
author: Martin Wilke <miwi@FreeBSD.org> 2008-04-19 17:56:05 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2008-04-19 17:56:05 +0000
commit: 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
tree: d573ea09b2bf6be67cb497df199932da9e2707c4 /sysutils
parent: 40049f4af2200d0dcf33596508688623fc75f764 (diff)
download: ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz
ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip
101 files changed, 176 insertions, 210 deletions
diff --git a/sysutils/asapm/files/patch-Makefile.UNIX b/sysutils/asapm/files/patch-Makefile.UNIX
index f7c6d5ef1d83..f7c8e73ca510 100644
--- a/sysutils/asapm/files/patch-Makefile.UNIX
+++ b/sysutils/asapm/files/patch-Makefile.UNIX
@@ -10,12 +10,12 @@
  
  # The location and names of the X11 libraries
 -LDIR = -L/usr/X11R6/lib
-+LDIR = -L${X11BASE}/lib
++LDIR = -L${LOCALBASE}/lib
  LIBS = -lXpm -lX11
  
  # The include path to the X11 files
 -C_INCLUDE = -I. -I/usr/X11R6/include
-+C_INCLUDE = -I. -I${X11BASE}/include
++C_INCLUDE = -I. -I${LOCALBASE}/include
  
  #-----------------------------------------------------
  CC = gcc
diff --git a/sysutils/asapm/files/patch-configure b/sysutils/asapm/files/patch-configure
index a8c07269640e..249601e3cfd6 100644
--- a/sysutils/asapm/files/patch-configure
+++ b/sysutils/asapm/files/patch-configure
@@ -4,7 +4,7 @@
    # Look for the header file in a standard set of common directories.
  # Check X11 before X11Rn because it is often a symlink to the current release.
    for ac_dir in               \
-+    ${X11BASE}/include        \
++    ${LOCALBASE}/include        \
      /usr/X11/include          \
      /usr/X11R6/include        \
      /usr/X11R5/include        \
@@ -12,7 +12,7 @@
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-+    ${X11BASE}/lib        \
++    ${LOCALBASE}/lib        \
      /usr/X11/lib          \
      /usr/X11R6/lib        \
      /usr/X11R5/lib        \
@@ -20,7 +20,7 @@
    rm -rf conftest*
    # Look for the header file in a standard set of common directories.
    for ac_dir in               \
-+    ${X11BASE}/include        \
++    ${LOCALBASE}/include        \
      /usr/X11/include          \
      /usr/X11R6/include        \
      /usr/X11R5/include        \
@@ -28,7 +28,7 @@
  # First see if replacing the include by lib works.
  for ac_dir in \
      `echo "$vt_xpm_includes" | sed 's,include/X11,lib,;s,include,lib,'` \
-+    ${X11BASE}/lib        \
++    ${LOCALBASE}/lib        \
      /usr/X11/lib          \
      /usr/X11R6/lib        \
      /usr/X11R5/lib        \
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 915ee9fdbe30..f74d5ac4e887 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-xpm-includes=${X11BASE}/include --with-xpm-library=${X11BASE}/lib
+CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include --with-xpm-library=${LOCALBASE}/lib
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	EXTRA_LIBRARIES="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index e21a255d7902..74fde14e810d 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -17,8 +17,8 @@ COMMENT=	An AfterStep look-n-feel memory utilization monitor
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm \
-		--with-xpm-includes=${X11BASE}/include \
-		--with-xpm-library=${X11BASE}/lib
+		--with-xpm-includes=${LOCALBASE}/include \
+		--with-xpm-library=${LOCALBASE}/lib
 
 MAN1=		asmem.1
 PLIST_FILES=	bin/asmem
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index b70d644c03c0..188e277a8bf2 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -18,10 +18,10 @@ COMMENT=	A swallowable applet monitors the CPU usage, memory and swap, etc
 USE_XORG=	xpm x11
 
 BUILD_WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/asmon
-CFLAGS+=	-I${X11BASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 USE_GMAKE=	yes
 ALL_TARGET=	clean asmon
-MAKE_ARGS+=	LIBDIR="-L${X11BASE}/lib" \
+MAKE_ARGS+=	LIBDIR="-L${LOCALBASE}/lib" \
 		SOLARIS_LIBS=-lkvm
 
 PLIST_FILES=	bin/asmon
diff --git a/sysutils/asr-utils/Makefile b/sysutils/asr-utils/Makefile
index 59d122aa20f4..0e329a3ebefc 100644
--- a/sysutils/asr-utils/Makefile
+++ b/sysutils/asr-utils/Makefile
@@ -30,7 +30,7 @@ BINS+=		dptscom dptmgr
 .endif
 MAN8=		raidutil.8
 
-.if !defined(WITHOUT_X11) && !exists(${X11BASE}/lib/libXm.so.1)
+.if !defined(WITHOUT_X11) && !exists(${LOCALBASE}/lib/libXm.so.1)
 # we shall install our own libXm.so.1, enable it in pkg-plist
 PLIST_SUB+=	LIBXM=""
 .else
@@ -53,8 +53,8 @@ do-install:
 	cd ${WRKSRC} ; ${INSTALL_DATA} \
 	    dptcom.chk dptmgr.hlp dptmgr.ini dptmgr.rsc read.me \
 	    ${PREFIX}/dpt
-.if !exists(${X11BASE}/lib/libXm.so.1)
-	${INSTALL_SCRIPT} ${WRKSRC}/libXm.so.1 ${X11BASE}/lib
+.if !exists(${LOCALBASE}/lib/libXm.so.1)
+	${INSTALL_SCRIPT} ${WRKSRC}/libXm.so.1 ${LOCALBASE}/lib
 .endif
 .else
 NO_BUILD=	yes
diff --git a/sysutils/asr-utils/pkg-plist b/sysutils/asr-utils/pkg-plist
index e887de28d57f..49c1701fcbe4 100644
--- a/sysutils/asr-utils/pkg-plist
+++ b/sysutils/asr-utils/pkg-plist
@@ -17,5 +17,4 @@ dpt/dptcom
 dpt/dptcom.chk
 dpt/dptsig
 @dirrm dpt
-%%LIBXM%%@cwd %%X11BASE%%
 %%LIBXM%%lib/libXm.so.1
diff --git a/sysutils/battfink/Makefile b/sysutils/battfink/Makefile
index e224a2593e86..2ead91075491 100644
--- a/sysutils/battfink/Makefile
+++ b/sysutils/battfink/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	battfink
 PORTVERSION=	0.6.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An energy saving preferences app for GNOME
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui
 USE_GMAKE=	yes
diff --git a/sysutils/bbsmount/Makefile b/sysutils/bbsmount/Makefile
index 6b0c9357ac8d..7ece244454a5 100644
--- a/sysutils/bbsmount/Makefile
+++ b/sysutils/bbsmount/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	bbsmount
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://phoenix.inf.upol.cz/~jezberam/bbsmount/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical disk mounter for the Blackbox slit
 
-USE_X_PREFIX=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 ice xpm xi
 GNU_CONFIGURE=	yes
 USE_GCC=	2.95
 PORTDOCS=	README BUGS NEWS AUTHORS ChangeLog
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 7ed957c4523d..2cb43f623b89 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brasero
 PORTVERSION=	0.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,6 @@ USE_GETTEXT=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomehier nautiluscdburner
 USE_GSTREAMER=	gconf core
 INSTALLS_ICONS=	yes
diff --git a/sysutils/cog/Makefile b/sysutils/cog/Makefile
index 8aaa1337ea00..e8c49c5c3f8f 100644
--- a/sysutils/cog/Makefile
+++ b/sysutils/cog/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	cog
 PORTVERSION=	0.8.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.krakoa.dk/progs/cog/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program for editing advanced GNOME settings in an easy way
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GETTEXT=	yes
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 57355bb2719b..8c6eb34997a4 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -23,8 +23,8 @@ USE_ICONV=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-proc-uptime \
 			--disable-hddtemp
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 MAN1=		conky.1
 
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 57355bb2719b..8c6eb34997a4 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -23,8 +23,8 @@ USE_ICONV=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-proc-uptime \
 			--disable-hddtemp
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 MAN1=		conky.1
 
diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile
index 32908b1096c2..98ff0718e373 100644
--- a/sysutils/dtc/Makefile
+++ b/sysutils/dtc/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Cry
 		${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \
 		${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		${X11BASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
 		${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql50-server
 
 NO_BUILD=	yes
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 751d7117deb4..5ab19152bd43 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
@@ -18,7 +19,6 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gfslicer/Makefile b/sysutils/gfslicer/Makefile
index 74adec688e63..e307cde2b15d 100644
--- a/sysutils/gfslicer/Makefile
+++ b/sysutils/gfslicer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gfslicer
 PORTVERSION=	1.5.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
@@ -19,7 +19,6 @@ COMMENT=	A utility to split and join files
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_AUTOTOOLS=	automake:14:env
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/gkfreq/Makefile b/sysutils/gkfreq/Makefile
index 08dea43ee9c4..242c4e11cc64 100644
--- a/sysutils/gkfreq/Makefile
+++ b/sysutils/gkfreq/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.peakunix.net/downloads/
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	A plugin for gkrellm2 which displays the current CPU speed
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkfreq.so
diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile
index 6ed03b9276be..a62667a70ade 100644
--- a/sysutils/gkleds2/Makefile
+++ b/sysutils/gkleds2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkleds2
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://heim.ifi.uio.no/~oyvinha/files/files/
 DISTNAME=	gkleds-${PORTVERSION}
@@ -15,14 +15,15 @@ DISTNAME=	gkleds-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM Leds for CapsLock, NumLock and ScrollLock
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
+USE_XORG=	x11 xtst
 USE_GNOME=	gnometarget gtk20
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkleds.so
 
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index ccf699006226..e142178a93b5 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Gkrellm2 plugin which shows the system load as a flame
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/${PORTNAME}.so
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index a2decad1eaea..fedfd4c72061 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.amdmi3.ru/distfiles/ \
 MAINTAINER=	amdmi3@amdmi3.ru
 COMMENT=	A tiny system load meter for gkrellm
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/gkrellflynn.so
@@ -24,7 +24,7 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -c -fPIC"
 ALL_TARGET=	${PORTNAME}.so
 
 CFLAGS+=	`pkg-config --cflags gtk+-2.0 gthread-2.0` \
-		-I${LOCALBASE}/include -I${X11BASE}/include -DGKRELLM2
+		-I${LOCALBASE}/include -DGKRELLM2
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gkrellflynn.so \
diff --git a/sysutils/gkrellm-trayicons/Makefile b/sysutils/gkrellm-trayicons/Makefile
index 1250d373ad42..5b68e9a31d78 100644
--- a/sysutils/gkrellm-trayicons/Makefile
+++ b/sysutils/gkrellm-trayicons/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@fsck.ch
 COMMENT=	GKrellM2 plugin to display definable icons as notifiers or launchers
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/trayicons.so
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index e8e60c0e7cc5..fd0084ce8131 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gkrellm
 PORTVERSION=	2.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://members.dslextreme.com/users/billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -43,7 +43,7 @@ MAKE_ENV+=	enable_nls=0
 .else
 USE_GETTEXT=	yes
 .endif
-USE_XLIB=	yes
+USE_XORG=	x11 sm
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls-openssl.26:${PORTSDIR}/security/gnutls
 MAKE_ENV+=	GNUTLSINC=${LOCALBASE}/include GNUTLSLIB=${LOCALBASE}/lib \
@@ -77,8 +77,6 @@ MAN8=		gkrellmd.8
 PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 .endif
 
-MAN1PREFIX=	${X11BASE}
-
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	freebsd
@@ -86,15 +84,15 @@ ALL_TARGET=	freebsd
 INSTALL_TARGET=	install_freebsd
 .endif
 
-MAKE_ENV+=	CC="${CC}" INSTALLROOT=${X11BASE} INSTALLDIR=${X11BASE}/bin \
-		PKGCONFIGDIR=${X11BASE}/libdata/pkgconfig \
+MAKE_ENV+=	CC="${CC}" INSTALLROOT=${LOCALBASE} INSTALLDIR=${LOCALBASE}/bin \
+		PKGCONFIGDIR=${LOCALBASE}/libdata/pkgconfig \
 		SINSTALLROOT=${PREFIX} SINSTALLDIR=${PREFIX}/sbin \
 		SPKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
 		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \
 		VERSION=${PORTVERSION}
 
-CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \
-		-DSYSTEM_PLUGINS_DIR='\"${X11BASE}/libexec/gkrellm2/plugins\"' \
+CFLAGS+=	-DSYSTEM_THEMES_DIR='\"${LOCALBASE}/share/gkrellm2/themes\"' \
+		-DSYSTEM_PLUGINS_DIR='\"${LOCALBASE}/libexec/gkrellm2/plugins\"' \
 		-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \
 		-DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"'
 
@@ -113,11 +111,11 @@ post-patch:
 
 post-install:
 .if !defined(GKRELLM_SERVER_ONLY)
-	@${MKDIR} ${X11BASE}/libexec/gkrellm2/plugins
-	@${MKDIR} ${X11BASE}/share/gkrellm2/themes
+	@${MKDIR} ${LOCALBASE}/libexec/gkrellm2/plugins
+	@${MKDIR} ${LOCALBASE}/share/gkrellm2/themes
 	@${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1
 .if ${OSVERSION} < 500000
-	@${CHMOD} 2511 ${X11BASE}/bin/gkrellm
+	@${CHMOD} 2511 ${LOCALBASE}/bin/gkrellm
 .endif
 .endif
 .if ${OSVERSION} < 500000
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 430ca8c99061..a00beb4f0f37 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -9,7 +9,6 @@ sbin/gkrellmd
 %%EXAMPLESDIR%%/gkrellmd.conf
 @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf
 @dirrm %%EXAMPLESDIR%%
-@cwd %%X11BASE%%
 %%CLIENT%%include/gkrellm2/gkrellm.h
 %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
 %%CLIENT%%@dirrm include/gkrellm2
@@ -37,4 +36,3 @@ sbin/gkrellmd
 %%CLIENT%%@dirrmtry libexec/gkrellm2
 %%CLIENT%%@dirrmtry share/gkrellm2/themes
 %%CLIENT%%@dirrmtry share/gkrellm2
-@cwd %%PREFIX%%
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index 15057aa65a48..75aa45260bd0 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mouse odometer plugin for GKrellM
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 PLIST_FILES=	libexec/gkrellm/plugins/gkmouse.so
diff --git a/sysutils/gkrellmouse/files/patch-Makefile b/sysutils/gkrellmouse/files/patch-Makefile
index b4a6a9044733..c6dfe4991d4d 100644
--- a/sysutils/gkrellmouse/files/patch-Makefile
+++ b/sysutils/gkrellmouse/files/patch-Makefile
@@ -5,7 +5,7 @@
  
  # This should point to your gkrellm headers
 -GKRELLM_HDRS := /usr/include/gkrellm
-+GKRELLM_HDRS := ${X11BASE}/include/gkrellm
++GKRELLM_HDRS := ${LOCALBASE}/include/gkrellm
  
 -CC := gcc
 -GTKFLAGS := $(shell gtk-config --cflags)
diff --git a/sysutils/gkrellmwho/Makefile b/sysutils/gkrellmwho/Makefile
index a360bf1180ba..ef95075ea658 100644
--- a/sysutils/gkrellmwho/Makefile
+++ b/sysutils/gkrellmwho/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://mirror2.unixfreunde.de/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A plugin that scrolls in a panel a list of currently logged on users
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/sysutils/gkrellmwho/files/patch-Makefile b/sysutils/gkrellmwho/files/patch-Makefile
index 32171230bb7b..b3415c30c743 100644
--- a/sysutils/gkrellmwho/files/patch-Makefile
+++ b/sysutils/gkrellmwho/files/patch-Makefile
@@ -6,7 +6,7 @@ $FreeBSD$
 @@ -1,9 +1,9 @@
  # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include)
 -INCLUDE	= /usr/local/include
-+INCLUDE	= ${X11BASE}/include/gkrellm
++INCLUDE	= ${LOCALBASE}/include/gkrellm
  
 -CC	= gcc
 -CFLAGS	= -Wall -O2 -fPIC -I$(INCLUDE) 			\
diff --git a/sysutils/gkrelltop/Makefile b/sysutils/gkrelltop/Makefile
index 5008dc69c68e..473ff8fd6b1f 100644
--- a/sysutils/gkrelltop/Makefile
+++ b/sysutils/gkrelltop/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gkrellmd:${PORTSDIR}/sysutils/gkrellm2
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 USE_GMAKE=	yes
-MAKE_ARGS=	INSTALLDIR=${X11BASE}/libexec/gkrellm2/plugins \
+MAKE_ARGS=	INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \
 		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
 
 .if defined(GKRELLM_SERVER_ONLY)
diff --git a/sysutils/gkrelltop/pkg-plist b/sysutils/gkrelltop/pkg-plist
index 29b15244dabf..41d528c6b549 100644
--- a/sysutils/gkrelltop/pkg-plist
+++ b/sysutils/gkrelltop/pkg-plist
@@ -1,3 +1,2 @@
 libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
-%%CLIENT%%@cwd %%X11BASE%%
 %%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index c8363ba0e0ab..19308c720538 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -14,15 +14,13 @@ MASTER_SITES=	http://reality.exsgi.org/eile/misc/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gl base load monitor
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GL=		yes
+USE_GL=		glut
 MAKEFILE=	Makefile.FreeBSD
 MAKE_ARGS=	CC="${CC}" \
-		CFLAGS="${CFLAGS} -I${X11BASE}/include -DFreeBSD ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DFreeBSD ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		OBJS="get_load.o trackball.o glload.o texture.o screenShot.o"
 ALL_TARGET=	glload
 
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c601ba9b0b07..925482f924d0 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +23,6 @@ RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 00ef992ea785..9f86400a9f23 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	1.4.0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/1.4
@@ -19,7 +19,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME project
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomecanvas gnomevfs libcapplet
 USE_GETTEXT=	yes
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index ffeac354a351..aab138fb15be 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-mount
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -19,7 +20,6 @@ LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 		gnome-keyring:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome
 
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtk20
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index cb44b898c3ca..c0562dab1973 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-pkgview
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
@@ -17,7 +17,7 @@ COMMENT=	Displays the version of GNOME components installed
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui intlhack
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 1ecbaa4cb05d..3250e8ba5747 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-power-manager
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +24,6 @@ LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 075bf0e1cabe..ed3833b99201 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	gnome-schedule
 PORTVERSION=	0.9.0
 PORTREVISION=	5
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME GUI for configuring a users crontab
@@ -22,7 +21,6 @@ RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_GNOME=	gnomeprefix pygnome2
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 DATADIR=	${PREFIX}/share
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index ae1491c7d21a..cd9e8ca9eecb 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
@@ -23,7 +24,6 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 2182de4117a4..c74be0326bb6 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-system-tools
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +23,6 @@ USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
 USE_AUTOTOOLS=	libtool:15
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 4f2b92b07892..ab115c911e43 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-volume-manager
 PORTVERSION=	2.22.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -19,7 +19,6 @@ COMMENT=	Automatically mount removable media, and more
 LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 		notify.1:${PORTSDIR}/devel/libnotify
 
-USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
 USE_GMAKE=	yes
diff --git a/sysutils/graphicboot/Makefile b/sysutils/graphicboot/Makefile
index 1f769232c70d..b1356dbe5b4a 100644
--- a/sysutils/graphicboot/Makefile
+++ b/sysutils/graphicboot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	graphicboot
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
@@ -15,12 +15,13 @@ MAINTAINER=	sixxgate@hotmail.com
 COMMENT=	Provides graphical X Window startup to FreeBSD during 'rc'
 
 BUILD_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
-		xrdb:${X_CLIENTS_PORT}
+		xrdb:${PORTSDIR}/x11/xrdb \
+		xsetroot:${PORTSDIR}/x11/xsetroot
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 USE_BZIP2=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile
index 4ce1098624ee..3ee2a24a21c3 100644
--- a/sysutils/kcube/Makefile
+++ b/sysutils/kcube/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Another cpu load kicker applet for KDE
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
diff --git a/sysutils/kgtk/Makefile b/sysutils/kgtk/Makefile
index e4b332d854ca..903a6e0147bf 100644
--- a/sysutils/kgtk/Makefile
+++ b/sysutils/kgtk/Makefile
@@ -45,7 +45,7 @@ do-configure:
 		${CMAKE_PREFIX}/bin/cmake .. \
 		-DCMAKE_INSTALL_DIR=${PREFIX} \
 		-DQT_INCLUDE_DIR=${QT_PREFIX}/include \
-		-DCMAKE_CXX_FLAGS=-I${X11BASE}/include \
+		-DCMAKE_CXX_FLAGS=-I${LOCALBASE}/include \
 		-DCMAKE_EXE_LINKER_FLAGS=${PTHREAD_LIBS} \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX}
 
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 16ebcabd7500..812d9e057dd5 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		kkbswitch
 PORTVERSION=		1.4.3
 PORTREVISION=	3
 CATEGORIES=		sysutils kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	kkbswitch
+MASTER_SITES=		SF/kkbswitch
 
 MAINTAINER=		achilov-rn@askd.ru
 COMMENT=		Keyboard layout switcher and indicator for KDE 3.x
@@ -32,7 +31,7 @@ MAN1=			kkbswitch.1
 OPTIONS=		RU_UA_LAYOUT	"With additional RU_UA keyboard layout" off
 
 PLIST_SUB=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
+			LOCALBASE=${LOCALBASE} \
 			DOCSDIR=${DOCSDIR}
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/kkbswitch/pkg-plist b/sysutils/kkbswitch/pkg-plist
index 1c9bca5337ca..c8abaee5981a 100644
--- a/sysutils/kkbswitch/pkg-plist
+++ b/sysutils/kkbswitch/pkg-plist
@@ -17,9 +17,7 @@ share/locale/bg/LC_MESSAGES/kkbswitch.mo
 %%DOCSDIR%%/flag_style.png
 %%DOCSDIR%%/index.docbook
 %%DOCSDIR%%/index.cache.bz2
-@cwd %%X11BASE%%
 %%LAYOUT%%lib/X11/xkb/symbols/ru_ua
-@cwd %%PREFIX%%
 @dirrm share/apps/kkbswitch
 @dirrm %%DOCSDIR%%/common
 @dirrm %%DOCSDIR%%
diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile
index 161347aecf4c..1b1db2122633 100644
--- a/sysutils/ksynaptics/Makefile
+++ b/sysutils/ksynaptics/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e \
-		's|/usr/include/synaptics|${X11BASE}/include/synaptics|g' \
+		's|/usr/include/synaptics|${LOCALBASE}/include/synaptics|g' \
 		${WRKSRC}/ksynaptics/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 6d004cf60312..32d943385587 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -29,9 +29,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	-x-includes="${X11BASE}/include" \
-			-x-libraries="${X11BASE}/lib"
-
 .if defined(WITH_GTK)
 PKGNAMESUFFIX=	-gtk2
 USE_GNOME+=	gtk20 libgnomeui
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index d3f01c8f9125..db010d9ed194 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgksu
 PORTVERSION=	1.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.debian.org/~kov/gksu/old_stuff/libgksu1.2/
 DISTNAME=	${PORTNAME}1.2-${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}1.2-${PORTVERSION}
 MAINTAINER=	bsam@FreeBSD.org
 COMMENT=	Library providing su and sudo functionality
 
-RUN_DEPENDS=	xauth:${X_CLIENTS_PORT} \
+RUN_DEPENDS=	xauth:${PORTSDIR}/x11/xauth \
 		sudo:${PORTSDIR}/security/sudo
 
 USE_GNOME=	pkgconfig glib20
diff --git a/sysutils/libieee1284/Makefile b/sysutils/libieee1284/Makefile
index bb46934d95fa..1bf562732815 100644
--- a/sysutils/libieee1284/Makefile
+++ b/sysutils/libieee1284/Makefile
@@ -16,7 +16,7 @@ COMMENT=	IEEE1284 communications library
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386
 
 .if defined(WITH_PYTHON)
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 795c914a04f3..07b7463503a6 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS+=--program-prefix=''
diff --git a/sysutils/linux-acu/Makefile b/sysutils/linux-acu/Makefile
index 145114bf796e..54cd15c7f265 100644
--- a/sysutils/linux-acu/Makefile
+++ b/sysutils/linux-acu/Makefile
@@ -31,7 +31,7 @@ IGNORE=		may not be automatically fetched due to licensing\
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
 RESTRICTED=	"Redistribution not allowed"
 
diff --git a/sysutils/linux-procps/Makefile b/sysutils/linux-procps/Makefile
index dbcbc71ac1bd..3fd2c6451d9e 100644
--- a/sysutils/linux-procps/Makefile
+++ b/sysutils/linux-procps/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Linux psproc binaries
 USE_LINUX_RPM=	yes
 ONLY_FOR_ARCHS=	i386
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	bin sbin usr/bin
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
diff --git a/sysutils/memgrep/Makefile b/sysutils/memgrep/Makefile
index 2858095e74e0..42222949db79 100644
--- a/sysutils/memgrep/Makefile
+++ b/sysutils/memgrep/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	clement@FreeBSD.org
 COMMENT=	Utility to manipulate memory from running processes and core files
 
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/sysutils/mount.app/Makefile b/sysutils/mount.app/Makefile
index fe125813f6e9..aa7a768559c9 100644
--- a/sysutils/mount.app/Makefile
+++ b/sysutils/mount.app/Makefile
@@ -9,20 +9,19 @@ PORTNAME=	mountapp
 PORTVERSION=	3.0
 PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mountapp
+MASTER_SITES=   SF
 
 MAINTAINER=	nm@web.am
 COMMENT=	Windowmaker application, Resembles wmmount with extra functionality
 
-BUILD_DEPENDS+=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk12 glib12
 
 GNU_CONFIGURE=	yes
 
-LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 44840a44870c..9005e5a02982 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +23,6 @@ RUN_DEPENDS=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount \
 CONFIGURE_ARGS=	--enable-gnome-mount
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack \
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index 5f976861bb38..5cd9f3b12373 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-inotify
-CXXFLAGS+=	-I${X11BASE}/include -L${X11BASE}/lib
+CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 OPTIONS=	XINERAMA "Xinerama support" on
 
@@ -35,7 +35,7 @@ MAN1=		nitrogen.1
 CONFIGURE_ARGS+=--disable-xinerama
 .else
 CONFIGURE_ARGS+=--enable-xinerama
-LIB_DEPENDS+=	Xinerama:${PORTSDIR}/x11/libXinerama
+USE_XORG+=	xinerama
 .endif
 
 post-patch:
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index aa277be8b7cf..68b885127deb 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ntfsprogs
 PORTVERSION=	1.13.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	linux-ntfs
@@ -93,8 +93,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(DESTDIR)/sbin|$$(DESTDIR)/${PREFIX}/sbin|' \
 		${WRKSRC}/ntfsprogs/Makefile.in
 	@${REINPLACE_CMD} -e \
-		's|$$(libdir)/\(gnome-vfs-2.0/modules\)|${X11BASE}/lib/\1|; \
-		 s|$$(sysconfdir)/\(gnome-vfs-2.0/modules\)|${X11BASE}/etc/\1|' \
+		's|$$(libdir)/\(gnome-vfs-2.0/modules\)|${LOCALBASE}/lib/\1|; \
+		 s|$$(sysconfdir)/\(gnome-vfs-2.0/modules\)|${LOCALBASE}/etc/\1|' \
 		${WRKSRC}/libntfs/Makefile.in
 .if defined(WITH_UBLIO)
 	@${REINPLACE_CMD} -e 's|^libntfs_la_LIBADD =|& -lublio|' \
diff --git a/sysutils/ntfsprogs/pkg-plist b/sysutils/ntfsprogs/pkg-plist
index 59011dd01bf0..a0b23a937c2e 100644
--- a/sysutils/ntfsprogs/pkg-plist
+++ b/sysutils/ntfsprogs/pkg-plist
@@ -52,7 +52,6 @@ sbin/ntfslabel
 sbin/ntfsresize
 sbin/ntfsundelete
 @dirrm include/ntfs
-%%GNOMEVFS2%%@cwd %%X11BASE%%
 %%GNOMEVFS2%%etc/gnome-vfs-2.0/modules/libntfs.conf
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.a
 %%GNOMEVFS2%%lib/gnome-vfs-2.0/modules/libntfs-gnomevfs.la
diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile
index 82f60fb1d0c6..ab0b8733faae 100644
--- a/sysutils/nvtv/Makefile
+++ b/sysutils/nvtv/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	nvtv
 PORTVERSION=	0.4.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nv-tv-out
+MASTER_SITES=	SF/nv-tv-out
 DISTNAME=	nvtv-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -22,10 +21,10 @@ ONLY_FOR_ARCHS=	i386
 
 CONFIGURE_ENV=	CC="${CC} -I${PREFIX}/include"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
+USE_XORG=	x11 xxf86vm xmu
 
 MAN1=		nvtv.1x
 MAN8=		nvtvd.8
diff --git a/sysutils/pessulus/Makefile b/sysutils/pessulus/Makefile
index 29828f5c4c4c..d09e214efdde 100644
--- a/sysutils/pessulus/Makefile
+++ b/sysutils/pessulus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pessulus
 PORTVERSION=	2.16.4
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	 sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,7 +22,6 @@ USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
 WANT_GNOME=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile
index 01e91c9ecae2..6961bf7b7fda 100644
--- a/sysutils/scanbuttond/Makefile
+++ b/sysutils/scanbuttond/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 SUB_FILES+=	pkg-message
 
diff --git a/sysutils/serpentine/Makefile b/sysutils/serpentine/Makefile
index a915557b8ae0..35f4d6247fd7 100644
--- a/sysutils/serpentine/Makefile
+++ b/sysutils/serpentine/Makefile
@@ -30,7 +30,7 @@ OPTIONS=	MUINE "Cd-Burner Plugin for muine audio player (i386 only)" Off
 
 .include <bsd.port.pre.mk>
 
-.if (defined(WITH_MUINE) || exists(${X11BASE}/bin/muine)) && ${ARCH}=="i386"
+.if (defined(WITH_MUINE) || exists(${LOCALBASE}/bin/muine)) && ${ARCH}=="i386"
 BUILD_DEPENDS+=	muine:${PORTSDIR}/audio/muine
 RUN_DEPENDS+=	muine:${PORTSDIR}/audio/muine
 PLIST_SUB+=	MUINE=""
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 38194ec17d1f..20c72f2f609e 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -129,7 +129,7 @@ QMON=		noqmon
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
@@ -137,7 +137,7 @@ post-patch:
 	    -e "s|%%CXX%%|${CXX}|g" \
 	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
 	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \
@@ -156,7 +156,7 @@ post-patch:
 	    ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|"
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
-	    -e 's|%%X11BASE%%|${X11BASE}|g' \
+	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' < \
diff --git a/sysutils/sge60/files/aimk.private b/sysutils/sge60/files/aimk.private
index 7257c0d00c4c..f883b4c4dbbc 100644
--- a/sysutils/sge60/files/aimk.private
+++ b/sysutils/sge60/files/aimk.private
@@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%%
 set BERKELEYDB_HOME = %%LOCALBASE%%
 set BDB_INCLUDE_SUBDIR = db42
 set BDB_LIB_SUFFIX = -4.2
-set X11BASE = %%X11BASE%%
+set LOCALBASE = %%LOCALBASE%%
diff --git a/sysutils/sge60/files/patch-aimk b/sysutils/sge60/files/patch-aimk
index 5fad14fbc275..83a4c1990e21 100644
--- a/sysutils/sge60/files/patch-aimk
+++ b/sysutils/sge60/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
@@ -33,10 +33,10 @@ $FreeBSD$
     
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
-+   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
++   set XINCD    = "$XMTINCD $XINCD -I${LOCALBASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib"
-+   set XLIBD    = "-L${X11BASE}/lib"
++   set XLIBD    = "-L${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
diff --git a/sysutils/sge60/files/patch-dist_util_arch__variables b/sysutils/sge60/files/patch-dist_util_arch__variables
index 7a75f9d6d92d..f990992e69ea 100644
--- a/sysutils/sge60/files/patch-dist_util_arch__variables
+++ b/sysutils/sge60/files/patch-dist_util_arch__variables
@@ -11,7 +11,7 @@ $FreeBSD$
 +   RC_PREFIX=%%LOCALBASE%%/etc/rc.d
     RC_SUFFIX=.sh
 -   XTERM=/usr/X11R6/bin/xterm
-+   XTERM=%%X11BASE%%/bin/xterm
++   XTERM=%%LOCALBASE%%/bin/xterm
     MAILER=/usr/bin/mail
     QLOGIN_COMMAND=telnet
     QLOGIN_DAEMON=/usr/libexec/telnetd
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 24dae6100d21..185904bef690 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -135,7 +135,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
@@ -143,7 +143,7 @@ post-patch:
 	    -e "s|%%CXX%%|${CXX}|g" \
 	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
 	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \
@@ -163,7 +163,7 @@ post-patch:
 	    ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|"
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
-	    -e 's|%%X11BASE%%|${X11BASE}|g' \
+	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
diff --git a/sysutils/sge61/files/aimk.private b/sysutils/sge61/files/aimk.private
index 7257c0d00c4c..f883b4c4dbbc 100644
--- a/sysutils/sge61/files/aimk.private
+++ b/sysutils/sge61/files/aimk.private
@@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%%
 set BERKELEYDB_HOME = %%LOCALBASE%%
 set BDB_INCLUDE_SUBDIR = db42
 set BDB_LIB_SUFFIX = -4.2
-set X11BASE = %%X11BASE%%
+set LOCALBASE = %%LOCALBASE%%
diff --git a/sysutils/sge61/files/patch-aimk b/sysutils/sge61/files/patch-aimk
index 3a2704432295..c16574e2e682 100644
--- a/sysutils/sge61/files/patch-aimk
+++ b/sysutils/sge61/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
@@ -33,10 +33,10 @@ $FreeBSD$
     
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
-+   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
++   set XINCD    = "$XMTINCD $XINCD -I${LOCALBASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib"
-+   set XLIBD    = "-L${X11BASE}/lib"
++   set XLIBD    = "-L${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
diff --git a/sysutils/sge61/files/patch-dist_util_arch__variables b/sysutils/sge61/files/patch-dist_util_arch__variables
index 7a75f9d6d92d..f990992e69ea 100644
--- a/sysutils/sge61/files/patch-dist_util_arch__variables
+++ b/sysutils/sge61/files/patch-dist_util_arch__variables
@@ -11,7 +11,7 @@ $FreeBSD$
 +   RC_PREFIX=%%LOCALBASE%%/etc/rc.d
     RC_SUFFIX=.sh
 -   XTERM=/usr/X11R6/bin/xterm
-+   XTERM=%%X11BASE%%/bin/xterm
++   XTERM=%%LOCALBASE%%/bin/xterm
     MAILER=/usr/bin/mail
     QLOGIN_COMMAND=telnet
     QLOGIN_DAEMON=/usr/libexec/telnetd
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 24dae6100d21..185904bef690 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -135,7 +135,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/dist/util/arch_variables \
 	    ${WRKSRC}/dist/pvm/src/aimk
@@ -143,7 +143,7 @@ post-patch:
 	    -e "s|%%CXX%%|${CXX}|g" \
 	    -e "s|%%CFLAGS%%|${CFLAGS}|g" \
 	    -e "s|%%CXXFLAGS%%|${CXXFLAGS}|g" \
-	    -e "s|%%X11BASE%%|${X11BASE}|g" \
+	    -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
 	@test -d ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH} || \
@@ -163,7 +163,7 @@ post-patch:
 	    ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|"
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
-	    -e 's|%%X11BASE%%|${X11BASE}|g' \
+	    -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    ${FILESDIR}/aimk.private > ${WRKSRC}/aimk.private
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	    -e 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g' \
diff --git a/sysutils/sge62/files/aimk.private b/sysutils/sge62/files/aimk.private
index 7257c0d00c4c..f883b4c4dbbc 100644
--- a/sysutils/sge62/files/aimk.private
+++ b/sysutils/sge62/files/aimk.private
@@ -3,4 +3,4 @@ set OPENSSL_HOME = %%OPENSSLBASE%%
 set BERKELEYDB_HOME = %%LOCALBASE%%
 set BDB_INCLUDE_SUBDIR = db42
 set BDB_LIB_SUFFIX = -4.2
-set X11BASE = %%X11BASE%%
+set LOCALBASE = %%LOCALBASE%%
diff --git a/sysutils/sge62/files/patch-aimk b/sysutils/sge62/files/patch-aimk
index 3a2704432295..c16574e2e682 100644
--- a/sysutils/sge62/files/patch-aimk
+++ b/sysutils/sge62/files/patch-aimk
@@ -24,7 +24,7 @@ $FreeBSD$
     set DEPEND_FLAGS = "$CFLAGS $XMTINCD"
     set PTHRDSFLAGS = "-D_REENTRANT -D__USE_REENTRANT"
 -   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I/usr/X11R6/include"
-+   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
++   set CFLAGS   = "$OFLAG -Wall -DFREEBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${LOCALBASE}/include"
     set NOERR_CFLAG = "-Wno-error"
     set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
     set LIBS     = "$LIBS -lkvm"
@@ -33,10 +33,10 @@ $FreeBSD$
     
     set XMTDEF   = ""
 -   set XINCD    = "$XMTINCD $XINCD -I/usr/X11/include"
-+   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
++   set XINCD    = "$XMTINCD $XINCD -I${LOCALBASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib"
-+   set XLIBD    = "-L${X11BASE}/lib"
++   set XLIBD    = "-L${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
diff --git a/sysutils/sge62/files/patch-dist_util_arch__variables b/sysutils/sge62/files/patch-dist_util_arch__variables
index 7a75f9d6d92d..f990992e69ea 100644
--- a/sysutils/sge62/files/patch-dist_util_arch__variables
+++ b/sysutils/sge62/files/patch-dist_util_arch__variables
@@ -11,7 +11,7 @@ $FreeBSD$
 +   RC_PREFIX=%%LOCALBASE%%/etc/rc.d
     RC_SUFFIX=.sh
 -   XTERM=/usr/X11R6/bin/xterm
-+   XTERM=%%X11BASE%%/bin/xterm
++   XTERM=%%LOCALBASE%%/bin/xterm
     MAILER=/usr/bin/mail
     QLOGIN_COMMAND=telnet
     QLOGIN_DAEMON=/usr/libexec/telnetd
diff --git a/sysutils/thefish/Makefile b/sysutils/thefish/Makefile
index ecf3e2566964..303ec88ac7fc 100644
--- a/sysutils/thefish/Makefile
+++ b/sysutils/thefish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	thefish
 PORTVERSION=	0.6.6
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,8 +16,7 @@ MAINTAINER=	mmendez@energyhq.be
 COMMENT=	Qt/Gtk+/ncurses rc.conf editor/management tool
 
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}" \
-		X11BASE="${X11BASE}"
+		LOCALBASE="${LOCALBASE}"
 
 WANT_GNOME=	yes
 
@@ -46,7 +46,7 @@ MAKE_ENV+=	WITH_GTK=yes
 .if defined(WITH_QT)
 USE_QT_VER=	3
 MAKE_ENV+=	WITH_QT=yes
-CXXFLAGS+=	-Wall -DWITH_QT -I${X11BASE}/include
+CXXFLAGS+=	-Wall -DWITH_QT -I${LOCALBASE}/include
 .endif
 
 MAN1=		thefish.1
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 346f3953844c..0b3b12aea298 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -9,15 +9,14 @@ PORTNAME=	torsmo
 PORTVERSION=	0.18
 PORTREVISION=	7
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	System monitor that renders text on desktop
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 MAN1=		torsmo.1
 
 PLIST_FILES=	bin/torsmo \
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
index 3d952cf1dfc0..06724249b713 100644
--- a/sysutils/usbhotkey/Makefile
+++ b/sysutils/usbhotkey/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		usbhotkey
 PORTVERSION=		0.3.1
 CATEGORIES=		sysutils
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	usbhotkey
+MASTER_SITES=		SF/usbhotkey
 
 MAINTAINER=		ntarmos@ceid.upatras.gr
 COMMENT=		A utility to remap USB keyboards under X11
@@ -22,8 +21,8 @@ OPTIONS=		GUI "Enable GUI bits (Imlib dependency)" on
 USE_RUBY=		yes
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/wmapm/files/patch-aa b/sysutils/wmapm/files/patch-aa
index acc9fc664756..9ca14636b895 100644
--- a/sysutils/wmapm/files/patch-aa
+++ b/sysutils/wmapm/files/patch-aa
@@ -8,9 +8,9 @@
 -LIBDIR = -L/usr/X11R6/lib
 +CC     ?= gcc
 +CFLAGS ?= -O2 -Wall
-+INCDIR = -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include
 +DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  LIBS   = -lXpm -lX11 -lXext
  OBJS   = wmapm.o \
           ../wmgeneral/wmgeneral.o
diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile
index 3dafd88890e5..d90e1d2e4e82 100644
--- a/sysutils/wmavgload/Makefile
+++ b/sysutils/wmavgload/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another WindowMaker load gauge
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 ALL_TARGET=	wmavgload
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index 7a35a2ac343f..515082319fbd 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmbattery
 PORTVERSION=	1.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.kitenet.net/programs/wmbattery/old/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -19,9 +19,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib \
-		--x-includes=${X11BASE}/include
-
 MAN1=		wmbattery.1
 
 post-install:
diff --git a/sysutils/wmbluecpu/files/patch-Makefile b/sysutils/wmbluecpu/files/patch-Makefile
index 45ed7642a741..ac3dd82bf482 100644
--- a/sysutils/wmbluecpu/files/patch-Makefile
+++ b/sysutils/wmbluecpu/files/patch-Makefile
@@ -3,8 +3,8 @@
 @@ -1,43 +1,23 @@
 -#Makefile
 +CC ?=	cc
-+LDIR =	-L${X11BASE}/lib
-+IDIR =	-I${X11BASE}/include
++LDIR =	-L${LOCALBASE}/lib
++IDIR =	-I${LOCALBASE}/include
  
 -PREFIX=/usr/local
 -BINDIR=$(PREFIX)/bin
diff --git a/sysutils/wmbsdbatt/files/patch-Makefile b/sysutils/wmbsdbatt/files/patch-Makefile
index c7a49d98040b..e079b3615c60 100644
--- a/sysutils/wmbsdbatt/files/patch-Makefile
+++ b/sysutils/wmbsdbatt/files/patch-Makefile
@@ -11,8 +11,8 @@
  HEADER = dockapp.h
 -CFLAGS += -Wall -I/usr/local/include -I/usr/X11R6/include
 -LDFLAGS += -L/usr/local/lib -L/usr/X11R6/lib -lX11 -lXext -lXpm
-+CFLAGS += -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include
-+LDFLAGS += -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lX11 -lXext -lXpm
++CFLAGS += -Wall -I$(LOCALBASE)/include
++LDFLAGS += -L$(LOCALBASE)/lib -lX11 -lXext -lXpm
  
  all: ${PROGRAM}
  
diff --git a/sysutils/wmcube/files/patch-Makefile.FREEBSD b/sysutils/wmcube/files/patch-Makefile.FREEBSD
index 1fea419acbba..c4e290691ce5 100644
--- a/sysutils/wmcube/files/patch-Makefile.FREEBSD
+++ b/sysutils/wmcube/files/patch-Makefile.FREEBSD
@@ -7,8 +7,8 @@
 -LIBDIR = -L/usr/X11R6/lib
 -LIBDIR = -L/usr/X11R6/lib
 -INCDIR = -I/usr/X11R6/include
-+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
-+INCDIR = -I${X11BASE}/include
++LIBDIR = -L${LOCALBASE}/lib -L${LOCALBASE}/lib
++INCDIR = -I${LOCALBASE}/include
  
  # Edit OSLIBS as appropriate to include OS specific libraries.
  
diff --git a/sysutils/wmdiskmon/Makefile b/sysutils/wmdiskmon/Makefile
index fda10d87a0e0..03bfc9ca390f 100644
--- a/sysutils/wmdiskmon/Makefile
+++ b/sysutils/wmdiskmon/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	wmdiskmon
 PORTVERSION=	0.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk usage monitor dockapp
 
-USE_XPM=	x11 xpm
+USE_XORG=	x11 xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=""
 
diff --git a/sysutils/wmflame/files/patch-Makefile b/sysutils/wmflame/files/patch-Makefile
index a90360bbda0d..18c4e70057df 100644
--- a/sysutils/wmflame/files/patch-Makefile
+++ b/sysutils/wmflame/files/patch-Makefile
@@ -9,8 +9,8 @@ $FreeBSD$
 -OBJS	=	wmflame.o ../wmgeneral/wmgeneral.o 
 +CC ?= gcc
 +CFLAGS += -c -Wall
-+INCDIR = -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
 +LIBS   = -lXpm -lXext -lX11
 +OBJS =  wmflame.o ../wmgeneral/wmgeneral.o
  
diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index b8d68dc609fa..83146816cf70 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 MAN1=		wmfsm.1
 PLIST_FILES=	bin/wmfsm
 
-CPPFLAGS=	-I${X11BASE}/include
-LDFLAGS=	-L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index dea47bc7054c..ea043cc43f67 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -26,8 +26,8 @@ ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"requires speaker(4)"
 ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 
-CONFIGURE_ARGS+=--with-xpm-includes=${X11BASE}/include \
-		--with-xpm-library=${X11BASE}/lib
+CONFIGURE_ARGS+=--with-xpm-includes=${LOCALBASE}/include \
+		--with-xpm-library=${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/wminet/files/patch-aa b/sysutils/wminet/files/patch-aa
index fb302a6487b0..3f822290043c 100644
--- a/sysutils/wminet/files/patch-aa
+++ b/sysutils/wminet/files/patch-aa
@@ -4,9 +4,9 @@
 -LIBDIR = -L/usr/X11R6/lib
 -LIBS   = -lXpm -lXext -lX11
 -FLAGS = -O2
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
 +LIBS   = -lXpm -lXext -lX11 -lkvm
-+CFLAGS += -I${X11BASE}/include
++CFLAGS += -I${LOCALBASE}/include
 +CFLAGS += -DDEFAULT_WMINETRC="\"${PREFIX}/etc/wminetrc\""
  OBJS =	wminet.o \
  		../wmgeneral/wmgeneral.o \
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index d596f086a81d..a108368a9a5a 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -19,8 +19,8 @@ ONLY_FOR_ARCHS=	i386
 USE_XORG=	xpm
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-xpm-includes=${X11BASE}/include \
-		--with-xpm-libraries=${X11BASE}/lib
+CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include \
+		--with-xpm-libraries=${LOCALBASE}/lib
 MAN8=		wmlmmon.8
 MANCOMPRESSED=	yes
 PLIST_FILES=	bin/wmlmmon
diff --git a/sysutils/wmmemfree/Makefile b/sysutils/wmmemfree/Makefile
index d4d4b2bef224..83073c8bb9a4 100644
--- a/sysutils/wmmemfree/Makefile
+++ b/sysutils/wmmemfree/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmemfree
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Memory and swap monitoring dockapp
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_XORG=	xpm
 
 MAN1=		${PORTNAME}.1
diff --git a/sysutils/wmmemfree/files/patch-Makefile b/sysutils/wmmemfree/files/patch-Makefile
index 4587a4b54ed8..ef220cc50a7b 100644
--- a/sysutils/wmmemfree/files/patch-Makefile
+++ b/sysutils/wmmemfree/files/patch-Makefile
@@ -3,8 +3,8 @@
 @@ -1,38 +1,17 @@
 -#Makefile
 +CC ?=	cc
-+LDIR =	-L${X11BASE}/lib
-+IDIR =	-I${X11BASE}/include
++LDIR =	-L${LOCALBASE}/lib
++IDIR =	-I${LOCALBASE}/include
  
 -PROG=wmmemfree
 -OBJS=dockapp.o draw.o mem_linux.o options.o wmmemfree.o
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index fef9d9ada9f1..6996c1e69715 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The freespace for Window Maker
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 post-patch:
diff --git a/sysutils/wmpccard/files/patch-Makefile b/sysutils/wmpccard/files/patch-Makefile
index 396d76c835aa..af5a4f0802be 100644
--- a/sysutils/wmpccard/files/patch-Makefile
+++ b/sysutils/wmpccard/files/patch-Makefile
@@ -13,8 +13,8 @@
  
 -X11INCLUDES = -I${PREFIX}/include
 -X11LDFLAGS = -L${PREFIX}/lib
-+X11INCLUDES = -I${X11BASE}/include
-+X11LDFLAGS = -L${X11BASE}/lib
++X11INCLUDES = -I${LOCALBASE}/include
++X11LDFLAGS = -L${LOCALBASE}/lib
  X11LIBS = -lXext -lX11 -lXpm
  
 -CC = cc
diff --git a/sysutils/wmzazof/files/patch-Makefile b/sysutils/wmzazof/files/patch-Makefile
index 0511212d52ce..3af74b4d8d11 100644
--- a/sysutils/wmzazof/files/patch-Makefile
+++ b/sysutils/wmzazof/files/patch-Makefile
@@ -6,8 +6,8 @@
 -INCDIR = -I/usr/X11R6/include/X11
 -DESTDIR= /usr/bin
 -LIBDIR = -L/usr/X11R6/lib
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
  LIBS   = -ldockapp -lX11 -lXext -lXpm
  OBJS   = wmzazof.o
  
diff --git a/sysutils/xacpim/files/patch-Makefile b/sysutils/xacpim/files/patch-Makefile
index 5b0c8f19ef09..cc019995d8d1 100644
--- a/sysutils/xacpim/files/patch-Makefile
+++ b/sysutils/xacpim/files/patch-Makefile
@@ -3,13 +3,13 @@
 @@ -1,10 +1,9 @@
 -CC	= gcc
 -CFLAGS	= -O2 -ansi -Wall -L/usr/X11R6/lib -I/usr/X11R6/include
-+CFLAGS	+= -L${X11BASE}/lib -I${X11BASE}/include
++CFLAGS	+= -L${LOCALBASE}/lib -I${LOCALBASE}/include
  
  OBJS	= main.o graphics.o sys.o osdep/freebsd.o
  
  all::	${OBJS}
 -	${CC} -o xacpim *.o -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include 
-+	${CC} -o xacpim *.o -lX11 -L${X11BASE}/lib -I${X11BASE}/include 
++	${CC} -o xacpim *.o -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include 
  
  install:: xacpim 
  	strip xacpim 
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index e598135d01cf..8df1825b3fa0 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Laptop battery status display for X11
 ONLY_FOR_ARCHS=	i386
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xbatt
 
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 2e4621041978..968a9e5249c9 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbattbar
 PORTVERSION=	1.4.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://iplab.aist-nara.ac.jp/member/suguru/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -16,7 +16,6 @@ MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	Simple battery meter
 
 USE_IMAKE=	yes
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xbattbar-${PORTVERSION}
 MAN1=		xbattbar.1
 PLIST_FILES=	bin/xbattbar
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 12c3d69d467d..f25cc9859cd1 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xfce4-utils
 PORTVERSION=	4.4.2
-PORTREVISION=	0
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfce-utils-${PORTVERSION}
@@ -38,12 +37,9 @@ PLIST_SUB+=	WITH_DBUS="@comment "
 .endif
 
 post-patch:
-.if ${X11BASE} != ${LOCALBASE}
-	@${REINPLACE_CMD} 's|/usr/local/share:|${X11BASE}/share:|' \
+	@${REINPLACE_CMD} 's|/usr/local/share:|${LOCALBASE}/share:|' \
 		${WRKSRC}/scripts/startxfce4.in
-.else
 	@${REINPLACE_CMD} 's|/usr/local/share:||' \
 		${WRKSRC}/scripts/startxfce4.in
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile
index 012d58856852..caa97c0cf776 100644
--- a/sysutils/xloadface/Makefile
+++ b/sysutils/xloadface/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 PATCH_STRIP=	-p1
 USE_IMAKE=	yes
-XLOADFACEDIR=	$(X11BASE)/lib/X11/xloadface
+XLOADFACEDIR=	$(LOCALBASE)/lib/X11/xloadface
 
 MAN1=		xloadface.1
 MANLANG=	ja
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 4d610a2cd306..019a310abf5a 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -8,15 +8,14 @@
 
 PORTNAME=	xosview
 PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A graphical performance meter
 
-USE_X_PREFIX=	yes
+USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 MAN1=		xosview.1
 
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 551e60ae13f2..77b31831b31b 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=		xvidcap
 DISTVERSION=		1.1.4p1
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		sysutils multimedia
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Capture your X display to individual frames or MPEG video
@@ -30,12 +29,12 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"	\
 			LDFLAGS="-L${LOCALBASE}/lib"	\
 			MAKE="${GMAKE}"
-CONFIGURE_ARGS=		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib	\
-			-with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
+CONFIGURE_ARGS=		-with-forced-embedded-ffmpeg	# To be removed after ffmpeg-devel's upgrade
 
 USE_GMAKE=		yes	# To be removed after ffmpeg-devel's upgrade
 USE_GNOME=		glib20 libglade2
 USE_GETTEXT=		yes
+USE_XORG=		x11 xmu
 INSTALLS_OMF=		yes
 
 .if !defined(CFLAGS) || ${CFLAGS:M-fno-strict-aliasing*} == ""
diff --git a/sysutils/xwlans/files/patch-Makefile b/sysutils/xwlans/files/patch-Makefile
index 5e2db76568a5..af7e86ea0de5 100644
--- a/sysutils/xwlans/files/patch-Makefile
+++ b/sysutils/xwlans/files/patch-Makefile
@@ -18,12 +18,12 @@
   clean::
   	rm *.o
 --- 1,14 ----
-! CFLAGS += -L${X11BASE}/lib -I${X11BASE}/include
+! CFLAGS += -L${LOCALBASE}/lib -I${LOCALBASE}/include
   
   OBJS	= main.o graphics.o sys.o osdep/freebsd.o
   
   all::	${OBJS}
-! 	${CC} -o xwlans *.o -lX11 -L${X11BASE}/lib -I${X11BASE}/include 
+! 	${CC} -o xwlans *.o -lX11 -L${LOCALBASE}/lib -I${LOCALBASE}/include 
   
   install:: xwlans 
   	strip xwlans
author	Martin Wilke <miwi@FreeBSD.org>	2008-04-19 17:56:05 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2008-04-19 17:56:05 +0000
commit	3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
tree	d573ea09b2bf6be67cb497df199932da9e2707c4 /sysutils
parent	40049f4af2200d0dcf33596508688623fc75f764 (diff)
download	ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip