summaryrefslogtreecommitdiff
path: root/print/ja-ptex-bin
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2006-06-24 10:52:23 +0000
committerhira <hira@pkgsrc.org>2006-06-24 10:52:23 +0000
commite2457043595144832abc0bb008838dc14cc5fb2f (patch)
tree15ca0bcdefafdb5d5b3ed4411eca348c58b95c04 /print/ja-ptex-bin
parent1c5fbac2673c27e4e566ead3328bd751301f9c83 (diff)
downloadpkgsrc-e2457043595144832abc0bb008838dc14cc5fb2f.tar.gz
Update ja-ptex-bin to 3.1.9. It's mostly a bug fix release.
- Use teTeX3. - Use print/teTeX/module.mk framework. - Don't modify installed teTeX-texmf files. - Remove INSTALL and DEINSTALL (no longer needed). - Make pjbibtex work (patch-al). Some fixes and improvements were submitted by minskim@ on tech-pkg-ja mailing list. This should fix PR pkg/32592. Changes from 3.1.8 to 3.1.9 2005/10/17: mkconf: Don't add tex/platex to search path of platex. ptex: Fix bug with TFM that uses LIG/ at begining of word. Changes from 3.1.7 to 3.1.8 2005/03/07: Makefile.in: Do run mktexlsr in `make install'. Makefile.in: INSTALL.txt: Adapt changes of teTeX-3.0's TEXMF directory. 2004/12/14: ptex: Fix handle of control sequence name. ptex: Fix recognition of ^^ after control sequence. ptex: Fix line feed position in terminal/log. Changes from 3.1.6 to 3.1.7 2004/12/09: ptex: Fix control sequence name that includes ^^ format. ptex: Sync a range of non-printable characters to 3.1.4. mkconf: Create TEXINPUTS for sjis, jis and euc encodings. Changes from 3.1.5 to 3.1.6 2004/12/02: ptex: Adapt tetex-2.99.4.20041128-beta. INSTALL.txt: Add comments for filename and TDS. Changes from 3.1.4 to 3.1.5 2004/11/29: ptex: Don't recognize ^^ format control sequence and next character as kanji. ptex: Output non-printable messages as ^^ format. 2004/11/08: ptex: After reading JIS encoded files, disable `kanjiin' state at end of file. 2004/10/12: pltotf: Fix build of TFM files from SJIS coded PL files. Changes from 3.1.3 to 3.1.4 2004/09/02: ptex: Don't recognize as kanji in following case: - Charactor of the end of line is a first byte of kanji. - ^^ format control sequence is a first byte of kanji. - Use \char in equation. ptex: Don't recognize as invalid character if a single byte character is a first byte of kanji. ptex: Make strict kanji recognition in \string. jbibtex: Dealing with CR. Correct Japaense translation of the contract. Changes from 3.1.2 to 3.1.3: 2003/10/07: ptex: Fix \kansujichar doesn't set a expected character with -kanji=sjis. 2003/09/30: ptex: Don't print non-printable characters to terminal/log. 2003/08/05: pconvert: Change usage message. Add $target option to fixwrites if it's pltotf, tftopl and pdvitype.
Diffstat (limited to 'print/ja-ptex-bin')
-rw-r--r--print/ja-ptex-bin/DEINSTALL12
-rw-r--r--print/ja-ptex-bin/INSTALL14
-rw-r--r--print/ja-ptex-bin/Makefile70
-rw-r--r--print/ja-ptex-bin/PLIST53
-rw-r--r--print/ja-ptex-bin/distinfo35
-rw-r--r--print/ja-ptex-bin/patches/patch-aa103
-rw-r--r--print/ja-ptex-bin/patches/patch-ab6
-rw-r--r--print/ja-ptex-bin/patches/patch-ac10
-rw-r--r--print/ja-ptex-bin/patches/patch-ad22
-rw-r--r--print/ja-ptex-bin/patches/patch-af24
-rw-r--r--print/ja-ptex-bin/patches/patch-ai32
-rw-r--r--print/ja-ptex-bin/patches/patch-ak8
-rw-r--r--print/ja-ptex-bin/patches/patch-al15
13 files changed, 203 insertions, 201 deletions
diff --git a/print/ja-ptex-bin/DEINSTALL b/print/ja-ptex-bin/DEINSTALL
deleted file mode 100644
index 11ff3e7f83c..00000000000
--- a/print/ja-ptex-bin/DEINSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:23:03 jlam Exp $
-
-TEXMF=@PREFIX@/share/texmf
-PSTRICKS=$TEXMF/dvips/pstricks
-
-case $STAGE in
-POST-DEINSTALL)
- $MV $TEXMF/web2c/texmf.cnf.orig $TEXMF/web2c/texmf.cnf
- $MV $PSTRICKS/pst-text.pro.orig $PSTRICKS/pst-text.pro
- @PREFIX@/bin/mktexlsr
- ;;
-esac
diff --git a/print/ja-ptex-bin/INSTALL b/print/ja-ptex-bin/INSTALL
deleted file mode 100644
index 9f786795e8d..00000000000
--- a/print/ja-ptex-bin/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 20:23:03 jlam Exp $
-
-TEXMF=@PREFIX@/share/texmf
-TEXMFLOCAL=@PREFIX@/share/texmf.local
-PSTRICKS=$TEXMF/dvips/pstricks
-
-case $STAGE in
-POST-INSTALL)
- $MV $TEXMF/web2c/texmf.cnf $TEXMF/web2c/texmf.cnf.orig
- $LN -s $TEXMFLOCAL/web2c/texmf.cnf $TEXMF/web2c/texmf.cnf
- @PATCH@ -d $PSTRICKS < $PSTRICKS/PSTricks.patch
- @PREFIX@/bin/mktexlsr
- ;;
-esac
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index 54196fa778b..ff16f7ea975 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/06/24 10:52:23 hira Exp $
DISTNAME= ptex-src-${PTEX_VERS}
PKGNAME= ja-ptex-bin-${PTEX_VERS}
-PKGREVISION= 5
CATEGORIES= print japanese
MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ \
ftp://ring.gr.jp/pub/text/TeX/ascii-ptex/tetex/
@@ -15,45 +14,39 @@ HOMEPAGE= http://www.ascii.co.jp/pb/ptex/
COMMENT= Publishing TeX (pTeX)
# XXX ${MAKE_VARIABLES} won't be extracted here. strange...
-SITES_dvipsk-jpatch-p1.6.tar.gz= \
+SITES_dvipsk-jpatch-p1.7a.tar.gz= \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
ftp://ring.gr.jp/pub/text/TeX/ascii-ptex/dvips/
-SITES_mendexk2.5.tar.gz= \
+SITES_mendexk2.6d.tar.gz= \
ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
ftp://ring.gr.jp/pub/text/TeX/ascii-ptex/mendex/
-DEPENDS+= ja-ptex-share>=2.1:../../print/ja-ptex-share
+DEPENDS+= ja-ptex-share>=2.4:../../print/ja-ptex-share
-.include "../../print/teTeX-bin/buildlink3.mk"
-.include "../../print/teTeX-bin/Makefile.common"
+.include "../../print/teTeX3-bin/buildlink3.mk"
+.include "../../print/teTeX3-bin/Makefile.common"
+.include "../../print/teTeX/module.mk"
-PTEX_VERS= 3.1.2
-DVIPSK_PATCH_VERS= p1.6
-MENDEXK_VERS= 2.5
+PTEX_VERS= 3.1.9
+DVIPSK_PATCH_VERS= p1.7a
+MENDEXK_VERS= 2.6d
DF_TETEX_BIN= tetex-src-${TETEX_BIN_VERS}${EXTRACT_SUFX}
DF_DVIPSK_PATCH= dvipsk-jpatch-${DVIPSK_PATCH_VERS}${EXTRACT_SUFX}
DF_MENDEXK= mendexk${MENDEXK_VERS}${EXTRACT_SUFX}
-WRKDIR_!= cd ${PKGSRCDIR}/print/teTeX-bin; ${MAKE} show-var VARNAME=WRKDIR
+WRKDIR_!= cd ${PKGSRCDIR}/print/teTeX3-bin; \
+ ${MAKE} show-var VARNAME=WRKDIR
TETEX_DIR= ${WRKDIR_}/tetex-src-${TETEX_BIN_VERS}
WRKSRC= ${TETEX_DIR}
-WRKSRC_PTEX= ${WRKSRC}/texk/web2c/${DISTNAME:S/-src//}
+WRKSRC_PTEX= ${WRKSRC}/texk/web2c/${DISTNAME}
EXTRACT_ONLY= # none
-TEXMF= ${PKG_TEXMFPREFIX}
-TEXMFLOCAL= ${PREFIX}/share/texmf.local
-FILES_SUBST+= TEXMFLOCAL=${TEXMFLOCAL:Q}
-FILES_SUBST+= TEXMFSITE=${TEXMFSITE:Q}
-FILES_SUBST+= WRKDIR_=${WRKDIR_:Q}
-#FILES_SUBST+= FILESDIR=${FILESDIR}
-FILES_SUBST+= PATCH=${PATCH:Q}
-
pre-extract:
if [ ! -r ${WRKSRC} ]; then \
- cd ../../print/teTeX-bin && ${MAKE} patch; \
+ cd ../../print/teTeX3-bin && ${MAKE} patch; \
elif [ ! -r ${WRKSRC_PTEX} ]; then \
- cd ../../print/teTeX-bin && ${MAKE} clean; ${MAKE} patch; \
+ cd ../../print/teTeX3-bin && ${MAKE} clean; ${MAKE} patch; \
fi;
post-extract:
@@ -69,45 +62,50 @@ post-extract:
cd ${WRKSRC}/texk; \
extract_file=${_DISTDIR:Q}/${DF_MENDEXK:Q}; \
${EXTRACT_CMD}
- ${SED} -e "s|\$$TEXMF/ptex/plain/||" \
- ${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
+ ${SED} -e "s|\$$PKG_TEXMFPREFIX/ptex/plain/||" \
+ ${PKG_LOCALTEXMFPREFIX}/ptex/plain/base/ptex.tex > \
${WRKSRC_PTEX}/ptex.tex
- ${RM} -f ${WRKSRC}/texmf ${WRKSRC}/texmf.local
- ${LN} -s ${LOCALBASE}/share/texmf ${WRKSRC}
- ${LN} -s ${LOCALBASE}/share/texmf.local ${WRKSRC}
+ ${RM} -f ${WRKSRC}/texmf
+ ${LN} -s ${PKG_TEXMFPREFIX} ${WRKSRC}
+ ${LN} -s ${PKG_LOCALTEXMFPREFIX} ${WRKSRC}
pre-patch:
${PATCH} -d ${WRKSRC}/texk -p0 -s \
- < ${WRKSRC}/texk/dvipsk-5.92b-${DVIPSK_PATCH_VERS}.patch
+ < ${WRKSRC}/texk/dvipsk-${DVIPSK_PATCH_VERS}.patch
post-patch:
${MV} ${WRKSRC}/texk/kpathsea/texmf.in \
${WRKSRC}/texk/kpathsea/texmf.in.orig
${SED} -e 's,@texmfsite@,${TEXMFSITE},' \
- -e 's,@texmflocal@,${TEXMFLOCAL},' \
+ -e 's,@texmflocal@,${PKG_LOCALTEXMFPREFIX},' \
${WRKSRC}/texk/kpathsea/texmf.in.orig > \
${WRKSRC}/texk/kpathsea/texmf.in
post-configure:
- cd ${WRKSRC_PTEX}; ./configure EUC ${TEXMFLOCAL}
+ cd ${WRKSRC_PTEX}; ./configure EUC ${PKG_LOCALTEXMFPREFIX}
do-build:
cd ${WRKSRC}/texk/web2c; ${MAKE_PROGRAM}
cd ${WRKSRC_PTEX}; ${MAKE_PROGRAM}
cd ${WRKSRC}/texk/dvipsk; ${MAKE_PROGRAM}
- cd ${WRKSRC}/texk/mendexk${MENDEXK_VERS}; ${MAKE_PROGRAM}
+ cd ${WRKSRC}/texk/mendexk${MENDEXK_VERS}; \
+ ./configure EUC; ${MAKE_PROGRAM} # This needs libkpathsea.a
do-install:
cd ${WRKSRC_PTEX}; \
- ${SETENV} texmflcl=${TEXMFLOCAL} ${MAKE_PROGRAM} install
+ ${SETENV} texmflcl=${PKG_LOCALTEXMFPREFIX} ${MAKE_PROGRAM} install
cd ${WRKSRC}/texk/dvipsk; \
- ${SETENV} texmflcl=${TEXMFLOCAL} ${MAKE_PROGRAM} install; \
- ${INSTALL_DATA} psfonts.map ${TEXMFLOCAL}/dvips/base
+ ${SETENV} texmflcl=${PKG_LOCALTEXMFPREFIX} ${MAKE_PROGRAM} install; \
+ ${INSTALL_DATA} psfonts.map ${PKG_LOCALTEXMFPREFIX}/dvips/base
${INSTALL_PROGRAM} ${WRKSRC}/texk/mendexk${MENDEXK_VERS}/mendex \
${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/texk/PSTricks.patch ${TEXMF}/dvips/pstricks
+ ${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks
+ cd ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks; \
+ ${CP} ${PKG_TEXMFPREFIX}-dist/dvips/pstricks/pst-text.pro .; \
+ ${PATCH} < ${WRKSRC}/texk/PSTricks.patch; \
+ ${RM} -f pst-text.pro.orig
pre-clean:
- cd ../../print/teTeX-bin && ${MAKE} clean
+ cd ../../print/teTeX3-bin && ${MAKE} clean
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-bin/PLIST b/print/ja-ptex-bin/PLIST
index da4926860a4..72574d7137e 100644
--- a/print/ja-ptex-bin/PLIST
+++ b/print/ja-ptex-bin/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
-bin/iniptex
+@comment $NetBSD: PLIST,v 1.2 2006/06/24 10:52:23 hira Exp $
bin/mendex
bin/pdvips
bin/pdvitype
@@ -8,27 +7,29 @@ bin/platex
bin/ppltotf
bin/ptex
bin/ptftopl
-bin/virptex
-share/texmf.local/dvips/base/color.pro
-share/texmf.local/dvips/base/crop.pro
-share/texmf.local/dvips/base/finclude.pro
-share/texmf.local/dvips/base/hps.pro
-share/texmf.local/dvips/base/psfonts.map
-share/texmf.local/dvips/base/special.pro
-share/texmf.local/dvips/base/tex.pro
-share/texmf.local/dvips/base/texc.pro
-share/texmf.local/dvips/base/texps.pro
-share/texmf.local/web2c/platex-euc.fmt
-share/texmf.local/web2c/platex-jis.fmt
-share/texmf.local/web2c/platex-sjis.fmt
-share/texmf.local/web2c/platex.fmt
-share/texmf.local/web2c/ptex-euc.fmt
-share/texmf.local/web2c/ptex-jis.fmt
-share/texmf.local/web2c/ptex-sjis.fmt
-share/texmf.local/web2c/ptex.fmt
-share/texmf.local/web2c/ptex.pool
-share/texmf.local/web2c/texmf.cnf
-share/texmf/dvips/pstricks/PSTricks.patch
-@dirrm share/texmf.local/web2c
-@dirrm share/texmf.local/dvips/base
-@dirrm share/texmf.local/dvips
+${PKG_LOCALTEXMFPREFIX}/dvips/base/color.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/crop.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/finclude.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/hps.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/psfonts.map
+${PKG_LOCALTEXMFPREFIX}/dvips/base/special.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/tex.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/texc.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/base/texps.pro
+${PKG_LOCALTEXMFPREFIX}/dvips/config/config.ps
+${PKG_LOCALTEXMFPREFIX}/dvips/pstricks/pst-text.pro
+${PKG_LOCALTEXMFPREFIX}/fonts/map/dvips/ptex/psfonts_jp.map
+${PKG_LOCALTEXMFPREFIX}/web2c/platex-euc.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/platex-jis.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/platex-sjis.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/platex.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/ptex-euc.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/ptex-jis.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/ptex-sjis.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/ptex.fmt
+${PKG_LOCALTEXMFPREFIX}/web2c/ptex.pool
+${PKG_LOCALTEXMFPREFIX}/web2c/texmf.cnf
+@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/pstricks
+@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/config
+@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips/base
+@dirrm ${PKG_LOCALTEXMFPREFIX}/dvips
diff --git a/print/ja-ptex-bin/distinfo b/print/ja-ptex-bin/distinfo
index 1e5d98ae11e..593e7f6613f 100644
--- a/print/ja-ptex-bin/distinfo
+++ b/print/ja-ptex-bin/distinfo
@@ -1,18 +1,19 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:51:43 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/06/24 10:52:23 hira Exp $
-SHA1 (teTeX/ptex-src-3.1.2.tar.gz) = fbd914342285e040604dd45b9b5082872d221f3e
-RMD160 (teTeX/ptex-src-3.1.2.tar.gz) = 643b4455fcf52917e6b712351b40061691db566b
-Size (teTeX/ptex-src-3.1.2.tar.gz) = 120185 bytes
-SHA1 (teTeX/dvipsk-jpatch-p1.6.tar.gz) = e9e0777a6ee72323a524064401f8a1f6f41d6470
-RMD160 (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 3cd48400e97cc2dabb2e82709c150dfb7c7c4517
-Size (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 28637 bytes
-SHA1 (teTeX/mendexk2.5.tar.gz) = 223695d92aec02b4814b247bc1dbf5a6332f140d
-RMD160 (teTeX/mendexk2.5.tar.gz) = f64df0613f0c7ca83610c7c46e83db758aa60af7
-Size (teTeX/mendexk2.5.tar.gz) = 25850 bytes
-SHA1 (patch-aa) = ced7e33041c245df48e96711a4b0ca73ed458240
-SHA1 (patch-ab) = 30a95db1843e17cd3526e71e8fe44ee97741a9b4
-SHA1 (patch-ac) = eeb266e3fc5a6b646ffc498c08107a9dd76c6660
-SHA1 (patch-ad) = 850682efe0c1a08f0b37d92938012fafa4acb467
-SHA1 (patch-af) = 0e26b4fb670c86f03df074b081e9ec6ba71773d9
-SHA1 (patch-ai) = f80e25688afa14c17b992e802dac6cfe47ac0cfc
-SHA1 (patch-ak) = a3bf357bf0c229bc5e5794d782d0777d16951941
+SHA1 (teTeX/ptex-src-3.1.9.tar.gz) = 816ca1bb43f8835a81a8804a3d6068f1710984bf
+RMD160 (teTeX/ptex-src-3.1.9.tar.gz) = 05aca5199437a5d5a99d531f33d04f2a472ca2f7
+Size (teTeX/ptex-src-3.1.9.tar.gz) = 131943 bytes
+SHA1 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 1b4051fe443fcffe2b12199fcf2df01550c57f32
+RMD160 (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = f9c1a12b17e3d0c904bfe0bb145f84b59eb74eff
+Size (teTeX/dvipsk-jpatch-p1.7a.tar.gz) = 26669 bytes
+SHA1 (teTeX/mendexk2.6d.tar.gz) = 462416b4e6c20cfdd8babad25e99c0468a048eb0
+RMD160 (teTeX/mendexk2.6d.tar.gz) = 79aa7aadb78c1db1fdb0247d2bb50fece9a37b7c
+Size (teTeX/mendexk2.6d.tar.gz) = 30503 bytes
+SHA1 (patch-aa) = dc1d81face4bd3a401628527706d42fcaf8df778
+SHA1 (patch-ab) = 7015dfdaa6cbaf50a91afd5682231b30a9f17d22
+SHA1 (patch-ac) = 43c6d4e27cbdbaf043800fe07b346a0d865d96a3
+SHA1 (patch-ad) = 52f6e2fe5a70cf8f618357edab114a648288fb4d
+SHA1 (patch-af) = c3d591ab2b9917c7a06355618b96662fe6a7b375
+SHA1 (patch-ai) = 4ad131be8273ff52ad0f3778a0b5bf3370f698eb
+SHA1 (patch-ak) = 2f0d690023d5dac50e99321e240992870f32304b
+SHA1 (patch-al) = 1755fe12a2e336cca619e8b61954b6205e4c3390
diff --git a/print/ja-ptex-bin/patches/patch-aa b/print/ja-ptex-bin/patches/patch-aa
index 7752af55840..9a28bbb9f7a 100644
--- a/print/ja-ptex-bin/patches/patch-aa
+++ b/print/ja-ptex-bin/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/web2c/ptex-3.1.2/Makefile.in.orig Fri Nov 22 14:20:16 2002
-+++ texk/web2c/ptex-3.1.2/Makefile.in Sat Feb 22 05:01:34 2003
-@@ -5,11 +5,16 @@
+--- texk/web2c/ptex-src-3.1.9/Makefile.in.orig 2005-03-07 15:30:44.000000000 +0900
++++ texk/web2c/ptex-src-3.1.9/Makefile.in 2006-06-24 16:39:39.000000000 +0900
+@@ -5,12 +5,18 @@
default: programs formats
@@ -12,15 +12,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
sjis-formats=ptex-sjis.fmt platex-sjis.fmt
ac_include ../../make/paths.mk
-+#
+
++#
+texmflcl = @texmflocal@
+web2c_lcl_dir = $(texmflcl)/web2c
+fmt_lcl_dir = $(web2c_lcl_dir)
+texpool_lcl_dir = $(web2c_lcl_dir)
-
++
# Used for triptrap.
DIFF = diff
-@@ -94,6 +99,9 @@
+ DIFFFLAGS =
+@@ -94,6 +100,9 @@
$(srcdir)/tie -c ptex.ch ptex.web ptex-base.ch
### TFtoPL
@@ -30,7 +32,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
tftopl: tftopl.o $(plib_o) $(kpathsea) $(proglib)
$(kpathsea_link) tftopl.o $(plib_o) $(LOADLIBES)
tftopl.o: tftopl.c kanji.h ptexhelp.h
-@@ -105,6 +113,9 @@
+@@ -105,6 +114,9 @@
### PLtoTF
@@ -40,7 +42,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
pltotf: pltotf.o $(plib_o) $(kpathsea) $(proglib)
$(kpathsea_link) pltotf.o $(plib_o) $(LOADLIBES)
pltotf.o: pltotf.c kanji.h ptexhelp.h
-@@ -125,6 +136,9 @@
+@@ -126,6 +138,9 @@
$(LN) $(srcdir)/dvitype.web pdvitype.web
### jBibTeX
@@ -49,81 +51,84 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/15 20:00:27 kei 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 ptexhelp.h
-@@ -167,11 +181,16 @@
+ jbibextra.o: jbibextra.c jbibd.h kanji.h ptexhelp.h
+@@ -168,11 +183,16 @@
texmf.cnf: $(kpathsea_dir)/texmf.cnf
- $(SHELL) $(thisdir)/mkconf $< > texmf.cnf
+ $(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
--dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
-+#dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf)
+-dumpenv = TEXMFCNF=$(thisdir)
++#dumpenv = TEXMFCNF=$(thisdir)
+newtexmf = $(srcdir)/../../texmf
-+newtexmflcl = $(srcdir)/../../texmf.local
++newtexmflcl = $(srcdir)/../../texmf-local
+texin = $(srcdir):{$(newtexmf),$(newtexmflcl)}/ptex//
+texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm/ptex//
+dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts):
ptex-euc.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
-- $(dumpenv) ./ptex -ini --kanji=euc --jobname=ptex-euc \\input ptex \\dump </dev/null
-+ $(dumpenv) ./ptex -ini --kanji=euc --jobname=ptex-euc \\input ptex \\dump </dev/null || ${TRUE} # XXX
+ $(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
+- $(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null
++ $(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null || ${TRUE} # XXX
ptex-sjis.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check
-@@ -179,7 +198,7 @@
+ $(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
+@@ -180,7 +200,7 @@
platex-euc.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check
-- $(dumpenv) ./ptex -ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null
-+ $(dumpenv) ./ptex -ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null || ${TRUE} # XXX
+ $(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
+- $(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null
++ $(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null || ${TRUE} # XXX
platex-sjis.fmt: ptex texmf.cnf
- $(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check
-@@ -212,7 +231,7 @@
+ $(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
+@@ -207,7 +227,6 @@
+
+ #
+ install: install-exec install-data
+- $(top_srcdir)/kpathsea/mktexlsr
+ install-exec:: install-links
+ install-data:: install-formats
+
+@@ -216,6 +235,8 @@
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
+ $(web2cdir)::
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
++$(fmt_lcl_dir)::
++ $(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir)
# The actual binary executables and pool files.
- install-programs: $(programs)
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpooldir)
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir) $(texpool_lcl_dir)
- for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
-
- # The links to ptex for each format and for {ini,vir}ptex.
-@@ -222,27 +241,28 @@
+ install-programs: $(programs) $(bindir)
+@@ -226,23 +247,24 @@
+ cd $(bindir) && (rm -f iniptex virptex platex; $(LN) ptex platex)
# Always do plain.*, so examples from the TeXbook (etc.) will work.
- install-formats: $(formats)
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(fmtdir)
-- for f in $(formats); do $(INSTALL_DATA) $$f $(fmtdir)/$$f; done
-- cd $(fmtdir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
-+ $(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir)
+-install-formats: $(formats) $(web2cdir)
+- for f in $(formats); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
+- cd $(web2cdir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
++install-formats: $(formats) $(fmt_lcl_dir)
+ for f in $(formats); do $(INSTALL_DATA) $$f $(fmt_lcl_dir)/$$f; done
+ cd $(fmt_lcl_dir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
$(LN) ptex-euc.fmt ptex-jis.fmt ;\
$(LN) platex-euc.fmt platex-jis.fmt)
-- cd $(fmtdir) && (rm -f ptex.fmt platex.fmt ;\
+- cd $(web2cdir) && (rm -f ptex.fmt platex.fmt ;\
+ cd $(fmt_lcl_dir) && (rm -f ptex.fmt platex.fmt ;\
$(LN) ptex-$(configkcode).fmt ptex.fmt ;\
$(LN) platex-$(configkcode).fmt platex.fmt )
# Auxiliary files.
install-data::
- $(SHELL) $(top_srcdir)/mkinstalldirs \
-- $(texpooldir) $(web2cdir) $(fontnamedir)
-- $(INSTALL_DATA) ptex.pool $(texpooldir)/ptex.pool
+- $(SHELL) $(top_srcdir)/mkinstalldirs $(web2cdir)
+- $(INSTALL_DATA) ptex.pool $(web2cdir)/ptex.pool
- if [ -f $(web2cdir)/texmf.cnf ]; then \
- mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
- else true; fi
- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf
++ $(SHELL) $(top_srcdir)/mkinstalldirs \
+ $(texpool_lcl_dir) $(web2c_lcl_dir) $(fontnamedir)
+ $(INSTALL_DATA) ptex.pool $(texpool_lcl_dir)/ptex.pool
-+# package system handles this file in case binary packages.
+# if [ -f $(web2cdir)/texmf.cnf ]; then \
+# mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\
+# else true; fi
+ $(INSTALL_DATA) texmf.cnf $(web2c_lcl_dir)/texmf.cnf
- # tcx files
- # cd $(thisdir)/share && \
--# for f in *.tcx; do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
-+# for f in *.tcx; do $(INSTALL_DATA) $$f $(web2c_lcl_dir)/$$f; done
- # map files are not provided with pTeX
- # cd $(thisdir)/share && \
- # for f in *.map; do $(INSTALL_DATA) $$f $(fontnamedir)/$$f; done
+ #
+ # Testing, including triptrap. The `x' filenames are for output.
+ check: pltotf-check tftopl-check pooltype-check ptex-check
diff --git a/print/ja-ptex-bin/patches/patch-ab b/print/ja-ptex-bin/patches/patch-ab
index 838ee17a778..a55aa85eb6e 100644
--- a/print/ja-ptex-bin/patches/patch-ab
+++ b/print/ja-ptex-bin/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/web2c/ptex-3.1.2/configure.orig Fri Nov 22 14:20:16 2002
-+++ texk/web2c/ptex-3.1.2/configure Fri Feb 21 21:21:10 2003
+--- texk/web2c/ptex-src-3.1.9/configure.orig 2006-05-10 15:14:20.000000000 +0900
++++ texk/web2c/ptex-src-3.1.9/configure 2006-05-10 15:14:20.000000000 +0900
@@ -5,7 +5,7 @@
configopt=
diff --git a/print/ja-ptex-bin/patches/patch-ac b/print/ja-ptex-bin/patches/patch-ac
index fea29b2e56c..15801a390e2 100644
--- a/print/ja-ptex-bin/patches/patch-ac
+++ b/print/ja-ptex-bin/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-ac,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/make/paths.mk.orig Mon Jan 11 00:42:53 1999
-+++ texk/make/paths.mk Wed May 3 03:48:36 2000
-@@ -47,5 +47,5 @@
+--- texk/make/paths.mk.orig 2006-05-10 15:15:03.000000000 +0900
++++ texk/make/paths.mk 2006-05-10 15:15:18.000000000 +0900
+@@ -47,7 +47,7 @@
+ texmf = @texmfmain@
# The directory used by varfonts.
-vartexfonts = /var/tmp/texfonts
+vartexfonts = /var/spool/texfonts
# Regular input files.
+ texinputdir = $(texmf)/tex
diff --git a/print/ja-ptex-bin/patches/patch-ad b/print/ja-ptex-bin/patches/patch-ad
index 3d75ba338cb..a05a59faa8f 100644
--- a/print/ja-ptex-bin/patches/patch-ad
+++ b/print/ja-ptex-bin/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-ad,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/dvipsk/Makefile.in.orig Sat Feb 1 03:07:46 2003
-+++ texk/dvipsk/Makefile.in Fri Feb 21 21:26:05 2003
-@@ -18,6 +18,7 @@
- ac_include ../make/programs.mk
+--- texk/dvipsk/Makefile.in.orig 2006-05-11 16:30:49.000000000 +0900
++++ texk/dvipsk/Makefile.in 2006-05-11 16:34:55.000000000 +0900
+@@ -19,6 +19,7 @@
+ ac_include ../make/cross.mk
ac_include ../make/texi.mk
prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes -DSHIFTLOWCHARS
+psheaderdir = $(texmflcl)/dvips
# The `t[mp]-' business is so that we don't create an empty .pro file,
# if running squeeze fails for some reason. A dependency on squeeze
-@@ -36,13 +37,16 @@
+@@ -37,13 +38,16 @@
pprescan.o papersiz.o color.o bbox.o hps.o t1part.o
program = dvips
@@ -28,12 +28,14 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
afm2tfm: $(kpathsea) afm2tfm.o
$(kpathsea_link) afm2tfm.o $(LOADLIBES)
# Omit LOADLIBES since no need to dynamically link with kpathsea.
-@@ -96,6 +100,8 @@
- # >/dev/null; then \
+@@ -110,8 +114,8 @@
# $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \
# else true; fi
-+
-+#_installed:
+ # psfonts_jp.map.
+- $(INSTALL) -d $(texmf)/fonts/map/dvips/ptex
+- $(INSTALL_DATA) $(srcdir)/psfonts_jp.map $(texmf)/fonts/map/dvips/ptex/psfonts_jp.map
++ $(INSTALL) -d $(texmflcl)/fonts/map/dvips/ptex
++ $(INSTALL_DATA) $(srcdir)/psfonts_jp.map $(texmflcl)/fonts/map/dvips/ptex/psfonts_jp.map
# Info files.
cd $(srcdir) && for i in $(program).i*; do \
$(INSTALL_DATA) $$i $(infodir)/$$i; done
diff --git a/print/ja-ptex-bin/patches/patch-af b/print/ja-ptex-bin/patches/patch-af
index beb25fddd4a..83db7632e99 100644
--- a/print/ja-ptex-bin/patches/patch-af
+++ b/print/ja-ptex-bin/patches/patch-af
@@ -1,13 +1,17 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-af,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/web2c/Makefile.in.orig Sun Feb 2 01:51:16 2003
-+++ texk/web2c/Makefile.in Fri Feb 21 21:29:05 2003
-@@ -479,7 +479,7 @@
+--- texk/web2c/Makefile.in.orig 2005-02-06 19:56:56.000000000 +0900
++++ texk/web2c/Makefile.in 2006-05-10 15:19:59.000000000 +0900
+@@ -816,9 +816,9 @@
+ $(dumpenv) $(MAKE) progname=tex files="plain.tex cmr10.tfm" prereq-check
+ $(dumpenv) ./tex --progname=tex --jobname=tex --ini \\input plain \\dump </dev/null
- latex.fmt: tex
- $(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
-- $(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null
-+ $(dumpenv) ./tex --progname=latex --ini \\input latex.ltx </dev/null || ${TRUE} # XXX
+-#latex.fmt: tex
+-# $(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
+-# $(dumpenv) ./tex --progname=latex --jobname=latex --ini \\input latex.ltx </dev/null
++latex.fmt: tex
++ $(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check
++ $(dumpenv) ./tex --progname=latex --jobname=latex --ini \\input latex.ltx </dev/null || ${TRUE} # XXX
- etex.efmt: etex
- $(dumpenv) $(MAKE) progname=etex files="etex.src plain.tex cmr10.tfm" prereq-check
+ olatex.fmt: tex
+ $(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check
diff --git a/print/ja-ptex-bin/patches/patch-ai b/print/ja-ptex-bin/patches/patch-ai
index 8878658322f..1dc15e21869 100644
--- a/print/ja-ptex-bin/patches/patch-ai
+++ b/print/ja-ptex-bin/patches/patch-ai
@@ -1,25 +1,25 @@
-$NetBSD: patch-ai,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-ai,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/kpathsea/texmf.in.orig Sun Jan 19 20:58:27 2003
-+++ texk/kpathsea/texmf.in Fri Feb 21 21:31:58 2003
-@@ -58,7 +58,10 @@
- TEXMFMAIN = @texmf@
-
- % A place for local additions to a "standard" texmf tree. For example:
+--- texk/kpathsea/texmf.in.orig 2006-05-10 15:20:38.000000000 +0900
++++ texk/kpathsea/texmf.in 2006-05-10 15:22:46.000000000 +0900
+@@ -64,7 +64,10 @@
+ % A place for local additions to a "standard" texmf tree.
+ % This tree is not used for local configuration maintained by
+ % texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = @texmf@-local
+TEXMFLOCAL = @texmflocal@
+
+% Add site-specific configurations as well as above.
+TEXMFSITE = @texmfsite@
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
-@@ -74,7 +77,7 @@
- % - list $VARTEXMF in the TEXMF definition;
- % - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- % TEXMF = $TEXMFMAIN
--TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+TEXMF = {$HOMETEXMF,!!$TEXMFSITE,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+ % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
+ % With teTeX-3.0 or later, this must be set.
+@@ -111,7 +114,7 @@
+ %
+ % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named
+ % explicitly and before all other trees.
+-TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
++TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFSITE,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}
% The system trees. These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMF
+ SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
diff --git a/print/ja-ptex-bin/patches/patch-ak b/print/ja-ptex-bin/patches/patch-ak
index 160843565a7..82045711167 100644
--- a/print/ja-ptex-bin/patches/patch-ak
+++ b/print/ja-ptex-bin/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+$NetBSD: patch-ak,v 1.2 2006/06/24 10:52:23 hira Exp $
---- texk/configure.orig Fri Mar 14 19:35:52 2003
-+++ texk/configure Fri Mar 14 19:37:12 2003
-@@ -1894,7 +1894,7 @@
+--- texk/configure.orig 2005-02-07 03:27:03.000000000 +0900
++++ texk/configure 2006-05-10 15:24:14.000000000 +0900
+@@ -6595,7 +6595,7 @@
done
diff --git a/print/ja-ptex-bin/patches/patch-al b/print/ja-ptex-bin/patches/patch-al
new file mode 100644
index 00000000000..3a05ed18468
--- /dev/null
+++ b/print/ja-ptex-bin/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 2006/06/24 10:52:23 hira Exp $
+
+--- texk/web2c/ptex-src-3.1.9/mkconf.orig 2006-05-11 10:57:32.000000000 +0900
++++ texk/web2c/ptex-src-3.1.9/mkconf 2006-05-11 11:05:52.000000000 +0900
+@@ -46,8 +46,8 @@
+ TEXINPUTS.ptex = $ptex_inputs\
+
+ /^% BibTeX bibliographies and style files./ a\
+-BIBINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//\
+-BSTINPUTS.jbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//\
++BIBINPUTS.pjbibtex = .;$TEXMF/{jbibtex,bibtex}/bib//\
++BSTINPUTS.pjbibtex = .;$TEXMF/{jbibtex,bibtex}/bst//\
+ ' | uniq
+
+ ### EOT ###