Fix inappropriate uses of ${LOCALBASE} or ${X11PREFIX} instead of

${PREFIX}.

7 files changed, 30 insertions, 29 deletions

diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile
index 6320806642b..b1d8087ec7b 100644
--- a/x11/control-center/Makefile
+++ b/x11/control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/31 22:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/17 04:49:49 jlam Exp $
 
 DISTNAME=		control-center-1.4.0.4
 PKGREVISION=		10
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	YES
 
 USE_LIBTOOL=		YES
 
-LOCALSTATEDIR=		${X11PREFIX}/var
+LOCALSTATEDIR=		${PREFIX}/var
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 6964f741f52..f9b9c14364a 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.109 2005/06/17 04:49:49 jlam Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		8
@@ -29,7 +29,7 @@ PKGCONFIG_OVERRIDE+=	gtk+.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-xinput=xfree \
 			--with-native-locale=yes \
-			--sysconfdir=${X11PREFIX}/share
+			--sysconfdir=${PREFIX}/share
 CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
 
 INFO_FILES=		gdk.info gtk.info
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index 02deafe541f..a442000f88a 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/06/17 04:49:49 jlam Exp $
 
 DISTNAME=		rxvt-2.7.10
 PKGREVISION=		4
@@ -58,11 +58,12 @@ CFLAGS+=	-DSunOS
 post-patch:
 	${MV} ${WRKSRC}/src/feature.h  ${WRKSRC}/src/feature.h.orig
 	${SED} < ${WRKSRC}/src/feature.h.orig > ${WRKSRC}/src/feature.h \
-		-e "s:/usr/lib/X11/app-defaults:${X11PREFIX}/lib/X11/app-defaults:"
+		-e "s:/usr/lib/X11/app-defaults:${PREFIX}/lib/X11/app-defaults:"
 
 pre-install:
-	if [ ! -f ${X11PREFIX}/lib/X11/app-defaults/Rxvt ]; then \
-		${INSTALL_DATA} ${FILESDIR}/Rxvt ${X11PREFIX}/lib/X11/app-defaults; \
+	if [ ! -f ${PREFIX}/lib/X11/app-defaults/Rxvt ]; then \
+		${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/app-defaults; \
+		${INSTALL_DATA} ${FILESDIR}/Rxvt ${PREFIX}/lib/X11/app-defaults; \
 	fi
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index 421bce175a4..8373f3f829f 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:44 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/17 04:49:49 jlam Exp $
 #
 
 DISTNAME=	ssystem-1.6
@@ -23,13 +23,13 @@ INSTALLATION_DIRS=	bin
 
 do-install:
 	cd ${WRKSRC} && \
-	    ${INSTALL_PROGRAM} ssystem ${X11PREFIX}/bin; \
-	    ${INSTALL_DATA_DIR} ${X11PREFIX}/share/ssystem; \
-	    ${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/ssystem; \
-	    ${INSTALL_DATA_DIR} ${X11PREFIX}/share/ssystem/hires; \
-	    ${INSTALL_DATA} ${DATA_FILES} ${X11PREFIX}/share/ssystem; \
-	    ${INSTALL_DATA} ${DOC_FILES} ${X11PREFIX}/share/doc/ssystem; \
-	    ${INSTALL_DATA} hires/README ${X11PREFIX}/share/ssystem/hires
+	    ${INSTALL_PROGRAM} ssystem ${PREFIX}/bin; \
+	    ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem; \
+	    ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ssystem; \
+	    ${INSTALL_DATA_DIR} ${PREFIX}/share/ssystem/hires; \
+	    ${INSTALL_DATA} ${DATA_FILES} ${PREFIX}/share/ssystem; \
+	    ${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/share/doc/ssystem; \
+	    ${INSTALL_DATA} hires/README ${PREFIX}/share/ssystem/hires
 
 .include "../../graphics/Mesa/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index a1bce933a66..25b23b9787a 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:52 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/17 04:49:49 jlam Exp $
 #
 
 DISTNAME=	xglobe-0.5
@@ -26,14 +26,14 @@ USE_X11BASE=	YES
 USE_TOOLS+=	gmake
 
 post-install:
-	${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif      ${X11PREFIX}/lib/xglobe/mggd.gif
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif    ${X11PREFIX}/lib/xglobe/daymap.gif
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${X11PREFIX}/lib/xglobe/nightmap.gif
-	${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/xglobe
-	${INSTALL_DATA} ${WRKSRC}/README	 ${X11PREFIX}/share/doc/xglobe
-	${INSTALL_DATA} ${WRKSRC}/README.maps	 ${X11PREFIX}/share/doc/xglobe
-	${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${X11PREFIX}/bin/xglobe-getcloudmap.sh
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/xglobe
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/mggd.gif      ${PREFIX}/lib/xglobe/mggd.gif
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/LE.400.gif    ${PREFIX}/lib/xglobe/daymap.gif
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Brill.400.gif ${PREFIX}/lib/xglobe/nightmap.gif
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/README	 ${PREFIX}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/README.maps	 ${PREFIX}/share/doc/xglobe
+	${INSTALL_DATA} ${WRKSRC}/getcloudmap.sh ${PREFIX}/bin/xglobe-getcloudmap.sh
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 2c4ef94435f..6cbba9fea46 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:28:28 agc Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/17 04:49:49 jlam Exp $
 #
 
 DISTNAME=	xmove.2.0beta2
@@ -11,7 +11,7 @@ COMMENT=	Move an X11 display between screens and displays
 
 WRKSRC=		${WRKDIR}/xmove
 USE_IMAKE=	yes
-XMOVEDOCDIR=	${X11PREFIX}/share/doc/xmove
+XMOVEDOCDIR=	${PREFIX}/share/doc/xmove
 
 pre-configure:
 	@${SED} -e 's|@x11base@|'${X11PREFIX}'|' < ${WRKSRC}/xmove/Imakefile > ${WRKSRC}/xmove/Imakefile.new && \
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 19b89791483..07a8686a735 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:33 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/17 04:49:49 jlam Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-clients-${XORG_VER}
@@ -27,7 +27,7 @@ OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir \
 OWN_DIRS_PERMS+=        ${VARBASE}/lib/xdm/authdir/authfiles \
 	${ROOT_USER} ${ROOT_GROUP} 0700
 
-EGDIR=			${LOCALBASE}/share/examples/xorg/xdm
+EGDIR=			${PREFIX}/share/examples/xorg/xdm
 PKG_SYSCONFSUBDIR=	xorg/xdm
 
 CONF_FILES=		${EGDIR}/xdm-config ${PKG_SYSCONFDIR}/xdm-config