1. Don't install texmf/dvips/base/* as it could upset dvips* packages.

2. Apply patch provided by ASCII to dvips/pstricks/pst-text.pro
3. Remove not really necessary message printed in pre-configure:.

6 files changed, 18 insertions, 80 deletions

diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 5f93497ce134..47906bde1ea3 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -1,4 +1,3 @@
-
 # New ports collection makefile for:	pTeX-common
 # Date created:		05 Oct 1997
 # Whom:			max
@@ -8,13 +7,13 @@
 
 PORTNAME=	ptex
 PORTVERSION=	2.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-common
-DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF}
-EXTRACT_ONLY=	${TETEX_SRC}
+DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF} ${DVIPSK_JPATCH}
+EXTRACT_ONLY=	${TETEX_SRC} ${DVIPSK_JPATCH}
 
 MAINTAINER=	max@FreeBSD.org
 
@@ -59,19 +58,17 @@ MAN1=				access.1 allcm.1 allneeded.1 amstex.1 \
 TETEX_SRC=	teTeX-src-1.0.7.tar.gz
 TETEX_TEXMF=	teTeX-texmf-1.0.2.tar.gz
 PTEX_TEXMF=	ptex-texmf-1.10.tar.gz
+DVIPSK_JPATCH=	dvipsk-jpatch-p1.5e.tar.gz
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 TEXMF_TREE=	${PREFIX}/share/texmf
 
-pre-configure:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!"
-	@${ECHO_MSG}
-
 pre-install:
 	@${MKDIR} ${TEXMF_TREE}
-	@tar zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
-	@tar zxf ${_DISTDIR}/${PTEX_TEXMF} -C ${TEXMF_TREE}
+	@${TAR} --exclude 'dvips/base/*' -zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
+	@${TAR} -zxf ${_DISTDIR}/${PTEX_TEXMF} -C ${TEXMF_TREE}
+	@${PATCH} -d ${TEXMF_TREE}/dvips/pstricks -E --quiet < ${WRKDIR}/PSTricks.patch
+	@${RM} ${TEXMF_TREE}/dvips/pstricks/pst-text.pro.orig
 # Following two commands are intended to be temporary until 
 # the original distribution is updated.
 	${MV} -f ${PREFIX}/share/texmf/tex/latex/base/latex.ltx ${WRKDIR}
diff --git a/japanese/ptex-base/distinfo b/japanese/ptex-base/distinfo
index 743ab1e25459..e42db735669e 100644
--- a/japanese/ptex-base/distinfo
+++ b/japanese/ptex-base/distinfo
@@ -1,3 +1,4 @@
 MD5 (teTeX/teTeX-src-1.0.7.tar.gz) = 2c6da2a45096c2fdc41b8de6a8af1a52
 MD5 (teTeX/teTeX-texmf-1.0.2.tar.gz) = 7811ed356cca07b16ea8422f00c3cd34
 MD5 (teTeX/ptex-texmf-1.10.tar.gz) = c9888b47fd08b723b611797130045ac3
+MD5 (teTeX/dvipsk-jpatch-p1.5e.tar.gz) = eadb029c39fc614de6366113cd2c142e
diff --git a/japanese/ptex-base/pkg-plist b/japanese/ptex-base/pkg-plist
index 3b3b4cfdf9f7..688284bcc4ea 100644
--- a/japanese/ptex-base/pkg-plist
+++ b/japanese/ptex-base/pkg-plist
@@ -2298,34 +2298,6 @@ share/texmf/doc/tetex/TETEXDOC.ps
 share/texmf/doc/tetex/TETEXDOC.tex
 share/texmf/doc/tetex/eutotex98-te.pdf
 share/texmf/doc/tetex/teTeX-FAQ
-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/color.pro
-share/texmf/dvips/base/cork.enc
-share/texmf/dvips/base/crop.pro
-share/texmf/dvips/base/dc.enc
-share/texmf/dvips/base/dvips.enc
-share/texmf/dvips/base/extex.enc
-share/texmf/dvips/base/finclude.pro
-share/texmf/dvips/base/funky.enc
-share/texmf/dvips/base/hps.pro
-share/texmf/dvips/base/mh2scr.enc
-share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/base/special.pro
-share/texmf/dvips/base/tex.pro
-share/texmf/dvips/base/tex256.enc
-share/texmf/dvips/base/texc.pro
-share/texmf/dvips/base/texmext.enc
-share/texmf/dvips/base/texmital.enc
-share/texmf/dvips/base/texmsym.enc
-share/texmf/dvips/base/texnansi.enc
-share/texmf/dvips/base/texps.pro
-share/texmf/dvips/base/xl2.enc
-share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/bluesky/psfonts.ams
 share/texmf/dvips/bluesky/psfonts.amz
 share/texmf/dvips/bluesky/psfonts.cm
@@ -9352,7 +9324,6 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/dvips/gsftopk
 @dirrm share/texmf/dvips/config
 @dirrm share/texmf/dvips/bluesky
-@dirrm share/texmf/dvips/base
 @dirrm share/texmf/dvips
 @dirrm share/texmf/doc/tetex
 @dirrm share/texmf/doc/ptex
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index 5f93497ce134..47906bde1ea3 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -1,4 +1,3 @@
-
 # New ports collection makefile for:	pTeX-common
 # Date created:		05 Oct 1997
 # Whom:			max
@@ -8,13 +7,13 @@
 
 PORTNAME=	ptex
 PORTVERSION=	2.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-common
-DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF}
-EXTRACT_ONLY=	${TETEX_SRC}
+DISTFILES=	${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF} ${DVIPSK_JPATCH}
+EXTRACT_ONLY=	${TETEX_SRC} ${DVIPSK_JPATCH}
 
 MAINTAINER=	max@FreeBSD.org
 
@@ -59,19 +58,17 @@ MAN1=				access.1 allcm.1 allneeded.1 amstex.1 \
 TETEX_SRC=	teTeX-src-1.0.7.tar.gz
 TETEX_TEXMF=	teTeX-texmf-1.0.2.tar.gz
 PTEX_TEXMF=	ptex-texmf-1.10.tar.gz
+DVIPSK_JPATCH=	dvipsk-jpatch-p1.5e.tar.gz
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 TEXMF_TREE=	${PREFIX}/share/texmf
 
-pre-configure:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!"
-	@${ECHO_MSG}
-
 pre-install:
 	@${MKDIR} ${TEXMF_TREE}
-	@tar zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
-	@tar zxf ${_DISTDIR}/${PTEX_TEXMF} -C ${TEXMF_TREE}
+	@${TAR} --exclude 'dvips/base/*' -zxf ${_DISTDIR}/${TETEX_TEXMF} -C ${TEXMF_TREE}
+	@${TAR} -zxf ${_DISTDIR}/${PTEX_TEXMF} -C ${TEXMF_TREE}
+	@${PATCH} -d ${TEXMF_TREE}/dvips/pstricks -E --quiet < ${WRKDIR}/PSTricks.patch
+	@${RM} ${TEXMF_TREE}/dvips/pstricks/pst-text.pro.orig
 # Following two commands are intended to be temporary until 
 # the original distribution is updated.
 	${MV} -f ${PREFIX}/share/texmf/tex/latex/base/latex.ltx ${WRKDIR}
diff --git a/japanese/ptex-common/distinfo b/japanese/ptex-common/distinfo
index 743ab1e25459..e42db735669e 100644
--- a/japanese/ptex-common/distinfo
+++ b/japanese/ptex-common/distinfo
@@ -1,3 +1,4 @@
 MD5 (teTeX/teTeX-src-1.0.7.tar.gz) = 2c6da2a45096c2fdc41b8de6a8af1a52
 MD5 (teTeX/teTeX-texmf-1.0.2.tar.gz) = 7811ed356cca07b16ea8422f00c3cd34
 MD5 (teTeX/ptex-texmf-1.10.tar.gz) = c9888b47fd08b723b611797130045ac3
+MD5 (teTeX/dvipsk-jpatch-p1.5e.tar.gz) = eadb029c39fc614de6366113cd2c142e
diff --git a/japanese/ptex-common/pkg-plist b/japanese/ptex-common/pkg-plist
index 3b3b4cfdf9f7..688284bcc4ea 100644
--- a/japanese/ptex-common/pkg-plist
+++ b/japanese/ptex-common/pkg-plist
@@ -2298,34 +2298,6 @@ share/texmf/doc/tetex/TETEXDOC.ps
 share/texmf/doc/tetex/TETEXDOC.tex
 share/texmf/doc/tetex/eutotex98-te.pdf
 share/texmf/doc/tetex/teTeX-FAQ
-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/color.pro
-share/texmf/dvips/base/cork.enc
-share/texmf/dvips/base/crop.pro
-share/texmf/dvips/base/dc.enc
-share/texmf/dvips/base/dvips.enc
-share/texmf/dvips/base/extex.enc
-share/texmf/dvips/base/finclude.pro
-share/texmf/dvips/base/funky.enc
-share/texmf/dvips/base/hps.pro
-share/texmf/dvips/base/mh2scr.enc
-share/texmf/dvips/base/psfonts.map
-share/texmf/dvips/base/special.pro
-share/texmf/dvips/base/tex.pro
-share/texmf/dvips/base/tex256.enc
-share/texmf/dvips/base/texc.pro
-share/texmf/dvips/base/texmext.enc
-share/texmf/dvips/base/texmital.enc
-share/texmf/dvips/base/texmsym.enc
-share/texmf/dvips/base/texnansi.enc
-share/texmf/dvips/base/texps.pro
-share/texmf/dvips/base/xl2.enc
-share/texmf/dvips/base/xt2.enc
 share/texmf/dvips/bluesky/psfonts.ams
 share/texmf/dvips/bluesky/psfonts.amz
 share/texmf/dvips/bluesky/psfonts.cm
@@ -9352,7 +9324,6 @@ share/texmf/xdvi/XDvi
 @dirrm share/texmf/dvips/gsftopk
 @dirrm share/texmf/dvips/config
 @dirrm share/texmf/dvips/bluesky
-@dirrm share/texmf/dvips/base
 @dirrm share/texmf/dvips
 @dirrm share/texmf/doc/tetex
 @dirrm share/texmf/doc/ptex