Update to 3.1.4 and use texmf/web2c-ptex/texmf.cnf by default.

7 files changed, 97 insertions, 50 deletions

diff --git a/japanese/ptex-tetex/Makefile b/japanese/ptex-tetex/Makefile
index f8a4f5c..b4b5a06 100644
--- a/japanese/ptex-tetex/Makefile
+++ b/japanese/ptex-tetex/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	ptex-tetex
-PORTVERSION=	3.1.3
-PORTREVISION=	1
+PORTVERSION=	3.1.4
+PORTREVISION=	0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN} \
@@ -14,7 +14,8 @@ MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/dis
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/:2
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib
 PKGNAMEPREFIX=	ja-
-DISTFILES=	ptex-src-${VER_PTEX}${EXTRACT_SUFX}:1 ptex-texmf-2.1${EXTRACT_SUFX}:1 \
+DISTFILES=	ptex-src-${VER_PTEX}${EXTRACT_SUFX}:1 \
+		ptex-texmf-${VER_PTEXTEXMF}${EXTRACT_SUFX}:1 \
 		tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
 		jis${EXTRACT_SUFX}:2 morisawa${EXTRACT_SUFX}:2
 DIST_SUBDIR=	teTeX
@@ -22,12 +23,14 @@ DIST_SUBDIR=	teTeX
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	ASCII Japanese pTeX which supports teTeX distribution
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		mktexlsr:${PORTSDIR}/print/teTeX-base
-RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+		mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${LOCALBASE}/${TEXMFLOCAL}/tex/latex/base/latex.ltx:${PORTSDIR}/print/teTeX-latex2e
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		mktexlsr:${PORTSDIR}/print/teTeX-base
+		mktexlsr:${PORTSDIR}/print/teTeX-base \
+		${LOCALBASE}/${TEXMFLOCAL}/tex/latex/base/latex.ltx:${PORTSDIR}/print/teTeX-latex2e
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -38,12 +41,13 @@ CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 USE_GMAKE=	yes
-.if make(pre-build) || make(do-build)
-MAKE_ENV=	TEXMFLOCAL=${WRKDIR}/texmf-tmp
+.if make(post-extract) || make(do-build)
+MAKE_ENV=	TEXMFLOCAL=${WRKDIR}/texmf-tmp \
+		TEXMFDUMP=${LOCALBASE}/${TEXMFLOCAL}
 .endif
 ALL_TARGET=	default
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} TEXMFDIR=${TEXMFDIR}
-CONFLICTS=	ja-ptex-base*
+CONFLICTS=	ja-ptex-base-[0-9]*
 .if !make(do-patch)
 WRKSRC=		${WRKDIR}/tetex-src-${VER_TETEX}/texk/web2c/ptex-${VER_PTEX}
 .else
@@ -55,8 +59,11 @@ WRKSRC_PTEX=	${WRKDIR}/ptex-src-${VER_PTEX}
 
 VER_TETEX=	2.0.2
 VER_PTEX=	${PORTVERSION}
+VER_PTEXTEXMF=	2.2
 KANJICODE?=	euc
 TEXMFDIR?=	share/texmf
+TEXMFLOCAL?=	share/texmf-local
+TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R
 TEXMFCNF?=	${PREFIX}/${TEXMFDIR}/web2c/texmf.cnf
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 LIBPNG_PREFIX?=	${LOCALBASE}
@@ -66,7 +73,7 @@ LIBT1_PREFIX?=	${LOCALBASE}
 INSTDIRS=	doc fonts jbibtex ptex
 DOC_FILES=	COPYRIGHT COPYRIGHT.jis Changes.txt README.txt
 
-MAPDIR=		${PREFIX}/${TEXMFDIR}/dvips/ptex
+MAPDIR=		${PREFIX}/${TEXMFDIR}/dvips-ptex
 MAPFILES=	morisawa/morisawa.map jis/jis.map
 
 VFDIR=		${PREFIX}/${TEXMFDIR}/fonts/vf/ptex
@@ -123,6 +130,11 @@ TFMFILES=	jis/tfm/ptex/jis.tfm jis/tfm/ptex/jisg.tfm \
 
 post-extract:
 	${MV} ${WRKSRC_PTEX} ${WRKSRC}
+	${MKDIR} ${WRKDIR}/texmf-tmp
+	cd ${WRKDIR} && \
+		${MV} ${INSTDIRS} texmf-tmp && \
+		${RM} -f ptex/platex/base/.cvsignore
+	${SETENV} ${MAKE_ENV} ${MKTEXLSR} ${WRKDIR}/texmf-tmp
 
 pre-configure:
 	cd ${WRKSRC_TETEX} && \
@@ -144,17 +156,11 @@ pre-configure:
 			--with-etex=no && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
 
-pre-build:
-	${MKDIR} ${WRKDIR}/texmf-tmp
-	cd ${WRKDIR} && \
-		${TAR} cf - ${INSTDIRS} | \
-			(cd texmf-tmp && ${TAR} xf -) && \
-		${SETENV} ${MAKE_ENV} ${MKTEXLSR} ${WRKDIR}/texmf-tmp
-
 post-install:
-	cd ${WRKDIR} && \
+	cd ${WRKDIR}/texmf-tmp && \
 		${TAR} cf - ${INSTDIRS} | \
-			(cd ${PREFIX}/${TEXMFDIR} && ${TAR} xf -) && \
+			(cd ${PREFIX}/${TEXMFDIR} && ${TAR} xf -)
+	cd ${WRKDIR} && \
 		${INSTALL_DATA} ${DOC_FILES} ${PREFIX}/${TEXMFDIR}/doc/ptex
 .for D in MAP VF TFM
 	${MKDIR} ${${D}DIR}
diff --git a/japanese/ptex-tetex/distinfo b/japanese/ptex-tetex/distinfo
index 8e6b05d..4b67a85 100644
--- a/japanese/ptex-tetex/distinfo
+++ b/japanese/ptex-tetex/distinfo
@@ -1,7 +1,7 @@
-MD5 (teTeX/ptex-src-3.1.3.tar.gz) = 95aedfd68991f2ce0b1d94c8a662ef95
-SIZE (teTeX/ptex-src-3.1.3.tar.gz) = 120649
-MD5 (teTeX/ptex-texmf-2.1.tar.gz) = d0c01d4114dde202e96c97b1a2ef8523
-SIZE (teTeX/ptex-texmf-2.1.tar.gz) = 1864219
+MD5 (teTeX/ptex-src-3.1.4.tar.gz) = ffdcb5b304f3014077bfc227343e2ef1
+SIZE (teTeX/ptex-src-3.1.4.tar.gz) = 121053
+MD5 (teTeX/ptex-texmf-2.2.tar.gz) = 9171f289677684d97f28e95026e75426
+SIZE (teTeX/ptex-texmf-2.2.tar.gz) = 1866278
 MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
 SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
 MD5 (teTeX/jis.tar.gz) = 12fc14c4ed0530eab018c867b383eedb
diff --git a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in
index c61f2b0..566c364 100644
--- a/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/ptex-tetex/files/patch-texk::kpathsea::texmf.in
@@ -1,11 +1,5 @@
 --- texk/kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ texk/kpathsea/texmf.in	Sat Jun 12 12:34:24 2004
-@@ -1,4 +1,4 @@
--% original texmf.cnf -- runtime path configuration file for kpathsea.
-+% ptex-tetex texmf.cnf -- runtime path configuration file for kpathsea.
- % (If you change or delete `original' on the previous line, the
- % distribution won't install its version over yours.)
- % Public domain.
++++ texk/kpathsea/texmf.in	Fri Sep 17 14:23:28 2004
 @@ -62,7 +62,7 @@
  
  % If defined, teTeX's texconfig stores modifications here (instead of the
@@ -48,15 +42,50 @@
 -TEXPOOL = .;$TEXMF/web2c
 -MFPOOL = .;$TEXMF/web2c
 -MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFBASES = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPMEMS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+TEXPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
++TEXFORMATS = .;$TEXMF/web2c{-ptex,}
++MFBASES = .;$TEXMF/web2c{-ptex,}
++MPMEMS = .;$TEXMF/web2c{-ptex,}
++TEXPOOL = .;$TEXMF/web2c{-ptex,}
++MFPOOL = .;$TEXMF/web2c{-ptex,}
++MPPOOL = .;$TEXMF/web2c{-ptex,}
  
  % Device-independent font metric files.
  VFFONTS = .;$TEXMF/fonts/vf//
+@@ -246,8 +253,8 @@
+ MFTINPUTS = .;$TEXMF/mft//
+ 
+ % PostScript headers, prologues (.pro), encodings (.enc) and fonts.
+-TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
+-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//
++TEXPSHEADERS = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/{type1,truetype}}//
+ 
+ % PostScript Type 1 outline fonts.
+ T1FONTS = .;$TEXMF/fonts/type1//
+@@ -262,10 +269,10 @@
+ T42FONTS = .;$TEXMF/fonts/type42//
+ 
+ % Dvips' config.* files (this name should not start with `TEX'!).
+-TEXCONFIG = $TEXMF/dvips//
++TEXCONFIG = $TEXMF/dvips{-ptex,}//
+ 
+ % Makeindex style (.ist) files.
+-INDEXSTYLE = .;$TEXMF/makeindex//
++INDEXSTYLE = .;$TEXMF/makeindex{-ptex,}//
+ 
+ % Used by DMP (ditroff-to-mpx), called by makempx -troff.
+ TRFONTS = /usr/lib/font/devpost
+@@ -302,8 +309,8 @@
+ T4HTINPUTS   = .;$TEXMF/tex4ht//
+ 
+ % xdvik and dvipdfm can share some files with dvips
+-XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
+-DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
++XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{-ptex,}//
++DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{-ptex,}//
+ 
+ %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
+ % KPSE_DOT = .
 @@ -318,7 +325,7 @@
  %
  % For security reasons, it is better not to have . part of the path.
diff --git a/japanese/ptex-tetex/files/patch-texk::make::paths.mk b/japanese/ptex-tetex/files/patch-texk::make::paths.mk
index 2fbcb1e..1ad8412 100644
--- a/japanese/ptex-tetex/files/patch-texk::make::paths.mk
+++ b/japanese/ptex-tetex/files/patch-texk::make::paths.mk
@@ -1,5 +1,5 @@
---- texk/make/paths.mk.orig	Sat Jun 12 12:13:14 2004
-+++ texk/make/paths.mk	Sat Jun 12 12:13:04 2004
+--- texk/make/paths.mk.orig	Wed Nov 13 05:54:37 2002
++++ texk/make/paths.mk	Fri Sep 17 13:22:23 2004
 @@ -61,7 +61,7 @@
  dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
  
@@ -9,3 +9,12 @@
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
+@@ -80,7 +80,7 @@
+ fontnamedir = $(texmf)/fontname
+ 
+ # For dvips configuration files, psfonts.map, etc.
+-dvipsdir = $(texmf)/dvips
++dvipsdir = $(texmf)/dvips-ptex
+ 
+ # For dvips .pro files, gsftopk's render.ps, etc.
+ psheaderdir = $(dvipsdir)
diff --git a/japanese/ptex-tetex/files/patch-texk::web2c::ptex-3.1.3::Makefile.in b/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in
index caa498c..e1ac6b0 100644
--- a/japanese/ptex-tetex/files/patch-texk::web2c::ptex-3.1.3::Makefile.in
+++ b/japanese/ptex-tetex/files/patch-texk::web2c::ptex-ver::Makefile.in
@@ -1,5 +1,5 @@
---- texk/web2c/ptex-3.1.3/Makefile.in.orig	Tue Jun 17 14:30:40 2003
-+++ texk/web2c/ptex-3.1.3/Makefile.in	Sat Jun 12 13:06:37 2004
+--- texk/web2c/ptex-3.1.4/Makefile.in.orig	Tue Jun 17 14:30:40 2003
++++ texk/web2c/ptex-3.1.4/Makefile.in	Wed Sep 15 18:09:11 2004
 @@ -5,7 +5,7 @@
  
  default: programs formats
@@ -32,7 +32,7 @@
  	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
  
 -dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
-+dumpenv = TEXMFCNF=$(thisdir) TEXMF=\{$(texmf),${TEXMFLOCAL}\}
++dumpenv = TEXMFCNF=$(thisdir) TEXMF=\{${TEXMFDUMP},$(texmf),${TEXMFLOCAL}\}
  
  ptex-euc.fmt: ptex texmf.cnf
  	$(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
diff --git a/japanese/ptex-tetex/pkg-message b/japanese/ptex-tetex/pkg-message
index eba92e9..9e3237e 100644
--- a/japanese/ptex-tetex/pkg-message
+++ b/japanese/ptex-tetex/pkg-message
@@ -1,9 +1,12 @@
-*** NOTICE **********************************************************
+=== IMPORTANT NOTICE ===
 
- - The default texmf.cnf for pTeX is installed in
-   texmf/web2c-ptex/texmf.cnf.
+ - The standard texmf.cnf for pTeX is installed into
+   texmf/web2c-ptex/texmf.cnf and this is used by default.
+   Do not edit it directly; instead put the file to
+   texmf-var/web2c-ptex/texmf.cnf and edit it if you want
+   to customize it.
 
  - Japanized versions of "pltotf" and "tftopl" are installed
    as "pltotf-ptex" and "tftopl-ptex".
 
-*********************************************************************
+ - pLaTeX2e is now based on LaTeX2e as of 2003/12/01.
diff --git a/japanese/ptex-tetex/pkg-plist b/japanese/ptex-tetex/pkg-plist
index 2139f9d..f3a6740 100644
--- a/japanese/ptex-tetex/pkg-plist
+++ b/japanese/ptex-tetex/pkg-plist
@@ -241,7 +241,6 @@ bin/virptex
 %%TEXMFDIR%%/ptex/plain/config/ptex.ini
 @dirrm %%TEXMFDIR%%/ptex/plain/config
 @dirrm %%TEXMFDIR%%/ptex/plain
-%%TEXMFDIR%%/ptex/platex/base/.cvsignore
 %%TEXMFDIR%%/ptex/platex/base/Changes.txt
 %%TEXMFDIR%%/ptex/platex/base/README.txt
 %%TEXMFDIR%%/ptex/platex/base/README2.txt
@@ -296,6 +295,7 @@ bin/virptex
 %%TEXMFDIR%%/ptex/platex/base/plnews05.tex
 %%TEXMFDIR%%/ptex/platex/base/plnews06.tex
 %%TEXMFDIR%%/ptex/platex/base/plnews07.tex
+%%TEXMFDIR%%/ptex/platex/base/plnews08.tex
 %%TEXMFDIR%%/ptex/platex/base/plpatch.ltx
 %%TEXMFDIR%%/ptex/platex/base/plvers.dtx
 %%TEXMFDIR%%/ptex/platex/base/ptrace.sty
@@ -318,8 +318,8 @@ bin/virptex
 @dirrm %%TEXMFDIR%%/ptex/platex/config
 @dirrm %%TEXMFDIR%%/ptex/platex
 @dirrm %%TEXMFDIR%%/ptex
-%%TEXMFDIR%%/dvips/ptex/jis.map
-%%TEXMFDIR%%/dvips/ptex/morisawa.map
-@unexec rmdir %D/%%TEXMFDIR%%/dvips/ptex > /dev/null 2>&1
+%%TEXMFDIR%%/dvips-ptex/jis.map
+%%TEXMFDIR%%/dvips-ptex/morisawa.map
+@unexec rmdir %D/%%TEXMFDIR%%/dvips-ptex 2> /dev/null || true
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%