Upgrade, pTeX 2.1.5 -> 2.1.8.

4 files changed, 40 insertions, 22 deletions

diff --git a/japanese/ptex-sjis/Makefile b/japanese/ptex-sjis/Makefile
index 433dd533a123..d410a2b15893 100644
--- a/japanese/ptex-sjis/Makefile
+++ b/japanese/ptex-sjis/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	pTeX-sjis
-# Version required:	2.1.5
+# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
-# $Id: Makefile,v 1.3 1997/11/10 11:23:01 asami Exp $
+# $Id: Makefile,v 1.4 1997/11/22 01:38:54 asami Exp $
 #
 
-DISTNAME=	ptex215
-PKGNAME=	ja-ptex-sjis-2.1.5
+DISTNAME=	ptex218
+PKGNAME=	ja-ptex-sjis-2.1.8
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex215/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib13-sj.tar.gz
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-sj.tar.gz \
+		Makefile.in.patch.txt
 
 MAINTAINER=	max@FreeBSD.ORG
 
@@ -19,8 +20,9 @@ RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+DIST_SUBDIR=	ptex
 CONFIGURE_ARGS=	sjis
-WRKSRC=		${.CURDIR}/../ptex-common/work/web2c-7.0/web2c/${DISTNAME}
+WRKSRC=		${.CURDIR}/../ptex-common/work/web2c-7.2/web2c/${DISTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	default
 
@@ -34,10 +36,14 @@ pre-extract:
 
 post-extract:
 	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/work/web2c-7.0/web2c
+	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/work/web2c-7.2/web2c
+
+pre-patch:
+	@/usr/bin/uudecode -p ${DISTDIR}/${DIST_SUBDIR}/Makefile.in.patch.txt | \
+	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${EXTRACT_CMD} -C ${PREFIX} -zxf ${DISTDIR}/plib13-sj.tar.gz
+	@${EXTRACT_CMD} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-sj.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex-sjis/distinfo b/japanese/ptex-sjis/distinfo
index 1f683a7b9cd7..0bce798c9198 100644
--- a/japanese/ptex-sjis/distinfo
+++ b/japanese/ptex-sjis/distinfo
@@ -1,2 +1,3 @@
-MD5 (ptex215.tar.gz) = 4173cc4cc4e910eb2bf291eee75f86f4
-MD5 (plib13-sj.tar.gz) = 5a11669d26691b0655da230f7bd47831
+MD5 (ptex/ptex218.tar.gz) = f2cd2e3a0162b4bb8319562ec3331c65
+MD5 (ptex/plib-1.4-sj.tar.gz) = cfa5398229a399e1804c4ab6f094b185
+MD5 (ptex/Makefile.in.patch.txt) = c2fc4ffad2a90eabf7a8f0c645b4cd77
diff --git a/japanese/ptex-sjis/files/patch-aa b/japanese/ptex-sjis/files/patch-aa
index 6e9266b224aa..07380e757a4f 100644
--- a/japanese/ptex-sjis/files/patch-aa
+++ b/japanese/ptex-sjis/files/patch-aa
@@ -1,11 +1,20 @@
---- Makefile.in.orig	Wed Aug 27 16:07:43 1997
-+++ Makefile.in	Sun Oct  5 00:05:12 1997
-@@ -225,7 +225,7 @@
- 	$(SHELL) $(top_srcdir)/mkdirchain \
- 		$(texpooldir) $(web2cdir) $(fontnamedir)
- 	$(INSTALL_DATA) ptex.pool $(texpooldir)/ptex.pool
--	$(SHELL) $(thisdir)/mkconf $(web2cdir)
-+#	$(SHELL) $(thisdir)/mkconf $(web2cdir)
- # tcx files are a bad idea
- #	cd $(srcdir)/share && for f in *.tcx; do \
- #	  $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
+--- Makefile.in.orig	Wed Jun 24 07:02:38 1998
++++ Makefile.in	Wed Jun 24 07:03:31 1998
+@@ -3,7 +3,7 @@
+ 
+ kanjicode = @kanjicode@
+ 
+-default : programs formats
++default : programs #formats
+ 
+ programs=ptex tftopl pltotf pdvitype jbibtex
+ formats=ptex.fmt
+@@ -160,7 +160,7 @@
+ 
+ texmf.cnf: ../../kpathsea/texmf.cnf
+ 	cp ../../kpathsea/texmf.cnf texmf.cnf
+-	$(SHELL) $(thisdir)/mkconf $(thisdir)
++#	$(SHELL) $(thisdir)/mkconf $(thisdir)
+ 
+ dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf) 
+ 
diff --git a/japanese/ptex-sjis/pkg-plist b/japanese/ptex-sjis/pkg-plist
index 359c5e287004..b958955309ee 100644
--- a/japanese/ptex-sjis/pkg-plist
+++ b/japanese/ptex-sjis/pkg-plist
@@ -8,6 +8,7 @@ bin/virptex
 share/texmf/tex/ptex/jplain.tex
 share/texmf/tex/ptex/kinsoku.tex
 share/texmf/tex/ptex/ptex.tex
+share/texmf/plib-1.4-sj.txt
 share/texmf/fonts/tfm/ptex/goth10.tfm
 share/texmf/fonts/tfm/ptex/goth5.tfm
 share/texmf/fonts/tfm/ptex/goth6.tfm
@@ -87,6 +88,7 @@ share/texmf/fonts/source/ascgrp/ascgrp.mf
 share/texmf/fonts/source/ascgrp/ascii10.mf
 share/texmf/fonts/source/ascgrp/ascii36.mf
 share/texmf/fonts/source/ascgrp/ascii.mf
+share/texmf/doc/ptex/ptexskip.tex
 share/texmf/doc/ptex/jfm.tex
 share/texmf/doc/ptex/jtex.tex
 share/texmf/doc/ptex/jtexdoc.tex