4 files changed, 21 insertions, 215 deletions

diff --git a/japanese/makejvf/Makefile b/japanese/makejvf/Makefile
index 08f520a72273..c8cf3151eb45 100644
--- a/japanese/makejvf/Makefile
+++ b/japanese/makejvf/Makefile
@@ -7,76 +7,24 @@
 
 PORTNAME=	makejvf-fkr
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.tooyoo.l.u-tokyo.ac.jp/pub/TeX/:0 \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/:1 \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
 DISTNAME=	makejvf-${PORTVERSION}-fkr
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:0 \
-		standard${EXTRACT_SUFX}:1 nmin-ngoth${EXTRACT_SUFX}:1 \
-		jis${EXTRACT_SUFX}:1 morisawa${EXTRACT_SUFX}:1
+DIST_SUBDIR=    makejvf
 
 MAINTAINER=	inagaki@tg.rim.or.jp
-COMMENT=	Japanese Virtual Font file maker + TFM and VF
-
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+COMMENT=	Japanese Virtual Font file maker
 
-DIST_SUBDIR=    makejvf
 INSTALL_TARGET=	install-all
-BINARIES=	makejvf makejvfh makejvfk
-TEXMF=		${PREFIX}/share/texmf
-MAKEJVF_DIR=	${PREFIX}/share/fonts/makejvf
-MAP_DIR=	${TEXMF}/dvips/makejvf
-PTEX_TFM_DIR=	${TEXMF}/fonts/tfm/makejvf
-DVIPS_TFM_DIR=	${TEXMF}/fonts/tfm/makejvf
-DVIPS_VF_DIR=	${TEXMF}/fonts/vf/makejvf
-PTEX_TFM=	standard nmin-ngoth jis morisawa
-
-DOCS=		README.1st README.txt test1.tex test2.tex kuten2jis jy1mch.fd
-
-post-extract:
-	@for i in ${PTEX_TFM} ; do \
-		${TAR} -C ${WRKDIR}/ -zxf ${DISTDIR}/${DIST_SUBDIR}/$$i${EXTRACT_SUFX} ; \
-	done
-
-.include <bsd.port.pre.mk>
+DOCS=		README.1st README.txt \
+		test1.tex test2.tex kuten2jis jy1mch.fd
 
 post-install:
-	@${MKDIR} ${MAP_DIR}
-	@for i in ${PTEX_TFM} ; do \
-		${INSTALL_DATA} ${WRKDIR}/$$i/$$i.map \
-			${MAP_DIR}/ ; \
-	done
-
-	@${MKDIR} ${PTEX_TFM_DIR}/ptex
-	@for i in ${PTEX_TFM} ; do \
-		${INSTALL_DATA} ${WRKDIR}/$$i/tfm/ptex/* \
-			${PTEX_TFM_DIR}/ptex/ ; \
-	done
-
-	@${MKDIR} ${DVIPS_TFM_DIR}/dvips
-	@for i in ${PTEX_TFM} ; do \
-		${INSTALL_DATA} ${WRKDIR}/$$i/tfm/dvips/* \
-			${DVIPS_TFM_DIR}/dvips/ ; \
-	done
-
-	@${MKDIR} ${DVIPS_VF_DIR}
-	@for i in ${PTEX_TFM} ; do \
-		${INSTALL_DATA} ${WRKDIR}/$$i/vf/* \
-			${DVIPS_VF_DIR}/ ; \
-	done
-
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/makejvf-fkr
-	@for i in ${DOCS} ; do \
-	    ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/makejvf-fkr ; \
-	done
-.endif
-
-.if exists(${PREFIX}/bin/mktexlsr)
-	@${PREFIX}/bin/mktexlsr
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/makejvf/distinfo b/japanese/makejvf/distinfo
index 1bbbd7f4bfc6..4cda78991477 100644
--- a/japanese/makejvf/distinfo
+++ b/japanese/makejvf/distinfo
@@ -1,10 +1,2 @@
 MD5 (makejvf/makejvf-1.0-fkr.tar.gz) = a78349ce40c3b75a1485627468a8dbe2
 SIZE (makejvf/makejvf-1.0-fkr.tar.gz) = 10411
-MD5 (makejvf/standard.tar.gz) = 5beda417c833cb127202ee85f8cbb41e
-SIZE (makejvf/standard.tar.gz) = 1043476
-MD5 (makejvf/nmin-ngoth.tar.gz) = 585ae2bb2b82d53006025f8fad6b003f
-SIZE (makejvf/nmin-ngoth.tar.gz) = 524406
-MD5 (makejvf/jis.tar.gz) = 12fc14c4ed0530eab018c867b383eedb
-SIZE (makejvf/jis.tar.gz) = 347201
-MD5 (makejvf/morisawa.tar.gz) = 10a3a0bb382d9edf834177d0c03101f5
-SIZE (makejvf/morisawa.tar.gz) = 653674
diff --git a/japanese/makejvf/files/patch-aa b/japanese/makejvf/files/patch-Makefile
index f2fc210bc036..cf1387867370 100644
--- a/japanese/makejvf/files/patch-aa
+++ b/japanese/makejvf/files/patch-Makefile
@@ -1,11 +1,12 @@
---- Makefile.orig	Fri Feb 12 22:59:06 1999
-+++ Makefile	Tue May  4 21:36:13 1999
+--- Makefile.orig	Wed Jun  2 01:04:50 2004
++++ Makefile	Wed Jun  2 01:05:14 2004
 @@ -1,8 +1,8 @@
  # Makefile for makejvf, makejvfh, makejvfk
  
- BINDIR   = /usr/local/bin
+-BINDIR   = /usr/local/bin
 -CC       = gcc
 -CFLAGS   = -O2
++BINDIR   = ${PREFIX}/bin
 +#CC       = gcc
 +#CFLAGS   = -O2
  
diff --git a/japanese/makejvf/pkg-plist b/japanese/makejvf/pkg-plist
index 8c1aca9d1f3a..090c3c4f573f 100644
--- a/japanese/makejvf/pkg-plist
+++ b/japanese/makejvf/pkg-plist
@@ -1,146 +1,11 @@
+@comment $FreeBSD$
 bin/makejvf
 bin/makejvfh
 bin/makejvfk
-share/doc/makejvf-fkr/README.1st
-share/doc/makejvf-fkr/README.txt
-share/doc/makejvf-fkr/test1.tex
-share/doc/makejvf-fkr/test2.tex
-share/doc/makejvf-fkr/kuten2jis
-share/doc/makejvf-fkr/jy1mch.fd
-share/texmf/dvips/makejvf/standard.map
-share/texmf/dvips/makejvf/nmin-ngoth.map
-share/texmf/dvips/makejvf/jis.map
-share/texmf/dvips/makejvf/morisawa.map
-share/texmf/fonts/tfm/makejvf/ptex/goth10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/goth5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/goth6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/goth7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/goth8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/goth9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/min9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tgoth9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/tmin9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/ngoth9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin10.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin5.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin6.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin7.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin8.tfm
-share/texmf/fonts/tfm/makejvf/ptex/nmin9.tfm
-share/texmf/fonts/tfm/makejvf/ptex/jis.tfm
-share/texmf/fonts/tfm/makejvf/ptex/jisg.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-H.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-J.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoGoB101-Bold-V.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-H.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-J.tfm
-share/texmf/fonts/tfm/makejvf/ptex/FutoMinA101-Bold-V.tfm
-share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-H.tfm
-share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-J.tfm
-share/texmf/fonts/tfm/makejvf/ptex/GothicBBB-Medium-V.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-H.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-J.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Jun101-Light-V.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-H.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-J.tfm
-share/texmf/fonts/tfm/makejvf/ptex/Ryumin-Light-V.tfm
-share/texmf/fonts/tfm/makejvf/dvips/gbm.tfm
-share/texmf/fonts/tfm/makejvf/dvips/gbmv.tfm
-share/texmf/fonts/tfm/makejvf/dvips/rml.tfm
-share/texmf/fonts/tfm/makejvf/dvips/rmlv.tfm
-share/texmf/fonts/tfm/makejvf/dvips/futogo-b-v.tfm
-share/texmf/fonts/tfm/makejvf/dvips/futogo-b.tfm
-share/texmf/fonts/tfm/makejvf/dvips/futomin-b-v.tfm
-share/texmf/fonts/tfm/makejvf/dvips/futomin-b.tfm
-share/texmf/fonts/tfm/makejvf/dvips/gtbbb-m-v.tfm
-share/texmf/fonts/tfm/makejvf/dvips/gtbbb-m.tfm
-share/texmf/fonts/tfm/makejvf/dvips/jun101-l-v.tfm
-share/texmf/fonts/tfm/makejvf/dvips/jun101-l.tfm
-share/texmf/fonts/tfm/makejvf/dvips/ryumin-l-v.tfm
-share/texmf/fonts/tfm/makejvf/dvips/ryumin-l.tfm
-share/texmf/fonts/vf/makejvf/goth10.vf
-share/texmf/fonts/vf/makejvf/goth5.vf
-share/texmf/fonts/vf/makejvf/goth6.vf
-share/texmf/fonts/vf/makejvf/goth7.vf
-share/texmf/fonts/vf/makejvf/goth8.vf
-share/texmf/fonts/vf/makejvf/goth9.vf
-share/texmf/fonts/vf/makejvf/min10.vf
-share/texmf/fonts/vf/makejvf/min5.vf
-share/texmf/fonts/vf/makejvf/min6.vf
-share/texmf/fonts/vf/makejvf/min7.vf
-share/texmf/fonts/vf/makejvf/min8.vf
-share/texmf/fonts/vf/makejvf/min9.vf
-share/texmf/fonts/vf/makejvf/tgoth10.vf
-share/texmf/fonts/vf/makejvf/tgoth5.vf
-share/texmf/fonts/vf/makejvf/tgoth6.vf
-share/texmf/fonts/vf/makejvf/tgoth7.vf
-share/texmf/fonts/vf/makejvf/tgoth8.vf
-share/texmf/fonts/vf/makejvf/tgoth9.vf
-share/texmf/fonts/vf/makejvf/tmin10.vf
-share/texmf/fonts/vf/makejvf/tmin5.vf
-share/texmf/fonts/vf/makejvf/tmin6.vf
-share/texmf/fonts/vf/makejvf/tmin7.vf
-share/texmf/fonts/vf/makejvf/tmin8.vf
-share/texmf/fonts/vf/makejvf/tmin9.vf
-share/texmf/fonts/vf/makejvf/ngoth10.vf
-share/texmf/fonts/vf/makejvf/ngoth5.vf
-share/texmf/fonts/vf/makejvf/ngoth6.vf
-share/texmf/fonts/vf/makejvf/ngoth7.vf
-share/texmf/fonts/vf/makejvf/ngoth8.vf
-share/texmf/fonts/vf/makejvf/ngoth9.vf
-share/texmf/fonts/vf/makejvf/nmin10.vf
-share/texmf/fonts/vf/makejvf/nmin5.vf
-share/texmf/fonts/vf/makejvf/nmin6.vf
-share/texmf/fonts/vf/makejvf/nmin7.vf
-share/texmf/fonts/vf/makejvf/nmin8.vf
-share/texmf/fonts/vf/makejvf/nmin9.vf
-share/texmf/fonts/vf/makejvf/jis.vf
-share/texmf/fonts/vf/makejvf/jisg.vf
-share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-H.vf
-share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-J.vf
-share/texmf/fonts/vf/makejvf/FutoGoB101-Bold-V.vf
-share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-H.vf
-share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-J.vf
-share/texmf/fonts/vf/makejvf/FutoMinA101-Bold-V.vf
-share/texmf/fonts/vf/makejvf/GothicBBB-Medium-H.vf
-share/texmf/fonts/vf/makejvf/GothicBBB-Medium-J.vf
-share/texmf/fonts/vf/makejvf/GothicBBB-Medium-V.vf
-share/texmf/fonts/vf/makejvf/Jun101-Light-H.vf
-share/texmf/fonts/vf/makejvf/Jun101-Light-J.vf
-share/texmf/fonts/vf/makejvf/Jun101-Light-V.vf
-share/texmf/fonts/vf/makejvf/Ryumin-Light-H.vf
-share/texmf/fonts/vf/makejvf/Ryumin-Light-J.vf
-share/texmf/fonts/vf/makejvf/Ryumin-Light-V.vf
-@dirrm share/texmf/dvips/makejvf
-@unexec rmdir %D/share/texmf/dvips 2>/dev/null || true
-@dirrm share/texmf/fonts/tfm/makejvf/ptex
-@dirrm share/texmf/fonts/tfm/makejvf/dvips
-@dirrm share/texmf/fonts/tfm/makejvf
-@unexec rmdir %D/share/texmf/fonts/tfm 2>/dev/null || true
-@dirrm share/texmf/fonts/vf/makejvf
-@unexec rmdir %D/share/texmf/fonts/vf 2>/dev/null || true
-@unexec rmdir %D/share/texmf/fonts 2>/dev/null || true
-@unexec rmdir %D/share/texmf 2>/dev/null || true
-@dirrm share/doc/makejvf-fkr
-@exec if [ -x %D/bin/mktexlsr ]; then %D/bin/mktexlsr; fi
-@unexec if [ -x %D/bin/mktexlsr ]; then %D/bin/mktexlsr; fi
+%%PORTDOCS%%%%DOCSDIR%%/README.1st
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/test1.tex
+%%PORTDOCS%%%%DOCSDIR%%/test2.tex
+%%PORTDOCS%%%%DOCSDIR%%/kuten2jis
+%%PORTDOCS%%%%DOCSDIR%%/jy1mch.fd
+%%PORTDOCS%%@dirrm %%DOCSDIR%%