3 files changed, 4 insertions, 55 deletions

diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile
index bf6445757fa4..a01666468e47 100644
--- a/japanese/font-jisx0213/Makefile
+++ b/japanese/font-jisx0213/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jisx0213
 PORTVERSION=	20040425
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
 		LOCAL/hrs:yagi
@@ -26,15 +26,7 @@ NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		${GZCAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	> ${WRKDIR}/$${file%.gz}
-MAKE_ENV=	STAGEDIR=${STAGEDIR} FONTDIR=${LOCALFONTDIR}
-PLIST_SUB=	LOCALFONTSDIR=${LOCALFONTDIR}
+MAKE_ENV=	FONTSDIR=${FONTSDIR}
 MAKEFILE=	${FILESDIR}/Makefile
 
-LOCALFONTDIR=	share/font-${PORTNAME}
-
-post-install:
-	${MKDIR} ${STAGEDIR}/${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-		../../../../${LOCALFONTDIR}/*.pcf.gz . \
-
 .include <bsd.port.mk>
diff --git a/japanese/font-jisx0213/files/Makefile b/japanese/font-jisx0213/files/Makefile
index beed26ca22bf..fc7c7706742b 100644
--- a/japanese/font-jisx0213/files/Makefile
+++ b/japanese/font-jisx0213/files/Makefile
@@ -2,9 +2,6 @@
 .SUFFIXES:
 .SUFFIXES: .bdf .pcf
 
-.if defined(STAGEDIR) && !empty(STAGEDIR)
-PREFIX:=	${STAGEDIR}${PREFIX}
-.endif
 LOCALBASE?=	/usr/local
 GZIP_CMD?=	/usr/bin/gzip
 MKBOLD_CMD?=	${LOCALBASE}/bin/mkbold
@@ -64,8 +61,8 @@ CLEANFILES+=	${B}i.bdf ${B}bi.bdf \
 .endfor
 
 install::
-	mkdir -p ${PREFIX}/${FONTDIR}
-	${BSD_INSTALL_DATA} ${TARGETS} ${PREFIX}/${FONTDIR}
+	mkdir -p ${DESTDIR}${FONTSDIR}
+	${BSD_INSTALL_DATA} ${TARGETS} ${DESTDIR}${FONTSDIR}
 
 clean::
 	rm -f ${TARGETS} ${CLEANFILES}
diff --git a/japanese/font-jisx0213/pkg-plist b/japanese/font-jisx0213/pkg-plist
index bf1ae6e7e9b0..2f5cc5667748 100644
--- a/japanese/font-jisx0213/pkg-plist
+++ b/japanese/font-jisx0213/pkg-plist
@@ -1,43 +1,3 @@
-%%LOCALFONTSDIR%%/K12-1.pcf.gz
-%%LOCALFONTSDIR%%/K12-1b.pcf.gz
-%%LOCALFONTSDIR%%/K12-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K12-1i.pcf.gz
-%%LOCALFONTSDIR%%/K12-2.pcf.gz
-%%LOCALFONTSDIR%%/K12-2b.pcf.gz
-%%LOCALFONTSDIR%%/K12-2bi.pcf.gz
-%%LOCALFONTSDIR%%/K12-2i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2000-2i.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1b.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1bi.pcf.gz
-%%LOCALFONTSDIR%%/K14-2004-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2000-2i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan16-2004-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-1i.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2b.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2bi.pcf.gz
-%%LOCALFONTSDIR%%/jiskan24-2000-2i.pcf.gz
 %%FONTSDIR%%/K12-1.pcf.gz
 %%FONTSDIR%%/K12-1b.pcf.gz
 %%FONTSDIR%%/K12-1bi.pcf.gz