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

${PREFIX}.

5 files changed, 14 insertions, 14 deletions

diff --git a/fonts/ja-elisat/Makefile b/fonts/ja-elisat/Makefile
index d2ef4c706fe..89851b6b56a 100644
--- a/fonts/ja-elisat/Makefile
+++ b/fonts/ja-elisat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=		elisat10
 PKGNAME=		ja-elisat-1.0
@@ -12,7 +12,7 @@ COMMENT=		8x8 dots X11 bitmap font for JIS X 0208
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisat
-FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
+FONTDIR=		${PREFIX}/lib/X11/fonts/local
 #ALIAS=			${WRKDIR}/fonts.alias
 PKGSRC_USE_TOOLS+=	gzip
 
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 78bd964e281..324c306203d 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=		elisau10
 PKGNAME=		ja-elisau-1.0
@@ -22,7 +22,7 @@ USE_TOOLS+=		patch
 PKGSRC_USE_TOOLS+=	gzip
 USE_X11BASE=		YES
 DOCDIR=			${PREFIX}/share/doc/elisau
-FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
+FONTDIR=		${PREFIX}/lib/X11/fonts/local
 DISTPATCH=		${WRKSRC}/clR5x8-s5x8.diff
 
 LICENSE=		no-commercial-use
diff --git a/fonts/ja-kaname/Makefile b/fonts/ja-kaname/Makefile
index fca1ce8ec22..e3b3a762b2e 100644
--- a/fonts/ja-kaname/Makefile
+++ b/fonts/ja-kaname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=		kaname_k12_bdf
 PKGNAME=		ja-kaname-0.0.0.20030112
@@ -12,7 +12,7 @@ WRKSRC=			${WRKDIR}
 USE_X11BASE=		YES
 PKGSRC_USE_TOOLS+=	gzip
 DOCDIR=			${PREFIX}/share/doc/kaname
-FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
+FONTDIR=		${PREFIX}/lib/X11/fonts/local
 
 #LICENSE=		no-commercial-use
 
diff --git a/fonts/ja-naga10/Makefile b/fonts/ja-naga10/Makefile
index f2efb134a22..230a66d5f40 100644
--- a/fonts/ja-naga10/Makefile
+++ b/fonts/ja-naga10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $
 
 DISTNAME=		knj10-1.1
 PKGNAME=		ja-naga10-1.1
@@ -14,7 +14,7 @@ COMMENT=		10x10 dots X11 bitmap font for JIS X 0208
 USE_X11BASE=		YES
 PKGSRC_USE_TOOLS+=	gzip
 DOCDIR=			${PREFIX}/share/doc
-FONTDIR=		${X11PREFIX}/lib/X11/fonts/local
+FONTDIR=		${PREFIX}/lib/X11/fonts/local
 
 post-extract:
 	cd ${WRKDIR}; \
diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile
index 1eba14f8dbc..2c587eae08e 100644
--- a/fonts/type1inst/Makefile
+++ b/fonts/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:52 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/17 04:49:46 jlam Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -16,10 +16,10 @@ NO_BUILD=		yes
 INSTALLATION_DIRS=	bin man/man1
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${X11PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${X11PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${X11PREFIX}/man/man1/type1inst.1
-	@${INSTALL_DATA_DIR} ${X11PREFIX}/share/doc/type1inst
-	@${INSTALL_DATA} ${WRKSRC}/README ${X11PREFIX}/share/doc/type1inst
+	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/type1inst
+	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/type1inst
 
 .include "../../mk/bsd.pkg.mk"