Correctly specify the shared lib no. of libt1 in LIB_DEPENDS.

Pointed-Out by:	SHIMURA Tatsuya <shimura@math.cst.nihon-u.ac.jp>,
		ITO Tsuyoshi <tsuyoshi@is.s.u-tokyo.ac.jp>

Run mktexlsr at installation time since there can be a situation
where only this port amongst other TeX related ports is upgraded.

Remove some garbage from pkg-message
Pointed-Out by:	SHIOZAKI Takehiko <st@be.to>

Don't install bin/{tftopl,pltotf} since modified version of them are installed by ja-ptex.

Work-around to make portupgrade users happy, by making share/texmf/dvipdfm and share/texmf/web2c/texmf.cnf symbolic links.

Since share/texmf/ls-R is updated by other ports, don't list them in the plist.

5 files changed, 79 insertions, 35 deletions

diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 07d9eb17714..532e58fa2e1 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -7,10 +7,12 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
-		ftp://ctan.tug.org/tex-archive/systems/unix/teTeX/2.0/distrib/ \
+		${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/
+MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-base
 DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF} ${DVIPSK_JPATCH}
@@ -21,7 +23,7 @@ COMMENT=	Base files for ASCII Japanese pTeX
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
-		t1.4:${PORTSDIR}/devel/t1lib
+		t1.5:${PORTSDIR}/devel/t1lib
 
 USE_XLIB=	yes
 MANUAL_PACKAGE_BUILD=	can only build with empty /usr/local
@@ -74,13 +76,21 @@ LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 TEXMF_TREE=	${PREFIX}/share/texmf
 
+post-extract:
+	@${TAR} -zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${WRKDIR} 'dvipdfm/*'
+
 pre-install:
 	@${MKDIR} ${TEXMF_TREE}
-	@${TAR} --exclude 'dvips/base/*' -zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
+	@${TAR} --exclude 'dvips/base/*' --exclude 'dvipdfm/*' -zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
 	@${TAR} -zxf ${_DISTDIR}/${PTEX_TEXMF} -C ${TEXMF_TREE}
-	@${MKDIR} ${TEXMF_TREE}/dvipdfm/.config
-	@${MV} ${TEXMF_TREE}/dvipdfm/* ${TEXMF_TREE}/dvipdfm/.config
-	@${MV} ${TEXMF_TREE}/dvipdfm/.config ${TEXMF_TREE}/dvipdfm/config
+	@${MKDIR} ${TEXMF_TREE}/dvipdfm-teTeX-dist/config
+	@${INSTALL_DATA} ${WRKDIR}/dvipdfm/* ${TEXMF_TREE}/dvipdfm-teTeX-dist/config
+	@if [ ! -d ${TEXMF_TREE}/dvipdfm ]; then \
+	  ${LN} -fs ${TEXMF_TREE}/dvipdfm-teTeX-dist ${TEXMF_TREE}/dvipdfm; \
+	  fi
+	@if [ ! -e $TEXMF_TREE}/web2c/texmf.cnf ]; then \
+	  ${LN} -fs ${TEXMF_TREE}/web2c/texmf.cnf-teTeX-dist ${TEXMF_TREE}/web2c/texmf.cnf; \
+	  fi
 	@${RM} ${TEXMF_TREE}/ls-R
 	@${PATCH} -d ${TEXMF_TREE}/dvips/pstricks -E --quiet < ${WRKDIR}/PSTricks.patch
 	@${RM} ${TEXMF_TREE}/dvips/pstricks/pst-text.pro.orig
@@ -95,6 +105,7 @@ post-install:
 	  ${PREFIX}/bin/texconfig font ro
 	@${SETENV} TEXMFMAIN=${TEXMF_TREE} PATH=${PREFIX}/bin:${PATH} \
 	  ${PREFIX}/bin/texconfig font options appendonlydir varfonts
+	@${PREFIX}/bin/mktexlsr ${TEXMF_TREE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/japanese/ptex-base/files/patch-texk::kpathsea::Makefile.in b/japanese/ptex-base/files/patch-texk::kpathsea::Makefile.in
new file mode 100644
index 00000000000..5f036321a77
--- /dev/null
+++ b/japanese/ptex-base/files/patch-texk::kpathsea::Makefile.in
@@ -0,0 +1,18 @@
+--- texk/kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
++++ texk/kpathsea/Makefile.in	Thu Apr 17 13:22:26 2003
+@@ -190,10 +190,11 @@
+ 
+ install-data: texmf.cnf kpathsea.info install-man
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
+-	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
+-	   || test ! -r $(web2cdir)/texmf.cnf; then \
+-	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
+-	else true; fi
++#	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
++#	   || test ! -r $(web2cdir)/texmf.cnf; then \
++#	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
++#	else true; fi
++	$(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf-teTeX-dist
+ 	test -r ./kpathsea.info || cd $(srcdir) && for i in kpathsea.i*; do \
+ 	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
+ # Should we install the headers?  They are not just system-dependent,
diff --git a/japanese/ptex-base/files/patch-texk::web2c::Makefile.in b/japanese/ptex-base/files/patch-texk::web2c::Makefile.in
new file mode 100644
index 00000000000..40a6ac33269
--- /dev/null
+++ b/japanese/ptex-base/files/patch-texk::web2c::Makefile.in
@@ -0,0 +1,13 @@
+--- texk/web2c/Makefile.in.orig	Sun Feb  2 01:51:16 2003
++++ texk/web2c/Makefile.in	Wed Apr 16 18:46:31 2003
+@@ -137,8 +137,8 @@
+ @MFW@@MFN@mfn = mf-nowin
+ programs = bibtex ctangle cweave dvicopy dvitomp dvitype $(etex) gftodvi \
+ gftopk gftype $(mfn) $(mfw) mft mpost $(odvicopy) $(odvitype) $(omega) \
+-$(otangle) patgen $(pdftex) $(pdfetex) $(pdftosrc) pktogf pktype pltotf \
+-pooltype tangle $(tex) tftopl tie $(ttf2afm) vftovp vptovf weave
++$(otangle) patgen $(pdftex) $(pdfetex) $(pdftosrc) pktogf pktype \
++pooltype tangle $(tex) tie $(ttf2afm) vftovp vptovf weave
+ 
+ mpware = mpware/dmp mpware/makempx mpware/mpto mpware/newer
+ mpware_sources = mpware/dmp.c mpware/makempx.in mpware/mpto.c mpware/newer.c
diff --git a/japanese/ptex-base/pkg-message b/japanese/ptex-base/pkg-message
index 1d558a9a1d7..0b9f1fc985e 100644
--- a/japanese/ptex-base/pkg-message
+++ b/japanese/ptex-base/pkg-message
@@ -1,6 +1,6 @@
 Files that are not specific to Japanese pTeX have been installed.
 Now, you need to install japanese/ptex, which provides files necessary
-for Japanese processing.  japanese/ptex-sjis.
+for Japanese processing.
 
 Note that the files installed by the ptex port can process all three
 character codes, i.e. EUC, JIS, and Shift-JIS by specifying a
diff --git a/japanese/ptex-base/pkg-plist b/japanese/ptex-base/pkg-plist
index a1c35cf41fe..86b98e96354 100644
--- a/japanese/ptex-base/pkg-plist
+++ b/japanese/ptex-base/pkg-plist
@@ -1,22 +1,22 @@
-@exec mkdir -p %D/share/texmf/fonts/afm/hoekwater
-@exec mkdir -p %D/share/texmf/fonts/bh/lucidabr
-@exec mkdir -p %D/share/texmf/fonts/bh/lumath
-@exec mkdir -p %D/share/texmf/fonts/ofm/public/ommincho
-@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/gothic
-@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/myoungjo
-@exec mkdir -p %D/share/texmf/fonts/ofm/uhc/taza
-@exec mkdir -p %D/share/texmf/fonts/ovf/public/ommincho
-@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/gothic
-@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/myoungjo
-@exec mkdir -p %D/share/texmf/fonts/ovf/uhc/taza
-@exec mkdir -p %D/share/texmf/fonts/ovp/public/ommincho
-@exec mkdir -p %D/share/texmf/fonts/pk
-@exec mkdir -p %D/share/texmf/fonts/tfm/monotype
-@exec mkdir -p %D/share/texmf/fonts/vf/monotype
-@exec mkdir -p %D/share/texmf/omega/generic/config
-@exec mkdir -p %D/share/texmf/omega/ocp/omegajapanese
-@exec mkdir -p %D/share/texmf/omega/otp/omega-j
-@exec mkdir -p %D/share/texmf/omega/otp/omegajapanese
+@exec /bin/mkdir -p %D/share/texmf/fonts/afm/hoekwater
+@exec /bin/mkdir -p %D/share/texmf/fonts/bh/lucidabr
+@exec /bin/mkdir -p %D/share/texmf/fonts/bh/lumath
+@exec /bin/mkdir -p %D/share/texmf/fonts/ofm/public/ommincho
+@exec /bin/mkdir -p %D/share/texmf/fonts/ofm/uhc/gothic
+@exec /bin/mkdir -p %D/share/texmf/fonts/ofm/uhc/myoungjo
+@exec /bin/mkdir -p %D/share/texmf/fonts/ofm/uhc/taza
+@exec /bin/mkdir -p %D/share/texmf/fonts/ovf/public/ommincho
+@exec /bin/mkdir -p %D/share/texmf/fonts/ovf/uhc/gothic
+@exec /bin/mkdir -p %D/share/texmf/fonts/ovf/uhc/myoungjo
+@exec /bin/mkdir -p %D/share/texmf/fonts/ovf/uhc/taza
+@exec /bin/mkdir -p %D/share/texmf/fonts/ovp/public/ommincho
+@exec /bin/mkdir -p %D/share/texmf/fonts/pk
+@exec /bin/mkdir -p %D/share/texmf/fonts/tfm/monotype
+@exec /bin/mkdir -p %D/share/texmf/fonts/vf/monotype
+@exec /bin/mkdir -p %D/share/texmf/omega/generic/config
+@exec /bin/mkdir -p %D/share/texmf/omega/ocp/omegajapanese
+@exec /bin/mkdir -p %D/share/texmf/omega/otp/omega-j
+@exec /bin/mkdir -p %D/share/texmf/omega/otp/omegajapanese
 bin/MakeTeXPK
 bin/access
 bin/allcm
@@ -112,7 +112,6 @@ bin/pfb2pfa
 bin/pk2bm
 bin/pktogf
 bin/pktype
-bin/pltotf
 bin/pooltype
 bin/ps2frag
 bin/ps2pk
@@ -135,7 +134,6 @@ bin/texi2pdf
 bin/texlinks
 bin/texshow
 bin/texutil
-bin/tftopl
 bin/thumbpdf
 bin/tie
 bin/ttf2afm
@@ -3299,8 +3297,8 @@ share/texmf/doc/tetex/TETEXDOC.ps
 share/texmf/doc/tetex/eurotex98-te.pdf
 share/texmf/doc/tetex/teTeX-FAQ
 share/texmf/doc/texdoctk/README
-share/texmf/dvipdfm/config/README.config
-share/texmf/dvipdfm/config/config
+share/texmf/dvipdfm-teTeX-dist/config/README.config
+share/texmf/dvipdfm-teTeX-dist/config/config
 share/texmf/dvips/antp/antp.enc
 share/texmf/dvips/antp/antp.map
 share/texmf/dvips/antp/config.antp
@@ -9297,7 +9295,6 @@ share/texmf/jbibtex/bst/jplain.bst
 share/texmf/jbibtex/bst/junsrt.bst
 share/texmf/jbibtex/bst/tieice.bst
 share/texmf/jbibtex/bst/tipsj.bst
-share/texmf/ls-R
 share/texmf/makeindex/gglo.ist
 share/texmf/makeindex/gind.ist
 share/texmf/makeindex/nomencl.ist
@@ -11882,9 +11879,14 @@ share/texmf/web2c/tex-pl.pool
 share/texmf/web2c/tex.fmt
 share/texmf/web2c/tex.log
 share/texmf/web2c/tex.pool
-share/texmf/web2c/texmf.cnf
+share/texmf/web2c/texmf.cnf-teTeX-dist
 share/texmf/web2c/updmap.cfg
 share/texmf/xdvi/XDvi
+@exec if [ ! -d %D/share/texmf/dvipdfm ]; then /bin/ln -fs %D/share/texmf/dvipdfm-teTeX-dist %D/share/texmf/dvipdfm; fi
+@unexec if [ -L %D/share/texmf/dvipdfm ]; then /bin/rm %D/share/texmf/dvipdfm ; fi
+@exec if [ ! -e %D/share/texmf/web2c/texmf.cnf ]; then /bin/ln -fs %D/share/texmf/web2c/texmf.cnf-teTeX-dist %D/share/texmf/web2c/texmf.cnf ; fi
+@unexec if [ -L %D/share/texmf/web2c/texmf.cnf ]; then /bin/rm %D/share/texmf/web2c/texmf.cnf ; fi
+@exec %D/bin/mktexlsr %D/share/texmf
 @dirrm share/texmf/xdvi
 @dirrm share/texmf/web2c
 @dirrm share/texmf/texdoctk
@@ -12446,8 +12448,8 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/dvips/antt
 @dirrm share/texmf/dvips/antp
 @dirrm share/texmf/dvips
-@dirrm share/texmf/dvipdfm/config
-@dirrm share/texmf/dvipdfm
+@dirrm share/texmf/dvipdfm-teTeX-dist/config
+@dirrm share/texmf/dvipdfm-teTeX-dist
 @dirrm share/texmf/doc/texdoctk
 @dirrm share/texmf/doc/tetex
 @dirrm share/texmf/doc/ptex
@@ -12636,5 +12638,5 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/bibtex/bib/ams
 @dirrm share/texmf/bibtex/bib
 @dirrm share/texmf/bibtex
-@dirrm share/texmf
+@unexec /bin/rmdir %D/share/texmf > /dev/null 2>&1 || true
 @dirrm include/kpathsea