From 9a0b1e3a6c4bbdeba34def320c46a5001c2c985f Mon Sep 17 00:00:00 2001 From: uebayasi Date: Mon, 16 Sep 2002 08:47:27 +0000 Subject: Add ASCII pTeX 3.0.1 support. pTeX 3.0.1 - BSD license. - Fix hyphenation bug. - Catch up newer teTeX. dvipsk 1.5g - Fix tategaki tpic bug. - Fix PSTricks bug when FMapType is 9. - Support B4/B5 papersize by default. mendex 2.5 - BSD license - Fix -s option bug. - Change -c option. - Support new styles (delim_t, suffix_2p, suffix_3p, suffix_mp, heading_flag, heading_prefix, symhead_positive, symhead_negative). - Change escape behavier. - Other bug fixes. Bump PKGREVISION to 3. --- print/texfamily/Makefile | 75 ++++++++++++++++++++++------------------ print/texfamily/distinfo | 22 ++++++------ print/texfamily/patches/patch-aa | 28 +++++++-------- print/texfamily/patches/patch-ab | 28 ++++++++------- 4 files changed, 82 insertions(+), 71 deletions(-) (limited to 'print/texfamily') diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile index b2bca3aeb2d..e3c4bb6ad14 100644 --- a/print/texfamily/Makefile +++ b/print/texfamily/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/16 08:47:27 uebayasi Exp $ DISTNAME= TeXfamily-1.2.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= japanese print MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \ ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2.1/ \ @@ -16,18 +16,18 @@ DISTFILES= texfam-1.2${EXTRACT_SUFX} \ web2c-m0.8.1${EXTRACT_SUFX} \ dvi2ps-3.2j${EXTRACT_SUFX} \ jmakeindex${EXTRACT_SUFX} \ - ptex-src-2.1.10${EXTRACT_SUFX} \ - dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \ - mendexk2.4f${EXTRACT_SUFX} + ptex-src-${TEXFAMILY_PTEXVERSION}${EXTRACT_SUFX} \ + dvipsk-jpatch-p${TEXFAMILY_DVIPSVERSION}${EXTRACT_SUFX} \ + mendexk${TEXFAMILY_MENDEXVERSION}${EXTRACT_SUFX} PATCH_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ -PATCHFILES= ptex2.1.10-11.patch -PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-src-2.1.10 +PATCHFILES= ptex-src-${TEXFAMILY_PTEXVERSION}.patch +PATCH_DIST_ARGS= -d ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION} MAINTAINER= kei@netbsd.org COMMENT= TeXfamily (pTeX, JTeX, MuLTeX) - executables -DEPENDS+= TeXfamily-share>=1.2.1nb2:../../print/texfamily-share +DEPENDS+= TeXfamily-share>=1.2.1nb3:../../print/texfamily-share DEPENDS+= ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib DIST_SUBDIR= TeXfamily @@ -76,6 +76,11 @@ CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ INSTALL_DATA="${INSTALL_DATA}" +# Local versions +TEXFAMILY_PTEXVERSION= 3.0.1 +TEXFAMILY_DVIPSVERSION= 1.5g +TEXFAMILY_MENDEXVERSION=2.5 + pre-extract: if [ ! -e ${WRKSRC} ]; then \ cd ../../print/teTeX-bin && ${MAKE} patch; \ @@ -94,20 +99,20 @@ post-extract: -C ${WRKSRC}/texk ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/web2c-m0.8.1${EXTRACT_SUFX} \ -C ${WRKSRC}/texk - ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ptex-src-2.1.10${EXTRACT_SUFX} \ + ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/ptex-src-${TEXFAMILY_PTEXVERSION}${EXTRACT_SUFX} \ -C ${WRKSRC}/texk/web2c ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/dvi2ps-3.2j${EXTRACT_SUFX} \ -C ${WRKSRC}/texk ${GTAR} -xzf \ - ${DISTDIR}/${DIST_SUBDIR}/dvipsk-jpatch-p1.5e${EXTRACT_SUFX} \ + ${DISTDIR}/${DIST_SUBDIR}/dvipsk-jpatch-p${TEXFAMILY_DVIPSVERSION}${EXTRACT_SUFX} \ -C ${WRKDIR} - ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mendexk2.4f${EXTRACT_SUFX} \ + ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/mendexk${TEXFAMILY_MENDEXVERSION}${EXTRACT_SUFX} \ -C ${WRKSRC}/texk ${GTAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/jmakeindex${EXTRACT_SUFX} \ -C ${WRKSRC}/texk - ${SED} -e "s|\$TEXMF/ptex/plain/||" \ + ${SED} -e "s|\$$TEXMF/ptex/plain/||" \ ${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \ - ${WRKSRC}/texk/web2c/ptex-src-2.1.10/ptex.tex + ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}/ptex.tex ${RM} -f ${WRKSRC}/texmf ${WRKSRC}/texmf.local ${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC} ${LN} -s ${LOCALBASE}/share/texmf.local ${WRKSRC} @@ -115,47 +120,49 @@ post-extract: pre-patch: ${PATCH} -d ${WRKSRC}/texk/dvipsk --quiet -E -p1 < \ ${WRKDIR}/dvipsk586.patch +# ${PATCH} -d ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION} \ +# --quiet -E -p0 < ${DISTDIR}/${DIST_SUBDIR}/ptex-src-${TEXFAMILY_PTEXVERSION}.patch post-patch: ${MV} ${WRKSRC}/texk/kpathsea/texmf.in \ ${WRKSRC}/texk/kpathsea/texmf.in.orig ${SED} -e 's,@TEXMFSITE@,${TEXMFSITE},' \ ${WRKSRC}/texk/kpathsea/texmf.in.orig > \ - ${WRKSRC}/texk/kpathsea/texmf.in + ${WRKSRC}/texk/kpathsea/texmf.in post-configure: - (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; \ - ./configure EUC ${LOCALBASE}/share/texmf.local) + cd ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}; \ + ./configure EUC ${LOCALBASE}/share/texmf.local do-build: - (cd ${WRKSRC}/texk/web2c; ${GMAKE}) - (cd ${WRKSRC}/texk/web2c-j; ${GMAKE}) - (cd ${WRKSRC}/texk/web2c-m; ${GMAKE}) - (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; ${GMAKE}) - (cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} ${MAKEFLAGS} all newlib) - (cd ${WRKSRC}/texk/dvipsk; ${GMAKE}) - (cd ${WRKSRC}/texk/mendexk2.4f; ${GMAKE}) - (cd ${WRKSRC}/texk/jmakeindex/src; ${MAKE} -f makefile.unx) + cd ${WRKSRC}/texk/web2c; ${GMAKE} + cd ${WRKSRC}/texk/web2c-j; ${GMAKE} + cd ${WRKSRC}/texk/web2c-m; ${GMAKE} + cd ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}; ${GMAKE} + cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} ${MAKEFLAGS} all newlib + cd ${WRKSRC}/texk/dvipsk; ${GMAKE} + cd ${WRKSRC}/texk/mendexk${TEXFAMILY_MENDEXVERSION}; ${GMAKE} + cd ${WRKSRC}/texk/jmakeindex/src; ${MAKE} -f makefile.unx do-install: - (cd ${WRKSRC}/texk/web2c-j; ${GMAKE} install) - (cd ${WRKSRC}/texk/web2c-m; ${GMAKE} install) - (cd ${WRKSRC}/texk/web2c/ptex-src-2.1.10; ${GMAKE} install) - (cd ${WRKSRC}/texk/dvi2ps-3.2j; \ - ${GMAKE} install install-lib install-MakePK install-lprdvi) - (cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} install install-man) + cd ${WRKSRC}/texk/web2c-j; ${GMAKE} install + cd ${WRKSRC}/texk/web2c-m; ${GMAKE} install + cd ${WRKSRC}/texk/web2c/ptex-${TEXFAMILY_PTEXVERSION}; ${GMAKE} install + cd ${WRKSRC}/texk/dvi2ps-3.2j; \ + ${GMAKE} install install-lib install-MakePK install-lprdvi + cd ${WRKSRC}/texk/dvi2ps-3.2j; ${GMAKE} install install-man ${INSTALL_DATA_DIR} ${LOCALBASE}/share/texmf.local/doc/dvi2ps ${INSTALL_DATA} ${WRKSRC}/texk/dvi2ps-3.2j/doc/* \ ${LOCALBASE}/share/texmf.local/doc/dvi2ps - (cd ${WRKSRC}/texk/dvipsk; \ + cd ${WRKSRC}/texk/dvipsk; \ ${SETENV} texmflcl=${LOCALBASE}/share/texmf.local \ - ${GMAKE} install) - ${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk2.4f/mendex ${PREFIX}/bin + ${GMAKE} install + ${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk${TEXFAMILY_MENDEXVERSION}/mendex ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/texk/jmakeindex/src/jmakeindex \ ${PREFIX}/bin post-install: - mktexlsr ${LOCALBASE}/share/texmf.local + ${LOCALBASE}/bin/mktexlsr ${LOCALBASE}/share/texmf.local pre-clean: cd ../../print/teTeX-bin && ${MAKE} clean diff --git a/print/texfamily/distinfo b/print/texfamily/distinfo index 8fac1094ff4..f8ac2065813 100644 --- a/print/texfamily/distinfo +++ b/print/texfamily/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ +$NetBSD: distinfo,v 1.2 2002/09/16 08:47:27 uebayasi Exp $ SHA1 (TeXfamily/texfam-1.2.tar.gz) = 510ef7048c1353a75d84d548738e8e2a94d83be9 Size (TeXfamily/texfam-1.2.tar.gz) = 154286 bytes @@ -14,16 +14,16 @@ SHA1 (TeXfamily/dvi2ps-3.2j.tar.gz) = 3f055f7388ebe9f9bf873374eda7c612462207fe Size (TeXfamily/dvi2ps-3.2j.tar.gz) = 171083 bytes SHA1 (TeXfamily/jmakeindex.tar.gz) = 14e68b3cbd0f80ae383b540a5391d8ccecc4ba57 Size (TeXfamily/jmakeindex.tar.gz) = 283656 bytes -SHA1 (TeXfamily/ptex-src-2.1.10.tar.gz) = d5d1cfe0f56d9b4bcd660486d1af8923bc935426 -Size (TeXfamily/ptex-src-2.1.10.tar.gz) = 132496 bytes -SHA1 (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 568bb4ed176603f43e3f5f0c25c6ff778d093399 -Size (TeXfamily/dvipsk-jpatch-p1.5e.tar.gz) = 23009 bytes -SHA1 (TeXfamily/mendexk2.4f.tar.gz) = aa65a16a2bc965877fb19e8798ee80790917c588 -Size (TeXfamily/mendexk2.4f.tar.gz) = 22371 bytes -SHA1 (TeXfamily/ptex2.1.10-11.patch) = 8fcef65143761e1862d9e9c80f98a2e5211f57b0 -Size (TeXfamily/ptex2.1.10-11.patch) = 4430 bytes -SHA1 (patch-aa) = dfc441babfff2fefee43dd38a6f1393859f1d370 -SHA1 (patch-ab) = 6dc92be09afbce61d62468873c21add1564ac02c +SHA1 (TeXfamily/ptex-src-3.0.1.tar.gz) = 132ac11c5fad0ffb34a10739d9eeb5fa8a5b0db3 +Size (TeXfamily/ptex-src-3.0.1.tar.gz) = 136635 bytes +SHA1 (TeXfamily/dvipsk-jpatch-p1.5g.tar.gz) = 0280863c8c4908d84b4f79475ec5407ad0ab8f81 +Size (TeXfamily/dvipsk-jpatch-p1.5g.tar.gz) = 24053 bytes +SHA1 (TeXfamily/mendexk2.5.tar.gz) = 223695d92aec02b4814b247bc1dbf5a6332f140d +Size (TeXfamily/mendexk2.5.tar.gz) = 25850 bytes +SHA1 (TeXfamily/ptex-src-3.0.1.patch) = f2d3f1d3a9e69241ea4da08fbb4c8cc11693c80a +Size (TeXfamily/ptex-src-3.0.1.patch) = 1169 bytes +SHA1 (patch-aa) = 03e327921d44ffb12f6ce8547553935fb0273f1c +SHA1 (patch-ab) = c6c2ed23121e14e9e123bfb6298743cfbd34f959 SHA1 (patch-ac) = eeb266e3fc5a6b646ffc498c08107a9dd76c6660 SHA1 (patch-ad) = 3292baba0f31f191c13a12dd3cd39e8bd2e091f7 SHA1 (patch-ae) = 644182534b6001d167b45b25378c33873563ef61 diff --git a/print/texfamily/patches/patch-aa b/print/texfamily/patches/patch-aa index 70cb9f4f8af..21d857c1419 100644 --- a/print/texfamily/patches/patch-aa +++ b/print/texfamily/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/16 08:47:28 uebayasi Exp $ ---- texk/web2c/ptex-src-2.1.10/Makefile.in.orig Thu Feb 8 17:56:34 2001 -+++ texk/web2c/ptex-src-2.1.10/Makefile.in Tue Oct 23 14:47:40 2001 +--- texk/web2c/ptex-3.0.1/Makefile.in.orig Fri Jan 18 17:25:31 2002 ++++ texk/web2c/ptex-3.0.1/Makefile.in @@ -4,10 +4,15 @@ default: programs formats @@ -19,8 +19,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ # Used for triptrap. DIFF = diff -@@ -105,6 +110,9 @@ - fi +@@ -96,6 +101,9 @@ + $(srcdir)/tie -c ptex.ch ptex.web ptex-base.ch $(srcsp) ### TFtoPL +ptftopl: tftopl @@ -28,9 +28,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + $(LN) tftopl ptftopl tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib) $(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES) - tftopl.o: tftopl.c kanji.h maintain.h ptexhelp.h -@@ -115,6 +123,9 @@ - $(srcdir)/tie -m tftopl.web $(srcdir)/tftopl.web $(srcdir)/tftopl.ch + tftopl.o: tftopl.c kanji.h ptexhelp.h +@@ -114,6 +122,9 @@ + ### PLtoTF +ppltotf: pltotf @@ -38,8 +38,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + $(LN) pltotf ppltotf pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib) $(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES) - pltotf.o: pltotf.c kanji.h maintain.h ptexhelp.h -@@ -135,6 +146,9 @@ + pltotf.o: pltotf.c kanji.h ptexhelp.h +@@ -141,6 +152,9 @@ $(LN) $(srcdir)/dvitype.web pdvitype.web ### jBibTeX @@ -48,8 +48,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + $(LN) jbibtex pjbibtex jbibtex: jbibtex.o jbibextra.o $(plib_o) $(kpathsea) $(proglib) $(kpathsea_link) jbibtex.o jbibextra.o $(plib_o) $(LOADLIBES) - jbibtex.o: jbibtex.c jbibextra.h kanji.h maintain.h ptexhelp.h -@@ -175,7 +189,12 @@ + jbibtex.o: jbibtex.c jbibextra.h kanji.h ptexhelp.h +@@ -182,7 +196,12 @@ texmf.cnf: $(kpathsea_dir)/texmf.cnf $(SHELL) $(thisdir)/mkconf $< > texmf.cnf @@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ ptex.fmt: ptex texmf.cnf $(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check -@@ -183,7 +202,7 @@ +@@ -190,7 +209,7 @@ platex.fmt: ptex texmf.cnf $(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check @@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ # This is meant to be called recursively, with $(files) set. prereq-check: $(kpathsea_dir)/kpsewhich -@@ -212,31 +231,31 @@ +@@ -219,31 +238,31 @@ # The actual binary executables and pool files. install-programs: $(programs) diff --git a/print/texfamily/patches/patch-ab b/print/texfamily/patches/patch-ab index 4cb9f956c35..ff77f59d6bc 100644 --- a/print/texfamily/patches/patch-ab +++ b/print/texfamily/patches/patch-ab @@ -1,17 +1,21 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ +$NetBSD: patch-ab,v 1.2 2002/09/16 08:47:28 uebayasi Exp $ ---- texk/web2c/ptex-src-2.1.10/configure.orig Tue Feb 29 15:25:45 2000 -+++ texk/web2c/ptex-src-2.1.10/configure Tue May 2 19:23:40 2000 -@@ -6,5 +6,5 @@ +--- texk/web2c/ptex-3.0.1/configure.orig Fri Jan 18 21:28:18 2002 ++++ texk/web2c/ptex-3.0.1/configure +@@ -8,7 +8,7 @@ + srcsp= printUsage () { -- echo "Usage: $progname {EUC|JIS|SJIS}" -+ echo "Usage: $progname {EUC|JIS|SJIS} texmf_local_dir" +- echo "Usage: $progname {EUC|JIS|SJIS} [-with-src-special]" ++ echo "Usage: $progname {EUC|JIS|SJIS} [-with-src-special] texmf_local_dir" exit 1 } -@@ -37,4 +37,4 @@ - export CONFIG_FILES CONFIG_HEADERS - ../config.status --sed -e "s/@kanjicode@/$kanjicode/" Makefile > $$ && mv -f $$ Makefile -+sed -e "s/@kanjicode@/$kanjicode/" -e "s|@texmflocal@|$2|" Makefile > $$ && mv -f $$ Makefile - exit 0 + +@@ -35,6 +35,7 @@ + CONFIGSED=config.sed + echo "s%@configopt@%$*%g" > $CONFIGSED + echo "s%@kanjicode@%$kanjicode%g" >> $CONFIGSED ++echo "s%@texmflocal@%$2%g" >> $CONFIGSED + if [ x$srcsp = xyes ]; then + echo "s%@SRCSP@%%g" >> $CONFIGSED + echo "s%@PLAIN@%#P#%g" >> $CONFIGSED -- cgit v1.2.3