From 5dd0ae7771c0763b47a2202e5590d98ac9961ebc Mon Sep 17 00:00:00 2001 From: minskim Date: Thu, 28 Jan 2010 21:37:35 +0000 Subject: More teTeX3-bin fixes for TeX Live 2009. - Remove mplib's format from ${VARBASE} when teTeX-bin is deinstalled. - Do not install the man page of lambda, which is no longer installed. --- print/teTeX3-bin/Makefile | 4 ++-- print/teTeX3-bin/PLIST | 3 +-- print/teTeX3-bin/distinfo | 4 ++-- print/teTeX3-bin/patches/patch-as | 14 ++++++-------- print/texlive-tetex/files/format-deinstall.tmpl | 8 ++++++-- 5 files changed, 17 insertions(+), 16 deletions(-) (limited to 'print') diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index c3626cd1367..0fbcffd343f 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.53 2010/01/28 19:33:07 minskim Exp $ +# $NetBSD: Makefile,v 1.54 2010/01/28 21:37:35 minskim Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} -PKGREVISION= 38 +PKGREVISION= 39 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/} diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST index 400c31b45ba..b9951dbf847 100644 --- a/print/teTeX3-bin/PLIST +++ b/print/teTeX3-bin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2010/01/28 19:33:07 minskim Exp $ +@comment $NetBSD: PLIST,v 1.21 2010/01/28 21:37:35 minskim Exp $ bin/fdf2tan bin/fdf2tex bin/lamed @@ -17,7 +17,6 @@ bin/thumbpdf bin/uniqleaf info/latex.info man/man1/fdf2tex.1 -man/man1/lambda.1 man/man1/texdoc.1 man/man1/texshow.1 share/texmf/doc/tetex/TETEXDOC.dvi diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo index 0a1eee5715a..0b693cfc936 100644 --- a/print/teTeX3-bin/distinfo +++ b/print/teTeX3-bin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2009/09/24 18:53:46 minskim Exp $ +$NetBSD: distinfo,v 1.22 2010/01/28 21:37:35 minskim Exp $ SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc @@ -17,7 +17,7 @@ SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b -SHA1 (patch-as) = 767acf743b5f976187aa10fcb5fad5ae5508c324 +SHA1 (patch-as) = 1e056c17d103694309f2b5b20e7a5686586aba1a SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344 diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as index 2a1fa5cd885..54082fe64ee 100644 --- a/print/teTeX3-bin/patches/patch-as +++ b/print/teTeX3-bin/patches/patch-as @@ -1,6 +1,6 @@ -$NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $ +$NetBSD: patch-as,v 1.8 2010/01/28 21:37:35 minskim Exp $ ---- texk/tetex/Makefile.in.orig 2005-02-04 22:20:54.000000000 +0000 +--- texk/tetex/Makefile.in.orig 2005-02-04 14:20:54.000000000 -0800 +++ texk/tetex/Makefile.in @@ -8,26 +8,21 @@ ac_include ../make/programs.mk man5dir = $(mandir)/man5 @@ -35,7 +35,7 @@ $NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $ default: all install: install-data install-exec -@@ -39,30 +34,9 @@ install-data:: $(INFOFILES) +@@ -39,30 +34,6 @@ install-data:: $(INFOFILES) for p in $(manpgs); do \ $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ done @@ -50,9 +50,7 @@ $NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $ - updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext) - ln -s allcm.$(manext) $(man1dir)/allec.$(manext) - ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext) -+ cd $(man1dir); rm -f \ -+ lambda.$(manext) - ln -s omega.$(manext) $(man1dir)/lambda.$(manext) +- ln -s omega.$(manext) $(man1dir)/lambda.$(manext) - ln -s pdfetex.$(manext) $(man1dir)/pdflatex.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext) @@ -68,7 +66,7 @@ $NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $ test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \ $(INSTALL_DATA) $$i $(infodir)/$$i; done if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ -@@ -74,14 +48,6 @@ install-data:: $(INFOFILES) +@@ -74,14 +45,6 @@ install-data:: $(INFOFILES) for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \ $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \ done @@ -83,7 +81,7 @@ $NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $ install-exec: -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) -@@ -96,16 +62,10 @@ install-exec: +@@ -96,16 +59,10 @@ install-exec: else \ true; \ fi diff --git a/print/texlive-tetex/files/format-deinstall.tmpl b/print/texlive-tetex/files/format-deinstall.tmpl index 628ed55cef6..6df342bf871 100644 --- a/print/texlive-tetex/files/format-deinstall.tmpl +++ b/print/texlive-tetex/files/format-deinstall.tmpl @@ -1,4 +1,4 @@ -# $NetBSD: format-deinstall.tmpl,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $ +# $NetBSD: format-deinstall.tmpl,v 1.2 2010/01/28 21:37:36 minskim Exp $ # # Delete format files. # @@ -17,7 +17,11 @@ DEINSTALL) ${MV} ${FMTUTIL_CNF}.tmp ${FMTUTIL_CNF} case "$engine" in mpost) - fmtfile="$format.mem" + if [ "$format" = "mpost" ]; then + fmtfile="mp*.mem" + else + fmtfile="$format.mem" + fi texengine=metapost ;; mf*) -- cgit v1.2.3