diff options
Diffstat (limited to 'print/texfamily/patches')
| -rw-r--r-- | print/texfamily/patches/patch-aa | 116 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ab | 17 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ac | 11 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ad | 39 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ae | 63 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-af | 13 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ag | 13 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ah | 44 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-ai | 23 | ||||
| -rw-r--r-- | print/texfamily/patches/patch-aj | 13 |
10 files changed, 352 insertions, 0 deletions
diff --git a/print/texfamily/patches/patch-aa b/print/texfamily/patches/patch-aa new file mode 100644 index 00000000000..70cb9f4f8af --- /dev/null +++ b/print/texfamily/patches/patch-aa @@ -0,0 +1,116 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 12:59:56 seb 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 +@@ -4,10 +4,15 @@ + + default: programs formats + +-programs=ptex tftopl pltotf pdvitype jbibtex ++programs=ptex ptftopl ppltotf pdvitype pjbibtex + formats=ptex.fmt platex.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 +@@ -105,6 +110,9 @@ + fi + + ### TFtoPL ++ptftopl: tftopl ++ rm -f ptftopl ++ $(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 + + ### PLtoTF ++ppltotf: pltotf ++ rm -f ppltotf ++ $(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 @@ + $(LN) $(srcdir)/dvitype.web pdvitype.web + + ### jBibTeX ++pjbibtex: jbibtex ++ rm -f pjbibtex ++ $(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 @@ + texmf.cnf: $(kpathsea_dir)/texmf.cnf + $(SHELL) $(thisdir)/mkconf $< > texmf.cnf + +-dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf) ++#dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf) ++newtexmf = $(srcdir)/../../texmf ++newtexmflcl = $(srcdir)/../../texmf.local ++texin = $(srcdir):{$(newtexmf),$(newtexmflcl)}/ptex// ++texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm/ptex// ++dumpenv = TEXMFCNF=../../kpathsea TEXINPUTS=.:$(texin): TEXFONTS=$(texfonts): + + ptex.fmt: ptex texmf.cnf + $(dumpenv) $(MAKE) $(makeargs) files="--progname=ptex ptex.tex min10.tfm" prereq-check +@@ -183,7 +202,7 @@ + + platex.fmt: ptex texmf.cnf + $(dumpenv) $(MAKE) $(makeargs) files="--progname=platex platex.ltx" prereq-check +- $(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null ++ $(dumpenv) ./ptex -ini --progname=platex \\input platex.ltx </dev/null || ${TRUE} + + # This is meant to be called recursively, with $(files) set. + prereq-check: $(kpathsea_dir)/kpsewhich +@@ -212,31 +231,31 @@ + + # 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. + install-links: install-programs + cd $(bindir) && \ +- (rm -f iniptex virptex; $(LN) ptex iniptex; $(LN) ptex virptex) ++ (rm -f iniptex virptex platex; $(LN) ptex iniptex; $(LN) ptex virptex; $(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 ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(fmt_lcl_dir) ++ for f in $(formats); do $(INSTALL_DATA) $$f $(fmt_lcl_dir)/$$f; done + + # Auxiliary files. + install-data:: + $(SHELL) $(top_srcdir)/mkinstalldirs \ +- $(texpooldir) $(web2cdir) $(fontnamedir) +- $(INSTALL_DATA) ptex.pool $(texpooldir)/ptex.pool +- if [ -f $(web2cdir)/texmf.cnf ]; then \ +- mv -f $(web2cdir)/texmf.cnf $(web2cdir)/texmf.cnf.orig ;\ ++ $(texpool_lcl_dir) $(web2c_lcl_dir) $(fontnamedir) ++ $(INSTALL_DATA) ptex.pool $(texpool_lcl_dir)/ptex.pool ++ if [ -f $(web2c_lcl_dir)/texmf.cnf ]; then \ ++ mv -f $(web2c_lcl_dir)/texmf.cnf $(web2c_lcl_dir)/texmf.cnf.orig ;\ + else true; fi +- $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf ++ $(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 diff --git a/print/texfamily/patches/patch-ab b/print/texfamily/patches/patch-ab new file mode 100644 index 00000000000..4cb9f956c35 --- /dev/null +++ b/print/texfamily/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 12:59:56 seb 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 @@ + + printUsage () { +- echo "Usage: $progname {EUC|JIS|SJIS}" ++ echo "Usage: $progname {EUC|JIS|SJIS} 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 diff --git a/print/texfamily/patches/patch-ac b/print/texfamily/patches/patch-ac new file mode 100644 index 00000000000..07cd147a3d9 --- /dev/null +++ b/print/texfamily/patches/patch-ac @@ -0,0 +1,11 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 12:59:56 seb 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 @@ + + # The directory used by varfonts. +-vartexfonts = /var/tmp/texfonts ++vartexfonts = /var/spool/texfonts + + # Regular input files. diff --git a/print/texfamily/patches/patch-ad b/print/texfamily/patches/patch-ad new file mode 100644 index 00000000000..da80a6e17d9 --- /dev/null +++ b/print/texfamily/patches/patch-ad @@ -0,0 +1,39 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/dvipsk/Makefile.in.orig Sat May 6 03:23:01 2000 ++++ texk/dvipsk/Makefile.in Sat May 6 03:52:33 2000 +@@ -19,4 +19,5 @@ + 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, +@@ -37,5 +38,5 @@ + + program = dvips +-programs = afm2tfm $(program) ++programs = pdvips + + +@@ -44,4 +45,7 @@ + $(program): $(kpathsea) $(objects) + $(kpathsea_link) $(objects) $(LOADLIBES) ++pdvips: $(program) ++ rm -f pdvips ++ ln $(program) pdvips + afm2tfm: $(kpathsea) afm2tfm.o + $(kpathsea_link) afm2tfm.o $(LOADLIBES) +@@ -82,6 +86,4 @@ + # PostScript prologues and encodings. + for h in $(prologues); do $(INSTALL_DATA) $$h $(psheaderdir)/base/$$h; done +- cd $(srcdir)/reencode && \ +- for e in *.enc; do $(INSTALL_DATA) $$e $(psheaderdir)/base/$$e; done + # config.ps. Any one config.ps will be wrong for most people, so don't + # install anything by default. +@@ -97,4 +99,6 @@ + $(INSTALL_DATA) $(srcdir)/psfonts.map $(psheaderdir)/base/psfonts.map; \ + else true; fi ++ ++_installed: + # Info files. + cd $(srcdir) && for i in $(program).i*; do \ diff --git a/print/texfamily/patches/patch-ae b/print/texfamily/patches/patch-ae new file mode 100644 index 00000000000..4a28381fa9e --- /dev/null +++ b/print/texfamily/patches/patch-ae @@ -0,0 +1,63 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/dvi2ps-3.2j/Makefile.orig Mon Sep 11 18:16:11 2000 ++++ texk/dvi2ps-3.2j/Makefile +@@ -2,16 +2,17 @@ + # your site: + # + # BINAREA and DVI2LIB are relative to PREFIX +-PREFIX=${DESTDIR}/usr/local ++#PREFIX=${DESTDIR}/usr/local + # where dvi2ps is installed + BINAREA=${PREFIX}/bin + # + # directory for dvi2ps: where the auxiliary files are installed +-DVI2LIB=${PREFIX}/lib/dvi2ps ++DVI2LIB=${PREFIX}/share/texmf.local/dvi2ps + # + # directory for man and doc + MANAREA=${PREFIX}/man +-JMANAREA=${PREFIX}/man/ja ++JMANAREA=${PREFIX}/man/ja_JP.EUC ++# XXX above should be ja_JP.eucJP. + DOCAREA=${PREFIX}/doc/dvi2ps + # + # name of default fontdesc file in your site +@@ -45,19 +46,19 @@ + FONTF = -DFREETYPE -DVFLIB + # FREETYPE -- FTLIB, FTINC + # VFLIB -- FTLIB, FTINC, VFLIB, VFLIBINC +-FTLIB = -L${PREFIX}/lib -lttf ++FTLIB = -R${PREFIX}/lib -L${PREFIX}/lib -lttf + FTINC = -I${PREFIX}/include/freetype +-VFLIB = -L${PREFIX}/lib -lVFlib2 ++VFLIB = -R${PREFIX}/lib -L${PREFIX}/lib -lVFlib2 -lttf -lintl + VFLIBINC = -I${PREFIX}/include + + # kpathsea +-KPSELIB = -L${PREFIX}/lib -lkpathsea ++KPSELIB = -R${PREFIX}/lib -L${PREFIX}/lib -lkpathsea + KPSEINC = -I${PREFIX}/include -DKPATHSEA + + # +-CC=gcc ++#CC=gcc + # +-CCFLAGS = -g -O -DPOSIX ++CCFLAGS = -O2 -DPOSIX + #CCFLAGS = -O # SUNOS 4.X etc ... + #CCFLAGS = -O -DPOSIX # NetBSD FreeBSD (gcc 2.X), Linux + #CCFLAGS = -O -DMSDOS -DPOSIX # DJGCC (gcc 2.X) +@@ -180,10 +181,8 @@ + ./tools/psstrip < color.psdoc > ${HDR}/color.ps + + install-man: +- ${INSTALL} -c -m 444 man/div2ps.1 ${MANAREA}/cat1/dvi2ps.1 +- ${INSTALL} -c -m 444 man/div2ps.man ${MANAREA}/man1/dvi2ps.1 +- ${INSTALL} -c -m 444 man/div2ps.1j ${JMANAREA}/cat1/dvi2ps.1 +- ${INSTALL} -c -m 444 man/div2ps.jman ${JMANAREA}/man1/dvi2ps.1 ++ ${INSTALL} -c -m 444 man/dvi2ps.man ${MANAREA}/man1/dvi2ps.1 ++ ${INSTALL} -c -m 444 man/dvi2ps.jman ${JMANAREA}/man1/dvi2ps.1 + + install-doc: + -mkdir ${DOCAREA} diff --git a/print/texfamily/patches/patch-af b/print/texfamily/patches/patch-af new file mode 100644 index 00000000000..3aaf977d69f --- /dev/null +++ b/print/texfamily/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/web2c/Makefile.in.orig Tue Sep 18 13:53:39 2001 ++++ texk/web2c/Makefile.in Tue Sep 18 13:54:03 2001 +@@ -443,7 +443,7 @@ + + latex.fmt: tex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=latex 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} + + latex209.fmt: tex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=latex209 lplain.tex" prereq-check diff --git a/print/texfamily/patches/patch-ag b/print/texfamily/patches/patch-ag new file mode 100644 index 00000000000..cd5ade6595e --- /dev/null +++ b/print/texfamily/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/web2c-j/Makefile.in.orig Mon Sep 17 18:08:21 2001 ++++ texk/web2c-j/Makefile.in Mon Sep 17 18:08:41 2001 +@@ -464,7 +464,7 @@ + + jlatex.fmt: jtex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex jlatex.ltx" prereq-check +- $(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null ++ $(dumpenv) ./jtex --progname=jlatex --ini \\input jlatex.ltx </dev/null || ${TRUE} + + jlatex209.fmt: jtex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=jlatex209 jlplain.tex" prereq-check diff --git a/print/texfamily/patches/patch-ah b/print/texfamily/patches/patch-ah new file mode 100644 index 00000000000..eaf9211c02d --- /dev/null +++ b/print/texfamily/patches/patch-ah @@ -0,0 +1,44 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/jmakeindex/src/makefile.unx.orig Fri Apr 13 15:00:08 2001 ++++ texk/jmakeindex/src/makefile.unx Fri Apr 13 15:15:04 2001 +@@ -6,7 +6,7 @@ + # University of California, Berkeley + # + +-DEST = /usr/local/bin ++DEST = ${PREFIX}/bin + + MANDIR = /usr/local/man/manl + +@@ -24,11 +24,9 @@ + + CFLAGS = -O + +-LDFLAGS = $(CFLAGS) +- + LIBS = + +-LINKER = cc ++LINKER = ${CC} + + MAKEFILE = Makefile + +@@ -48,7 +46,7 @@ + scanst.c \ + sortid.c + +-PROGRAM = makeindex ++PROGRAM = jmakeindex + + TAR = $(PROGRAM).tar + +@@ -62,7 +60,7 @@ + @size $(PROGRAM) + + install: $(PROGRAM) +- install -c -s -m 0755 $(PROGRAM) $(DEST) ++ ${INSTALL_PROGRAM} $(PROGRAM) $(DEST) + @ls -lgs $(DEST)/$(PROGRAM) + + tar:; @rm -f $(TAR) diff --git a/print/texfamily/patches/patch-ai b/print/texfamily/patches/patch-ai new file mode 100644 index 00000000000..7e6c3b10212 --- /dev/null +++ b/print/texfamily/patches/patch-ai @@ -0,0 +1,23 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/kpathsea/texmf.in.orig Mon Apr 16 16:50:18 2001 ++++ texk/kpathsea/texmf.in Mon Apr 16 16:53:20 2001 +@@ -60,6 +60,9 @@ + % A place for local additions to a "standard" texmf tree. For example: + 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). + % VARTEXMF = @texmf@-var +@@ -74,7 +77,7 @@ + % - list $VARTEXMF in the TEXMF definition; + % - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition. + %TEXMF = !!$TEXMFMAIN +-TEXMF = {!!$TEXMFLOCAL,!!$TEXMFMAIN} ++TEXMF = {!!$TEXMFSITE,!!$TEXMFLOCAL,!!$TEXMFMAIN} + + % The system trees. These are the trees that are shared by all the users. + SYSTEXMF = $TEXMF diff --git a/print/texfamily/patches/patch-aj b/print/texfamily/patches/patch-aj new file mode 100644 index 00000000000..5ec7dad5741 --- /dev/null +++ b/print/texfamily/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 12:59:56 seb Exp $ + +--- texk/web2c-m/Makefile.in.orig Tue Sep 18 15:37:37 2001 ++++ texk/web2c-m/Makefile.in Tue Sep 18 15:38:07 2001 +@@ -460,7 +460,7 @@ + + mullatex.fmt: multex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex mullatex.ltx" prereq-check +- $(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null ++ $(dumpenv) ./multex --progname=mullatex --ini \\input mullatex.ltx </dev/null || ${TRUE} + + mullatex209.fmt: multex + $(dumpenv) $(MAKE) $(makeargs) files="--progname=mullatex209 mullplain.tex" prereq-check |