5 files changed, 13 insertions, 29 deletions

diff --git a/japanese/ptex-pkfonts300/Makefile b/japanese/ptex-pkfonts300/Makefile
index 73a5ff2ad163..bdf3c797d8df 100644
--- a/japanese/ptex-pkfonts300/Makefile
+++ b/japanese/ptex-pkfonts300/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ptex-pkfonts
 PORTVERSION=	1.0
+PORTREVISION=	1
 PKGNAMESUFFIX=	${RESOLUTION}
 CATEGORIES=	japanese print
 DISTFILES=	# none
@@ -16,7 +17,6 @@ MAINTAINER=	inagaki@tg.rim.or.jp
 RUN_DEPENDS=	${LOCALBASE}/lib/fonts/pk${RESOLUTION}:${PORTSDIR}/print/pkfonts${RESOLUTION}
 
 NO_BUILD=	yes
-PKGREQ=		${WRKDIR}/REQ
 
 # ******************
 # USEPK_MODE:
@@ -32,24 +32,21 @@ USEPK_MODE?=	cx
 MAKETEX_MODE?=	${USEPK_MODE}
 RESOLUTION?=	300
 
+PLIST_SUB=	RESOLUTION="${RESOLUTION}" USEPK_MODE="${USEPK_MODE}"
+
 .BEGIN:
 .if defined(RESOLUTION) && \
 	${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \
 	${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \
 	${RESOLUTION} != 400  && ${RESOLUTION} != 600
-	@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-	@${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600."
+	@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
+	@${ECHO_MSG} "Possible values are: 118, 240, 300, 360, 400 and 600."
 	@${FALSE}
 .endif
 
-do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${SED} -e 's,%%RESOLUTION%%,${RESOLUTION},g' \
-		-e 's,%%USEPK_MODE%%,${USEPK_MODE},g' \
-		< ${FILESDIR}/REQ.tmpl > ${WRKDIR}/REQ; \
-
 do-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-		${SH} ${WRKDIR}/REQ ${PKGNAME} INSTALL
+	${MKDIR} ${PREFIX}/share/texmf/fonts/pk/${USEPK_MODE}
+	${LN} -sf ${PREFIX}/lib/fonts/pk${RESOLUTION} \
+		${PREFIX}/share/texmf/fonts/pk/${USEPK_MODE}/
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-pkfonts300/files/REQ.tmpl b/japanese/ptex-pkfonts300/files/REQ.tmpl
deleted file mode 100644
index 4f03ebaddf05..000000000000
--- a/japanese/ptex-pkfonts300/files/REQ.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ "x$1" = "x" ]; then
-    exit 1;
-fi
-
-if [ "x$2" = "xINSTALL" ]; then
-   mkdir -p ${PKG_PREFIX}/share/texmf/fonts/pk/%%USEPK_MODE%%
-   ln -sf ${PKG_PREFIX}/lib/fonts/pk%%RESOLUTION%% ${PKG_PREFIX}/share/texmf/fonts/pk/%%USEPK_MODE%%/
-fi
-
-if [ "x$2" = "xDEINSTALL" ]; then
-   rm ${PKG_PREFIX}/share/texmf/fonts/pk/%%USEPK_MODE%%/pk%%RESOLUTION%%
-fi
diff --git a/japanese/ptex-pkfonts300/pkg-plist b/japanese/ptex-pkfonts300/pkg-plist
index e69de29bb2d1..dc531bcbfdc0 100644
--- a/japanese/ptex-pkfonts300/pkg-plist
+++ b/japanese/ptex-pkfonts300/pkg-plist
@@ -0,0 +1,5 @@
+@exec mkdir -p %D/share/texmf/fonts/pk/%%USEPK_MODE%%
+@exec ln -sf %D/lib/fonts/pk%%RESOLUTION%% %D/share/texmf/fonts/pk/%%USEPK_MODE%%/
+@unexec rm -f %D/share/texmf/fonts/pk/%%USEPK_MODE%%/pk%%RESOLUTION%%
+@unexec rmdir %D/share/texmf/fonts/pk/%%USEPK_MODE%%
+@unexec rmdir %D/share/texmf/fonts/pk 2>&1 || true
diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
index 1341a5bbeab6..5862fcc106d1 100644
--- a/japanese/xdvik-vflib/Makefile
+++ b/japanese/xdvik-vflib/Makefile
@@ -32,8 +32,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
-BROKEN=		"Incorrect dependency information"
-
 LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib
 RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf
 
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 1341a5bbeab6..5862fcc106d1 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -32,8 +32,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
-BROKEN=		"Incorrect dependency information"
-
 LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib
 RUN_DEPENDS+=	makejvf:${PORTSDIR}/japanese/makejvf