18 files changed, 47 insertions, 54 deletions

diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 546a87409093..784ad9fb1cd2 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -28,11 +28,11 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 # note: gtk-/icon-/metacity- are brought in by gnome-
-RUN_DEPENDS=	${X11BASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \
 		${LOCALBASE}/share/themes/Bluecurve/index.theme:${PORTSDIR}/x11-themes/gnome-bluecurve-theme \
 		${LINUXBASE}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/linux-gtk-bluecurve-theme \
-		${X11BASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \
-		${X11BASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme
+		${LOCALBASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \
+		${LOCALBASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index 705bbfc40bd5..4736aa23f63f 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	clearlooks-metacity
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.stellingwerff.com/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,6 @@ CONFLICTS=	gnome-themes-2.11.9[1-9]* gnome-themes-2.*
 
 WRKSRC=		${WRKDIR}/Clearlooks/metacity-1/
 USE_GNOME=	metacity gnomeprefix
-USE_X_PREFIX=	yes
 DATADIR=	share/themes/Clearlooks/metacity-1
 NO_BUILD=	yes
 
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index a67f4e8d5866..31a2de5ce1fa 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -10,9 +10,7 @@ PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
 PORTREVISION=	6
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	clearlooks
-DISTNAME=	clearlooks-${PORTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	GTK+ 2.x engine based on Bluecurve
@@ -22,8 +20,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(PORTNAME) && ${PORTNAME} == "clearlooks"
 OPTIONS+=	ANIMATION "Enable experimental animated progressbars" Off \
diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile
index d0c0bd50225e..88d14ae97e0f 100644
--- a/x11-themes/cursor-bluecurve-theme/Makefile
+++ b/x11-themes/cursor-bluecurve-theme/Makefile
@@ -18,8 +18,6 @@ BROKEN=		Incorrect pkg-plist and unfetchable
 DEPRECATED=		"${BROKEN}"
 EXPIRATION_DATE=	2007-11-02
 
-PREFIX=		${X11BASE}
-
 THEMES=		Bluecurve Bluecurve-inverse LBluecurve LBluecurve-inverse
 
 .for t in ${THEMES}
@@ -45,7 +43,7 @@ do-build:
 .include "${MASTERDIR}/bsd.bluecurve.mk"
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# needed by cursorthemegen
-RUN_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# for the lib/X11/icons directory
+BUILD_DEPENDS+=	xcursorgen:${PORTSDIR}/x11/xcursorgen	# needed by cursorthemegen
+RUN_DEPENDS+=	xcursorgen:${PORTSDIR}/x11/xcursorgen	# for the lib/X11/icons directory
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
index 7c797cdeb52a..87a607bbcf9f 100644
--- a/x11-themes/emerald-themes/Makefile
+++ b/x11-themes/emerald-themes/Makefile
@@ -20,8 +20,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-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"
 
 post-patch:
 	@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
diff --git a/x11-themes/enlightenment-theme-BlueSteel/Makefile b/x11-themes/enlightenment-theme-BlueSteel/Makefile
index d33a89617701..ca47500a1991 100644
--- a/x11-themes/enlightenment-theme-BlueSteel/Makefile
+++ b/x11-themes/enlightenment-theme-BlueSteel/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-BlueSteel
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
index 53cb60938967..0f4b6878d3fc 100644
--- a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
+++ b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-BrushedMetal-Tigert
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	e16-theme-BrushedMetal-Tigert-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-Ganymede/Makefile b/x11-themes/enlightenment-theme-Ganymede/Makefile
index 6fd373832d31..8295bd2b4358 100644
--- a/x11-themes/enlightenment-theme-Ganymede/Makefile
+++ b/x11-themes/enlightenment-theme-Ganymede/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-Ganymede
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-ShinyMetal/Makefile b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
index 21b493a9ad45..139eaff33ef8 100644
--- a/x11-themes/enlightenment-theme-ShinyMetal/Makefile
+++ b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-ShinyMetal
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index f694f8db9276..f1332d668506 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Theme engine for gtk+ toolkits
 
-USE_XLIB=	yes
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 
diff --git a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
index af33131c265a..74b111eb1b9b 100644
--- a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
+++ b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
@@ -8,7 +8,7 @@ GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 GTK_LIBS = `$(GTK_CONFIG) --libs`
 LN_S = ln -s
 INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-XLIBDIR=$(X11BASE)/lib
+XLIBDIR=$(LOCALBASE)/lib
 LOCALLIBDIR=$(LOCALBASE)/lib
 enginedir = $(XLIBDIR)/gtk/themes/engines
 engine_LTLIBRARIES = libindustrial.la
diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile
index e3b53d3c583c..a1d302ce72e7 100644
--- a/x11-themes/phase/Makefile
+++ b/x11-themes/phase/Makefile
@@ -20,7 +20,7 @@ USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
 .include <bsd.port.mk>
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 900eff4f4446..4910f8a1c404 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	polymer
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://static.int.pl/~mig21/dev/releases/polymer/ \
 		${MASTER_SITE_LOCAL}
@@ -18,11 +18,10 @@ COMMENT=	Qt port of Plastik KDE theme
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoheader:261
 USE_QT_VER=	3
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 5736888d3f27..39a2c43edb06 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -18,7 +18,7 @@ USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
 .include <bsd.port.mk>
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 946b1f2016cc..a24a3101e874 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qt-bluecurve-theme
-
+PORTREVISION=	1
 COMMENT=	The Bluecurve QT theme
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
@@ -14,16 +14,15 @@ MASTERDIR=	${.CURDIR}/../bluecurve-themes
 USE_QT_VER=	3
 BUILD_WRKSRC=	${WRKSRC}/art/qt/Bluecurve
 
-QT_CFLAGS=	-I${X11BASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
-QT_LIBS=	-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
-USE_X_PREFIX=	yes
+QT_CFLAGS=	-I${LOCALBASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
+QT_LIBS=	-L${LOCALBASE}/lib -lqt-mt ${PTHREAD_LIBS}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GtkStyle|0|' ${BUILD_WRKSRC}/bluecurve.cpp
 	@${REINPLACE_CMD} -e \
-		's|^\(libraryPath\)=.*|\1=${X11BASE}/lib/plugins|' \
+		's|^\(libraryPath\)=.*|\1=${LOCALBASE}/lib/plugins|' \
 		${WRKSRC}/art/qt/qtrc
 
 do-build:
diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile
index 4d0618a155af..8d065296ec1d 100644
--- a/x11-themes/sapphire-themes/Makefile
+++ b/x11-themes/sapphire-themes/Makefile
@@ -25,17 +25,17 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 do-patch:
-	${REINPLACE_CMD} 's:~/\.:${X11BASE}/share/:g' \
+	${REINPLACE_CMD} 's:~/\.:${LOCALBASE}/share/:g' \
 		${WRKDIR}/menu/default \
 		${WRKDIR}/themes/*.theme
 	${REINPLACE_CMD} 's:-15-:-12-:g' ${WRKDIR}/themes/*.theme
 
 do-install:
-	${MKDIR} ${X11BASE}/share/sapphire/themes/backgrounds/
+	${MKDIR} ${LOCALBASE}/share/sapphire/themes/backgrounds/
 	${INSTALL_DATA} ${WRKDIR}/themes/backgrounds/* \
-		${X11BASE}/share/sapphire/themes/backgrounds/
+		${LOCALBASE}/share/sapphire/themes/backgrounds/
 	${INSTALL_DATA} ${WRKDIR}/themes/*.theme \
-		${X11BASE}/share/sapphire/themes/
-	${INSTALL_DATA} ${WRKDIR}/menu/default ${X11BASE}/share/sapphire/menu/
+		${LOCALBASE}/share/sapphire/themes/
+	${INSTALL_DATA} ${WRKDIR}/menu/default ${LOCALBASE}/share/sapphire/menu/
 
 .include <bsd.port.mk>
diff --git a/x11-themes/xmms-bluecurve-theme/Makefile b/x11-themes/xmms-bluecurve-theme/Makefile
index 00729e135917..b41976809bfd 100644
--- a/x11-themes/xmms-bluecurve-theme/Makefile
+++ b/x11-themes/xmms-bluecurve-theme/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	xmms-bluecurve-theme
+PORTREVISION=	1
 
 COMMENT=	The Bluecurve XMMS skin
 
@@ -14,9 +15,9 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
-NO_BUILD=	yes
+PREFIX=		${LOCALBASE}
 
-PREFIX=		${X11BASE}
+NO_BUILD=	yes
 
 SKIN=		Bluecurve-xmms.zip
 PLIST_FILES=	share/xmms/Skins/${SKIN}
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index 1f89d7c4e74e..c3f28679f20e 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -9,14 +9,14 @@ PORTNAME=	xmms-eq-skins
 PORTVERSION=	0.2
 PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	equ
 DISTNAME=	eq-xmms-skins-${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Additional skins for the XMMS EQ plugin
 
-RUN_DEPENDS=	${X11BASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq
+RUN_DEPENDS=	${LOCALBASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/EQskins