Upgrade japanize patch: 1.4 to 1.4c.

PR:		ports/14408
Submitted by:	Maintainer

9 files changed, 74 insertions, 70 deletions

diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile
index f83cb8f270dd..cc607e071e6e 100644
--- a/japanese/dvipsk-vflib/Makefile
+++ b/japanese/dvipsk-vflib/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    dvipsk + jpatch + vflib-patch
-# Version required:     5.78a + p1.4 + 1.1alpha
+# Version required:     5.78a + p1.4c + 1.1alpha
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
@@ -14,13 +14,13 @@ MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/ \
 		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/ \
 		http://math.shinshu-u.ac.jp/~nakayama/howto/tex/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4.tar.gz \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz \
 		dvipsk-vflib-1.1alpha.patch.tgz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
 RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common \
-		${PREFIX}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
+		${LOCALBASE}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of dvipsk-*
@@ -29,15 +29,15 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
 MAKE_FLAGS=	XCFLAGS="-I${PREFIX}/include" XLOADLIBES="-L${PREFIX}/lib"
+SCRIPTS_ENV=	MV=${MV} SED=${SED}
 MAN1=		dvips.1 afm2tfm.1
+IS_INTERACTIVE=	yes
 
 TEXMF=		${PREFIX}/share/texmf
 DVIPSDIR=	${TEXMF}/dvips
 TEXDIR=		${TEXMF}/tex
 BINARIES=	dvips afm2tfm
-BACKUP_FILES=	base/asex.enc base/psfonts.map config/config.ps
-BASE_FILES=	vffonts.pro cmfonts.map cyrfonts.map eufonts.map lafonts.map \
-		reencode/asex.enc
+BASE_FILES=	config.ps cmfonts.map cyrfonts.map eufonts.map lafonts.map
 CONTRIB_DIRS=	afm-extra bbfig configs psfig volker
 CONTRIB_FILES=	MakeTeXPK.pl PSTricks colorsep.pro config.proto crop.lpr \
 		timesmat.sty whichinpath afm-extra/*.ed bbfig/bb* \
@@ -57,18 +57,10 @@ post-build:
 	  ../squeeze < colorsep.lpro > colorsep.pro \
 	)
 
-pre-install:
-	@for i in ${BACKUP_FILES} ; do \
-	  if [ -f ${DVIPSDIR}/$$i ] ; then \
-	    ${MV} ${DVIPSDIR}/$$i ${DVIPSDIR}/$$i.bak ; \
-	  fi ; \
-	done
-
 post-install:
 	@for i in ${BINARIES} ; do \
 	    strip ${PREFIX}/bin/$$i ; \
 	done
-	@${MKDIR} ${DVIPSDIR}/config
 	@for i in ${CONTRIB_DIRS} ; do \
 	  ${MKDIR} ${DVIPSDIR}/contrib/$$i ; \
 	done
@@ -78,7 +70,6 @@ post-install:
 	  for i in ${BASE_FILES} ; do \
 	    ${INSTALL_DATA} $$i ${DVIPSDIR}/base ; \
 	  done ; \
-	  ${INSTALL_DATA} config.ps ${DVIPSDIR}/config ; \
 	  cd ${WRKSRC}/dvipsk/contrib ; \
 	  for i in ${CONTRIB_FILES} ; do \
 	    ${INSTALL_DATA} $$i ${DVIPSDIR}/contrib/$$i ; \
@@ -98,8 +89,8 @@ post-install:
 	@${LN} -fs ${DVIPSDIR}/contrib ${PREFIX}/share/doc/dvips/contrib
 .endif
 .if defined(BATCH)
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL BATCH
+	@${SETENV} PKG_PREFIX=${PREFIX} BATCH=yes \
+	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 .else
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 	  ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
diff --git a/japanese/dvipsk-vflib/distinfo b/japanese/dvipsk-vflib/distinfo
index db5491c32696..829906962490 100644
--- a/japanese/dvipsk-vflib/distinfo
+++ b/japanese/dvipsk-vflib/distinfo
@@ -1,3 +1,3 @@
 MD5 (dvipsk-5.78a.tar.gz) = 7731c81a2614f62ff892b296d257c4d0
-MD5 (dvipsk-jpatch-p1.4.tar.gz) = 20b10a562e0f931768e258118ea773ba
+MD5 (dvipsk-jpatch-p1.4c.tar.gz) = 3113913f6f82f16f467d82e07fe303a9
 MD5 (dvipsk-vflib-1.1alpha.patch.tgz) = f2eff40c3b2afe732c6e2a0b8469c2db
diff --git a/japanese/dvipsk-vflib/files/patch-aa b/japanese/dvipsk-vflib/files/patch-aa
index eeb8a043af10..b266e3709885 100644
--- a/japanese/dvipsk-vflib/files/patch-aa
+++ b/japanese/dvipsk-vflib/files/patch-aa
@@ -11,19 +11,6 @@
  # Other standard targets for everything.
 --- dvipsk/Makefile.in.orig	Sat Jul  4 15:27:03 1998
 +++ dvipsk/Makefile.in	Sat Jul  4 15:29:46 1998
-@@ -81,9 +81,9 @@
- install-data: $(program).info
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(infodir) $(psheaderdir)/base $(dvips_plain_macrodir)
- # PostScript prologues and encodings.
--	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
--	cd $(srcdir)/reencode && \
--	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
-+#	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
-+#	cd $(srcdir)/reencode && \
-+#	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
- # config.ps. Any one config.ps will be wrong for most people, so don't
- # install anything by default.
- #	if test ! -r $(psheaderdir)/base/config.ps				\
 @@ -104,8 +104,8 @@
  	$(INSTALL_DATA) $(srcdir)/dvips.1 $(mandir)/dvips.$(manext)
  	$(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(mandir)/afm2tfm.$(manext)
diff --git a/japanese/dvipsk-vflib/files/patch-ad b/japanese/dvipsk-vflib/files/patch-ad
index c58442db8a64..a46789251a05 100644
--- a/japanese/dvipsk-vflib/files/patch-ad
+++ b/japanese/dvipsk-vflib/files/patch-ad
@@ -8,10 +8,10 @@
 -rmlv     Ryumin-Light-V
 -gbm      GothicBBB-Medium-H
 -gbmv     GothicBBB-Medium-V
-+rml	 Ryumin-Light-H			<`r-watanabe-mincho
-+gbm	 GothicBBB-Medium-H		<`r-watanabe-mincho
-+rmlv	 Ryumin-Light-V			<`r-watanabe-mincho
-+gbmv	 GothicBBB-Medium-V		<`r-watanabe-mincho
++rml	 Ryumin-Light-H			<`min
++gbm	 GothicBBB-Medium-H		<`goth
++rmlv	 Ryumin-Light-V			<`min
++gbmv	 GothicBBB-Medium-V		<`goth
  
  % 	
  % Local variables:
diff --git a/japanese/dvipsk-vflib/pkg-plist b/japanese/dvipsk-vflib/pkg-plist
index 30ca4eb10c48..631133fd811e 100644
--- a/japanese/dvipsk-vflib/pkg-plist
+++ b/japanese/dvipsk-vflib/pkg-plist
@@ -7,16 +7,37 @@ info/dvips.info-2
 info/dvips.info-3
 info/dvips.info-4
 @exec install-info %D/info/dvips.info %D/info/dir
-@exec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i ] ; then mv %D/share/texmf/dvips/$i %D/share/texmf/dvips/$i.bak ; fi ; done
+share/texmf/dvips/base/color.pro
+share/texmf/dvips/base/crop.pro
+share/texmf/dvips/base/finclude.pro
+share/texmf/dvips/base/hps.pro
+share/texmf/dvips/base/special.pro
+share/texmf/dvips/base/tex.pro
+share/texmf/dvips/base/texc.pro
+share/texmf/dvips/base/texps.pro
 share/texmf/dvips/base/vffonts.pro
+share/texmf/dvips/base/8a.enc
+share/texmf/dvips/base/8r.enc
+share/texmf/dvips/base/EC.enc
+share/texmf/dvips/base/ad.enc
 share/texmf/dvips/base/asex.enc
+share/texmf/dvips/base/asexp.enc
+share/texmf/dvips/base/cork.enc
+share/texmf/dvips/base/dc.enc
+share/texmf/dvips/base/dvips.enc
+share/texmf/dvips/base/extex.enc
+share/texmf/dvips/base/funky.enc
+share/texmf/dvips/base/texmext.enc
+share/texmf/dvips/base/texmital.enc
+share/texmf/dvips/base/texmsym.enc
+share/texmf/dvips/base/xl2.enc
+share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/base/cmfonts.map
 share/texmf/dvips/base/cyrfonts.map
 share/texmf/dvips/base/eufonts.map
 share/texmf/dvips/base/lafonts.map
 share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/config/config.ps
-@unexec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i.bak ] ; then mv %D/share/texmf/dvips/$i.bak %D/share/texmf/dvips/$i ; fi ; done
+share/texmf/dvips/base/config.ps
 share/texmf/dvips/contrib/MakeTeXPK.pl
 share/texmf/dvips/contrib/PSTricks
 share/texmf/dvips/contrib/colorsep.pro
@@ -88,12 +109,15 @@ share/doc/dvips/dvips.texi
 share/doc/dvips/dvips.help
 @exec ln -fs %D/share/texmf/dvips/contrib %D/share/doc/dvips/contrib
 @unexec rm %D/share/doc/dvips/contrib
+@dirrm share/texmf/dvips/base
 @dirrm share/texmf/dvips/contrib/afm-extra
 @dirrm share/texmf/dvips/contrib/bbfig
 @dirrm share/texmf/dvips/contrib/configs
 @dirrm share/texmf/dvips/contrib/psfig
 @dirrm share/texmf/dvips/contrib/volker
 @dirrm share/texmf/dvips/contrib
+@dirrm share/texmf/dvips
 @dirrm share/texmf/tex/latex209/dvips
+@dirrm share/texmf/tex/latex209
 @dirrm share/doc/dvips
 @unexec if [ -f %D/share/texmf/web2c/texmf.cnf.bak ] ; then rm -f %D/share/texmf/web2c/texmf.cnf ; mv %D/share/texmf/web2c/texmf.cnf.bak %D/share/texmf/web2c/texmf.cnf ; fi
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 686f196a4773..0cad464a9f04 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    dvipsk + jpatch
-# Version required:     5.78a + p1.4
+# Version required:     5.78a + p1.4c
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
@@ -13,27 +13,27 @@ MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/ \
 		ftp://ftp.center.osaka-u.ac.jp/CTAN/dviware/dvipsk/ \
 		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
 RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common \
-		${PREFIX}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
+		${LOCALBASE}/share/fonts/vf-a2bk:${PORTSDIR}/japanese/vftool
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of dvipsk-*
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_install="${INSTALL} -c -o ${BINOWN} -g ${BINGRP}"
+SCRIPTS_ENV=	MV=${MV} SED=${SED}
 MAN1=		dvips.1 afm2tfm.1
+IS_INTERACTIVE=	yes
 
 TEXMF=		${PREFIX}/share/texmf
 DVIPSDIR=	${TEXMF}/dvips
 TEXDIR=		${TEXMF}/tex
 BINARIES=	dvips afm2tfm
-BACKUP_FILES=	base/asex.enc base/psfonts.map config/config.ps
-BASE_FILES=	cmfonts.map cyrfonts.map eufonts.map lafonts.map \
-		reencode/asex.enc
+BASE_FILES=	config.ps cmfonts.map cyrfonts.map eufonts.map lafonts.map
 CONTRIB_DIRS=	afm-extra bbfig configs psfig volker
 CONTRIB_FILES=	MakeTeXPK.pl PSTricks colorsep.pro config.proto crop.lpr \
 		timesmat.sty whichinpath afm-extra/*.ed bbfig/bb* \
@@ -52,18 +52,10 @@ post-build:
 	  ../squeeze < colorsep.lpro > colorsep.pro \
 	)
 
-pre-install:
-	@for i in ${BACKUP_FILES} ; do \
-	  if [ -f ${DVIPSDIR}/$$i ] ; then \
-	    ${MV} ${DVIPSDIR}/$$i ${DVIPSDIR}/$$i.bak ; \
-	  fi ; \
-	done
-
 post-install:
 	@for i in ${BINARIES} ; do \
 	    strip ${PREFIX}/bin/$$i ; \
 	done
-	@${MKDIR} ${DVIPSDIR}/config
 	@for i in ${CONTRIB_DIRS} ; do \
 	  ${MKDIR} ${DVIPSDIR}/contrib/$$i ; \
 	done
@@ -73,7 +65,6 @@ post-install:
 	  for i in ${BASE_FILES} ; do \
 	    ${INSTALL_DATA} $$i ${DVIPSDIR}/base ; \
 	  done ; \
-	  ${INSTALL_DATA} config.ps ${DVIPSDIR}/config ; \
 	  cd ${WRKSRC}/dvipsk/contrib ; \
 	  for i in ${CONTRIB_FILES} ; do \
 	    ${INSTALL_DATA} $$i ${DVIPSDIR}/contrib/$$i ; \
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index f221f037e5eb..a630885c1c5f 100644
--- a/japanese/dvipsk/distinfo
+++ b/japanese/dvipsk/distinfo
@@ -1,2 +1,2 @@
 MD5 (dvipsk-5.78a.tar.gz) = 7731c81a2614f62ff892b296d257c4d0
-MD5 (dvipsk-jpatch-p1.4.tar.gz) = 20b10a562e0f931768e258118ea773ba
+MD5 (dvipsk-jpatch-p1.4c.tar.gz) = 3113913f6f82f16f467d82e07fe303a9
diff --git a/japanese/dvipsk/files/patch-aa b/japanese/dvipsk/files/patch-aa
index 1b4ed0a9e126..3205e8d03f41 100644
--- a/japanese/dvipsk/files/patch-aa
+++ b/japanese/dvipsk/files/patch-aa
@@ -11,19 +11,6 @@
  # Other standard targets for everything.
 --- dvipsk/Makefile.in.orig	Tue Mar  3 23:47:43 1998
 +++ dvipsk/Makefile.in	Wed Jul  1 15:41:44 1998
-@@ -80,9 +80,9 @@
- install-data: $(program).info
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(infodir) $(psheaderdir)/base $(dvips_plain_macrodir)
- # PostScript prologues and encodings.
--	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
--	cd $(srcdir)/reencode && \
--	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
-+#	for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done
-+#	cd $(srcdir)/reencode && \
-+#	  for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done
- # config.ps. Any one config.ps will be wrong for most people, so don't
- # install anything by default.
- #	if test ! -r $(psheaderdir)/base/config.ps				\
 @@ -103,8 +103,8 @@
  	$(INSTALL_DATA) $(srcdir)/dvips.1 $(mandir)/dvips.$(manext)
  	$(INSTALL_DATA) $(srcdir)/afm2tfm.1 $(mandir)/afm2tfm.$(manext)
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index 6b6fbd97c928..fd3b60b53823 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -7,15 +7,36 @@ info/dvips.info-2
 info/dvips.info-3
 info/dvips.info-4
 @exec install-info %D/info/dvips.info %D/info/dir
-@exec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i ] ; then mv %D/share/texmf/dvips/$i %D/share/texmf/dvips/$i.bak ; fi ; done
+share/texmf/dvips/base/color.pro
+share/texmf/dvips/base/crop.pro
+share/texmf/dvips/base/finclude.pro
+share/texmf/dvips/base/hps.pro
+share/texmf/dvips/base/special.pro
+share/texmf/dvips/base/tex.pro
+share/texmf/dvips/base/texc.pro
+share/texmf/dvips/base/texps.pro
+share/texmf/dvips/base/8a.enc
+share/texmf/dvips/base/8r.enc
+share/texmf/dvips/base/EC.enc
+share/texmf/dvips/base/ad.enc
 share/texmf/dvips/base/asex.enc
+share/texmf/dvips/base/asexp.enc
+share/texmf/dvips/base/cork.enc
+share/texmf/dvips/base/dc.enc
+share/texmf/dvips/base/dvips.enc
+share/texmf/dvips/base/extex.enc
+share/texmf/dvips/base/funky.enc
+share/texmf/dvips/base/texmext.enc
+share/texmf/dvips/base/texmital.enc
+share/texmf/dvips/base/texmsym.enc
+share/texmf/dvips/base/xl2.enc
+share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/base/cmfonts.map
 share/texmf/dvips/base/cyrfonts.map
 share/texmf/dvips/base/eufonts.map
 share/texmf/dvips/base/lafonts.map
 share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/config/config.ps
-@unexec for i in base/asex.enc base/psfonts.map config/config.ps ; do if [ -f %D/share/texmf/dvips/$i.bak ] ; then mv %D/share/texmf/dvips/$i.bak %D/share/texmf/dvips/$i ; fi ; done
+share/texmf/dvips/base/config.ps
 share/texmf/dvips/contrib/MakeTeXPK.pl
 share/texmf/dvips/contrib/PSTricks
 share/texmf/dvips/contrib/colorsep.pro
@@ -86,12 +107,15 @@ share/doc/dvips/dvips.texi
 share/doc/dvips/dvips.help
 @exec ln -fs %D/share/texmf/dvips/contrib %D/share/doc/dvips/contrib
 @unexec rm %D/share/doc/dvips/contrib
+@dirrm share/texmf/dvips/base
 @dirrm share/texmf/dvips/contrib/afm-extra
 @dirrm share/texmf/dvips/contrib/bbfig
 @dirrm share/texmf/dvips/contrib/configs
 @dirrm share/texmf/dvips/contrib/psfig
 @dirrm share/texmf/dvips/contrib/volker
 @dirrm share/texmf/dvips/contrib
+@dirrm share/texmf/dvips
 @dirrm share/texmf/tex/latex209/dvips
+@dirrm share/texmf/tex/latex209
 @dirrm share/doc/dvips
 @unexec if [ -f %D/share/texmf/web2c/texmf.cnf.bak ] ; then rm -f %D/share/texmf/web2c/texmf.cnf ; mv %D/share/texmf/web2c/texmf.cnf.bak %D/share/texmf/web2c/texmf.cnf ; fi