Chase more moves to LOCALBASE.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6718 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 11 insertions, 12 deletions

diff --git a/java/jdk15/files/pkg-deinstall.in b/java/jdk15/files/pkg-deinstall.in
index fcd4dfdab..e290f2a08 100644
--- a/java/jdk15/files/pkg-deinstall.in
+++ b/java/jdk15/files/pkg-deinstall.in
@@ -12,7 +12,7 @@ fi
 # Remove the plugin
 
 # Plugin location variables
-BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns7"
 PLUGIN=libjavaplugin_oji.so
 
diff --git a/java/jdk15/files/pkg-install.in b/java/jdk15/files/pkg-install.in
index a2ee8dc8e..6f5fa178b 100644
--- a/java/jdk15/files/pkg-install.in
+++ b/java/jdk15/files/pkg-install.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	fi
 
 	# Install the plugin
-	BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+	BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 	JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns7"
 	PLUGIN=libjavaplugin_oji.so
 
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index de581fa7d..256210976 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Koop Mast <kwm@rainbow-runner.nl>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/multimedia/gstreamer-ffmpeg80/Makefile,v 1.8 2006/07/20 13:48:13 ahze Exp $
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.7
@@ -44,7 +44,7 @@ post-patch:
 
 post-install:
 # register plugins
-	-@${X11BASE}/bin/gst-register-${GST80_VERSION} \
+	-@${LOCALBASE}/bin/gst-register-${GST80_VERSION} \
 		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST80_VERSION}/registry.xml 2>/dev/null
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-pitfdll/Makefile b/multimedia/gstreamer-pitfdll/Makefile
index 7e71d8832..1971a57f8 100644
--- a/multimedia/gstreamer-pitfdll/Makefile
+++ b/multimedia/gstreamer-pitfdll/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/multimedia/gstreamer-pitfdll/Makefile,v 1.6 2006/07/17 05:18:12 ahze Exp $
 
 PORTNAME=	gstreamer-pitfdll
 PORTVERSION=	0.8.2
@@ -35,7 +35,7 @@ post-patch:
 
 post-install:
 # register plugins
-	-@${X11BASE}/bin/gst-register-${GST_VERSION} \
+	-@${LOCALBASE}/bin/gst-register-${GST_VERSION} \
 		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
 
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer-pitfdll/pkg-plist b/multimedia/gstreamer-pitfdll/pkg-plist
index ad0f269ad..3348748a0 100644
--- a/multimedia/gstreamer-pitfdll/pkg-plist
+++ b/multimedia/gstreamer-pitfdll/pkg-plist
@@ -1,4 +1,4 @@
 lib/gstreamer-%%VERSION%%/libpitfdll.la
 lib/gstreamer-%%VERSION%%/libpitfdll.so
-@exec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %%X11BASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@exec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/gst-register-0.8 --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/x11-themes/gtk-qnxtheme/Makefile b/x11-themes/gtk-qnxtheme/Makefile
index 18ea59590..79c7ff867 100644
--- a/x11-themes/gtk-qnxtheme/Makefile
+++ b/x11-themes/gtk-qnxtheme/Makefile
@@ -39,17 +39,17 @@ do-install:
 	@${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk/gtkrc
 	@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk/gtkrc
 	@${RM} -f ${WRKSRC}/gtk/gtkrc.bak
-	@${MKDIR} ${X11BASE}/share/themes/qnxtheme/gtk
+	@${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk
 	@for i in ${WRKSRC}/gtk/*; do \
 		${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk; \
 	done
 .if defined(WITH_GTK2)
-	@${REINPLACE_CMD} -e 's@/usr@${X11BASE}@g' ${WRKSRC}/gtk-2.0/gtkrc
+	@${REINPLACE_CMD} -e 's@/usr@${LOCALBASE}@g' ${WRKSRC}/gtk-2.0/gtkrc
 	@${REINPLACE_CMD} -e 's@QNX@qnxtheme@g' ${WRKSRC}/gtk-2.0/gtkrc
 	@${RM} -f ${WRKSRC}/gtk-2.0/gtkrc.bak
 	@${MKDIR} ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0
 	@for i in ${WRKSRC}/gtk-2.0/*; do \
-		 ${INSTALL_DATA} $$i ${X11BASE}/share/themes/qnxtheme/gtk-2.0; \
+		 ${INSTALL_DATA} $$i ${LOCALBASE}/share/themes/qnxtheme/gtk-2.0; \
 	done
 .endif
 
diff --git a/x11-themes/gtk-qt-engine/pkg-plist b/x11-themes/gtk-qt-engine/pkg-plist
index e29df42b7..63ada5562 100644
--- a/x11-themes/gtk-qt-engine/pkg-plist
+++ b/x11-themes/gtk-qt-engine/pkg-plist
@@ -9,7 +9,6 @@ lib/kde3/kcm_kcmgtk.la
 lib/kde3/kcm_kcmgtk.so
 share/applnk/Settings/LookNFeel/kcmgtk.desktop
 share/applications/kde/kcmgtk-xdg.desktop
-@cwd %%X11BASE%%
 @dirrm share/themes/Qt/gtk-2.0
 @dirrm share/themes/Qt
 @dirrm share/gtk-qt-engine