pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print Update tex-tetex{,-doc} to 3.0.27774.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/157256e607ac
branches:  trunk
changeset: 609940:157256e607ac
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Oct 13 22:38:20 2012 +0000

description:
Update tex-tetex{,-doc} to 3.0.27774.

In TeX Live 2012, this package replaces print/texlive-tetex.

diffstat:

 print/tex-tetex-doc/Makefile                              |   12 +-
 print/tex-tetex-doc/PLIST                                 |   15 +-
 print/tex-tetex-doc/distinfo                              |    8 +-
 print/tex-tetex/Makefile                                  |   50 ++-
 print/tex-tetex/PLIST                                     |   17 +-
 print/tex-tetex/distinfo                                  |   19 +-
 print/tex-tetex/patches/patch-bin_fmtutil                 |   90 +++++++
 print/tex-tetex/patches/patch-bin_fmtutil-sys             |   19 +
 print/tex-tetex/patches/patch-bin_kpsetool                |   18 +
 print/tex-tetex/patches/patch-bin_kpsewhere               |   16 +
 print/tex-tetex/patches/patch-bin_texconfig-dialog        |  178 ++++++++++++++
 print/tex-tetex/patches/patch-bin_texconfig-sys           |   15 +
 print/tex-tetex/patches/patch-bin_texlinks                |   40 +++
 print/tex-tetex/patches/patch-bin_updmap                  |   33 +-
 print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg |   12 +-
 15 files changed, 492 insertions(+), 50 deletions(-)

diffs (truncated from 728 to 300 lines):

diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex-doc/Makefile
--- a/print/tex-tetex-doc/Makefile      Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex-doc/Makefile      Sat Oct 13 22:38:20 2012 +0000
@@ -1,20 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2012/07/22 20:24:42 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/13 22:38:20 minskim Exp $
 
 DISTNAME=      tetex.doc
-PKGNAME=       tex-${DISTNAME:S/./-/}-3.0.26894
-TEXLIVE_REV=   26894
+PKGNAME=       tex-${DISTNAME:S/./-/}-3.0.27774
+TEXLIVE_REV=   27774
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-tetex
 
 CONFLICTS+=    teTeX-bin<=3.0nb42
-CONFLICTS+=    texlive-tetex<2011
+CONFLICTS+=    texlive-tetex<=2011nb1
 
 TEX_TEXMF_DIRS+=       ${PREFIX}/share/texmf
 
-TEXLIVE_IGNORE_PATTERNS+=      texmf/doc/man/man1/a* texmf/doc/man/man1/d* \
-                               texmf/doc/man/man1/f* texmf/doc/man/man1/t* \
-                               texmf/doc/man/man5/f*
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex-doc/PLIST
--- a/print/tex-tetex-doc/PLIST Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex-doc/PLIST Sat Oct 13 22:38:20 2012 +0000
@@ -1,6 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/06 08:43:28 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/13 22:38:20 minskim Exp $
+man/man1/allcm.1
+man/man1/allec.1
+man/man1/allneeded.1
+man/man1/dvi2fax.1
+man/man1/dvired.1
+man/man1/fmtutil-sys.1
+man/man1/fmtutil.1
+man/man1/kpsepath.1
+man/man1/kpsetool.1
+man/man1/kpsewhere.1
+man/man1/kpsexpand.1
+man/man1/texlinks.1
 man/man1/updmap-sys.1
 man/man1/updmap.1
+man/man5/fmtutil.cnf.5
 man/man5/updmap.cfg.5
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/teTeX-FAQ
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex-doc/distinfo
--- a/print/tex-tetex-doc/distinfo      Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex-doc/distinfo      Sat Oct 13 22:38:20 2012 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/07/22 20:24:42 minskim Exp $
+$NetBSD: distinfo,v 1.12 2012/10/13 22:38:20 minskim Exp $
 
-SHA1 (tex-tetex-26894/tetex.doc.tar.xz) = 5b02a706c4dc1b0238fe3f4cbf2a543fe03156e2
-RMD160 (tex-tetex-26894/tetex.doc.tar.xz) = 480525297e624abcdb13aef55d5a28e653bcdc52
-Size (tex-tetex-26894/tetex.doc.tar.xz) = 332676 bytes
+SHA1 (tex-tetex-27774/tetex.doc.tar.xz) = 881f862b15cb960b41cd866fe464e4e8d0452963
+RMD160 (tex-tetex-27774/tetex.doc.tar.xz) = e5e224cb8715752b0a77f4034e3cdd29ae35c6a8
+Size (tex-tetex-27774/tetex.doc.tar.xz) = 339860 bytes
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex/Makefile
--- a/print/tex-tetex/Makefile  Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex/Makefile  Sat Oct 13 22:38:20 2012 +0000
@@ -1,29 +1,43 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 21:57:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/13 22:38:20 minskim Exp $
 
 DISTNAME=      tetex
-PKGNAME=       tex-${DISTNAME}-3.0.26894
-PKGREVISION=   1
-TEXLIVE_REV=   26894
+PKGNAME=       tex-${DISTNAME}-3.0.27774
+TEXLIVE_REV=   27774
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Supplementary files for updmap
 
-CONFLICTS=     texlive-tetex<2011
+CONFLICTS=     texlive-tetex<=2011nb1
+DEPENDS+=      dialog>=1.0:../../misc/dialog
+DEPENDS+=      kpathsea-[0-9]*:../../print/kpathsea
+DEPENDS+=      tex-texconfig-[0-9]*:../../print/tex-texconfig
 DEPENDS+=      tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
 
 USE_TOOLS+=    perl:run sh:run
 
 FILES_SUBST+=  UPDMAP_SYS=${PREFIX}/bin/updmap-sys
 
+EVAL_PREFIX+=  DIALOG_PREFIX=dialog
+EVAL_PREFIX+=  KPATHSEA_PREFIX=kpathsea
+EVAL_PREFIX+=  TEXCONFIG_PREFIX=tex-texconfig
+
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Setting paths to commands.
 SUBST_STAGE.paths=     pre-configure
-SUBST_FILES.paths=     bin/updmap bin/updmap-sys
-SUBST_SED.paths=       -e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' \
-                       -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
+SUBST_FILES.paths=     bin/fmtutil bin/fmtutil-sys bin/kpsetool bin/kpsewhere \
+                       bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
+                       bin/updmap bin/updmap-sys
+SUBST_SED.paths+=      -e 's,@DIALOG@,${DIALOG_PREFIX}/bin/dialog,g'
+SUBST_SED.paths+=      -e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g'
+SUBST_SED.paths+=      -e 's,@KPSEWHICH@,${KPATHSEA_PREFIX}/bin/kpsewhich,g'
+SUBST_SED.paths+=      -e 's,@TEXCONFIG@,${TEXCONFIG_PREFIX}/bin/texconfig,g'
+SUBST_SED.paths+=      -e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
 
 REPLACE_PERL=  bin/updmap
-REPLACE_SH=    bin/updmap-sys
+REPLACE_SH=    bin/allcm bin/allneeded bin/dvi2fax bin/dvired \
+               bin/fmtutil-sys bin/fmtutil bin/kpsetool bin/kpsewhere \
+               bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
+               bin/updmap-sys
 
 PKG_SYSCONFSUBDIR=     texmf
 
@@ -38,9 +52,21 @@
 
 post-extract:
        ${MKDIR} ${WRKSRC}/bin
-       ${MV} ${WRKSRC}/texmf/scripts/tetex/updmap-sys.sh \
-               ${WRKSRC}/bin/updmap-sys
-       ${MV} ${WRKSRC}/texmf/scripts/tetex/updmap.pl ${WRKSRC}/bin/updmap
+.for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \
+               texconfig-sys.sh texlinks.sh
+       ${MV} ${WRKSRC}/texmf/scripts/tetex/${script} \
+               ${WRKSRC}/bin/${script:S/.sh//}
+.endfor
+.for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh kpsetool.sh \
+               kpsewhere.sh updmap-sys.sh updmap.pl
+       ${MV} ${WRKSRC}/texmf-dist/scripts/tetex/${script} \
+               ${WRKSRC}/bin/${script:S/.pl//:S/.sh//}
+.endfor
        ${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE}
 
+post-install:
+       ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec
+       ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath
+       ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand
+
 .include "../../mk/bsd.pkg.mk"
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex/PLIST
--- a/print/tex-tetex/PLIST     Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex/PLIST     Sat Oct 13 22:38:20 2012 +0000
@@ -1,4 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2012/07/22 20:24:42 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/10/13 22:38:20 minskim Exp $
+bin/allcm
+bin/allec
+bin/allneeded
+bin/dvi2fax
+bin/dvired
+bin/fmtutil
+bin/fmtutil-sys
+bin/kpsepath
+bin/kpsetool
+bin/kpsewhere
+bin/kpsexpand
+bin/texconfig-dialog
+bin/texconfig-sys
+bin/texlinks
 bin/updmap
 bin/updmap-sys
 share/texmf-dist/web2c/updmap.cfg
@@ -30,3 +44,4 @@
 share/texmf/fonts/map/dvips/tetex/pdftex35.map
 share/texmf/fonts/map/dvips/tetex/ps2pk35.map
 share/texmf/web2c/updmap.cfg
+@pkgdir share/texmf-dist/scripts/tetex
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex/distinfo
--- a/print/tex-tetex/distinfo  Sat Oct 13 22:32:56 2012 +0000
+++ b/print/tex-tetex/distinfo  Sat Oct 13 22:38:20 2012 +0000
@@ -1,8 +1,15 @@
-$NetBSD: distinfo,v 1.12 2012/07/22 20:24:42 minskim Exp $
+$NetBSD: distinfo,v 1.13 2012/10/13 22:38:20 minskim Exp $
 
-SHA1 (tex-tetex-26894/tetex.tar.xz) = 23dc779933cbabcebd7603c62d84f31983fad2c4
-RMD160 (tex-tetex-26894/tetex.tar.xz) = 2a9a2364fe7ac1b9e91b5d0eded75f3738d51ccd
-Size (tex-tetex-26894/tetex.tar.xz) = 28908 bytes
-SHA1 (patch-bin_updmap) = db3717e0dc5046530e2b8cf52ba7cfc194616618
+SHA1 (tex-tetex-27774/tetex.tar.xz) = 325de417b58edb930d3931f1de1a4304b97faf47
+RMD160 (tex-tetex-27774/tetex.tar.xz) = 56b1823fa3d3a39675bc418ecdfb746ca7c4b3f4
+Size (tex-tetex-27774/tetex.tar.xz) = 45068 bytes
+SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd
+SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e
+SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
+SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e
+SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa
+SHA1 (patch-bin_texconfig-sys) = 5f72cf599cfde3af0bd21797aa8ad77f78287459
+SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b
+SHA1 (patch-bin_updmap) = b2982af8d74176f473710fadf67fc81fc3be5f31
 SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 79e98098006917c455a7b4403e88a9186edcbf56
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = f87dfc7759a8e49453f99c02134fa0bd94bb3912
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex/patches/patch-bin_fmtutil
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/tex-tetex/patches/patch-bin_fmtutil Sat Oct 13 22:38:20 2012 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-bin_fmtutil,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/fmtutil.orig   2012-10-09 17:39:16.000000000 +0000
++++ bin/fmtutil
+@@ -213,7 +213,7 @@ getmatch()
+ initTexmfMain()
+ {
+   case $MT_TEXMFMAIN in
+-    "") MT_TEXMFMAIN=`kpsewhich --var-value=TEXMFMAIN`;;
++    "") MT_TEXMFMAIN=`@KPSEWHICH@ --var-value=TEXMFMAIN`;;
+   esac
+   export MT_TEXMFMAIN
+ }
+@@ -225,14 +225,14 @@ initTexmfMain()
+ ###############################################################################
+ cache_vars()
+ {
+-  : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
+-  : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
+-  : ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`}
+-  : ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`}
+-  : ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`}
+-  : ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`}
+-  : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`}
+-  : ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
++  : ${MT_VARTEXFONTS=`@KPSEWHICH@ --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
++  : ${MT_MKTEXNAM=`@KPSEWHICH@ --format='web2c files' mktexnam`}
++  : ${MT_MKTEXNAM_OPT=`@KPSEWHICH@ --format='web2c files' mktexnam.opt`}
++  : ${MT_MKTEXDIR=`@KPSEWHICH@ --format='web2c files' mktexdir`}
++  : ${MT_MKTEXDIR_OPT=`@KPSEWHICH@ --format='web2c files' mktexdir.opt`}
++  : ${MT_MKTEXUPD=`@KPSEWHICH@ --format='web2c files' mktexupd`}
++  : ${MT_MKTEX_CNF=`@KPSEWHICH@ --format='web2c files' mktex.cnf`}
++  : ${MT_MKTEX_OPT=`@KPSEWHICH@ --format='web2c files' mktex.opt`}
+   export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
+   export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
+ }
+@@ -574,7 +574,7 @@ main()
+ 
+   # set up destdir:
+   if test -z "$destdir"; then
+-    : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
++    : ${MT_TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`}
+     destdir=$MT_TEXMFVAR/web2c
+   fi
+   test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
+@@ -683,7 +683,7 @@ parse_line()
+   inifile=`echo $lastarg | sed 's%^\*%%'`
+ 
+   # See if we can find $inifile for return code:
+-  kpsewhich -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
++  @KPSEWHICH@ -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
+ }
+ 
+ ###############################################################################
+@@ -696,7 +696,7 @@ find_hyphenfile()
+   format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`"
+   case $hyphenation in
+     -) ;;
+-    *) kpsewhich -progname="$format" -format=tex $hyphenation;;
++    *) @KPSEWHICH@ -progname="$format" -format=tex $hyphenation;;
+   esac
+ }
+ 
+@@ -727,7 +727,7 @@ run_initex()
+   poolfile=
+   tcxflag=
+   test -n "$pool" \
+-    && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null`
++    && poolfile=`(@KPSEWHICH@ -progname=$engine $pool.pool) 2>/dev/null`
+   if test -n "$poolfile" && test -f "$poolfile"; then
+     verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
+     cp "$poolfile" $engine.pool
+@@ -886,7 +886,7 @@ recreate_by_fmt()
+ create_missing()
+ {
+   # match_cmd='test ! -f $destdir/$fmtfile'
+-  match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
++  match_cmd='test ! -f "`@KPSEWHICH@ -engine=$texengine -progname=$format $fmtfile`"'
+   recreate_loop
+ }
+ 
+@@ -896,7 +896,7 @@ create_missing()
+ ###############################################################################
+ recreate_existing()
+ {
+-  match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
++  match_cmd='test -f "`@KPSEWHICH@ -engine=$texengine -progname=$format $fmtfile`"'
+   recreate_loop
+ }
+ 
diff -r e51bdcafcc4b -r 157256e607ac print/tex-tetex/patches/patch-bin_fmtutil-sys
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/tex-tetex/patches/patch-bin_fmtutil-sys     Sat Oct 13 22:38:20 2012 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-bin_fmtutil-sys,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/fmtutil-sys.orig       2012-10-09 17:39:16.000000000 +0000



Home | Main Index | Thread Index | Old Index