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.32132



details:   https://anonhg.NetBSD.org/pkgsrc/rev/13c2d0d70800
branches:  trunk
changeset: 626634:13c2d0d70800
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Nov 17 17:15:43 2013 +0000

description:
Update tex-tetex{,-doc} to 3.0.32132

- Files in share/texmf have been moved to share/texmf-dist.
- 'updmap --sys' replaces 'updmap-sys'.

diffstat:

 print/tex-tetex-doc/Makefile                              |    8 +-
 print/tex-tetex-doc/PLIST                                 |    6 +-
 print/tex-tetex-doc/distinfo                              |    8 +-
 print/tex-tetex/Makefile                                  |   18 +-
 print/tex-tetex/PLIST                                     |   62 +-
 print/tex-tetex/distinfo                                  |   14 +-
 print/tex-tetex/patches/patch-bin_updmap                  |  306 +++++++++++++-
 print/tex-tetex/patches/patch-bin_updmap-sys              |   23 +-
 print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg |   64 ++-
 9 files changed, 400 insertions(+), 109 deletions(-)

diffs (truncated from 801 to 300 lines):

diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex-doc/Makefile
--- a/print/tex-tetex-doc/Makefile      Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex-doc/Makefile      Sun Nov 17 17:15:43 2013 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/13 22:38:20 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2013/11/17 17:15:43 minskim Exp $
 
 DISTNAME=      tetex.doc
-PKGNAME=       tex-${DISTNAME:S/./-/}-3.0.27774
-TEXLIVE_REV=   27774
+PKGNAME=       tex-${DISTNAME:S/./-/}-3.0.32132
+TEXLIVE_REV=   32132
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-tetex
@@ -10,7 +10,5 @@
 CONFLICTS+=    teTeX-bin<=3.0nb42
 CONFLICTS+=    texlive-tetex<=2011nb1
 
-TEX_TEXMF_DIRS+=       ${PREFIX}/share/texmf
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex-doc/PLIST
--- a/print/tex-tetex-doc/PLIST Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex-doc/PLIST Sun Nov 17 17:15:43 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/13 22:38:20 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/11/17 17:15:43 minskim Exp $
 man/man1/allcm.1
 man/man1/allec.1
 man/man1/allneeded.1
@@ -15,5 +15,5 @@
 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
+share/texmf-dist/doc/tetex/TETEXDOC.pdf
+share/texmf-dist/doc/tetex/teTeX-FAQ
diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex-doc/distinfo
--- a/print/tex-tetex-doc/distinfo      Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex-doc/distinfo      Sun Nov 17 17:15:43 2013 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: distinfo,v 1.13 2013/11/17 17:15:43 minskim Exp $
 
-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
+SHA1 (tex-tetex-32132/tetex.doc.tar.xz) = 19681519510bf8794aba8c0848dedb1a03cd34f9
+RMD160 (tex-tetex-32132/tetex.doc.tar.xz) = 92da273d09c33bdaa9786e480173c6d7b5d99b69
+Size (tex-tetex-32132/tetex.doc.tar.xz) = 340524 bytes
diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex/Makefile
--- a/print/tex-tetex/Makefile  Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex/Makefile  Sun Nov 17 17:15:43 2013 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2013/05/31 12:41:50 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/11/17 17:15:43 minskim Exp $
 
 DISTNAME=      tetex
-PKGNAME=       tex-${DISTNAME}-3.0.27774
-PKGREVISION=   2
-TEXLIVE_REV=   27774
+PKGNAME=       tex-${DISTNAME}-3.0.32132
+TEXLIVE_REV=   32132
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Supplementary files for updmap
@@ -12,7 +11,7 @@
 DEPENDS+=      dialog>=1.0:../../misc/dialog
 DEPENDS+=      kpathsea-[0-9]*:../../print/kpathsea
 DEPENDS+=      tex-kpathsea>=2012nb1:../../print/tex-kpathsea
-DEPENDS+=      tex-texconfig-[0-9]*:../../print/tex-texconfig
+DEPENDS+=      tex-texconfig>=2013:../../print/tex-texconfig
 DEPENDS+=      tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
 
 USE_TOOLS+=    perl:run sh:run
@@ -47,8 +46,7 @@
 CONF_FILES+=   ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \
                ${PKG_SYSCONFDIR}/web2c/updmap.cfg
 
-TEX_TEXMF_DIRS+=       ${PKG_SYSCONFDIR} \
-                       ${PREFIX}/share/texmf ${PREFIX}/share/texmf-dist
+TEX_TEXMF_DIRS+=       ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 
@@ -56,15 +54,15 @@
        ${MKDIR} ${WRKSRC}/bin
 .for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \
                texconfig-sys.sh texlinks.sh
-       ${MV} ${WRKSRC}/texmf/scripts/tetex/${script} \
+       ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${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} \
+       ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \
                ${WRKSRC}/bin/${script:S/.pl//:S/.sh//}
 .endfor
-       ${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE}
+       ${RMDIR} -p ${WRKSRC}/texmf-dist/scripts/texlive 2>/dev/null || ${TRUE}
 
 post-install:
        ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec
diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex/PLIST
--- a/print/tex-tetex/PLIST     Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex/PLIST     Sun Nov 17 17:15:43 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/10/14 21:25:22 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/11/17 17:15:43 minskim Exp $
 bin/allcm
 bin/allec
 bin/allneeded
@@ -16,33 +16,35 @@
 bin/texlinks
 bin/updmap
 bin/updmap-sys
+share/texmf-dist/dvips/tetex/config.builtin35
+share/texmf-dist/dvips/tetex/config.dfaxhigh
+share/texmf-dist/dvips/tetex/config.dfaxlo
+share/texmf-dist/dvips/tetex/config.download35
+share/texmf-dist/dvips/tetex/config.gsftopk
+share/texmf-dist/dvips/tetex/config.maxmem
+share/texmf-dist/dvips/tetex/config.outline
+share/texmf-dist/dvips/tetex/config.pdf
+share/texmf-dist/dvips/tetex/config.pk
+share/texmf-dist/dvips/tetex/config.www
+share/texmf-dist/fonts/enc/dvips/tetex/09fbbfac.enc
+share/texmf-dist/fonts/enc/dvips/tetex/0ef0afca.enc
+share/texmf-dist/fonts/enc/dvips/tetex/10037936.enc
+share/texmf-dist/fonts/enc/dvips/tetex/1b6d048e.enc
+share/texmf-dist/fonts/enc/dvips/tetex/71414f53.enc
+share/texmf-dist/fonts/enc/dvips/tetex/74afc74c.enc
+share/texmf-dist/fonts/enc/dvips/tetex/aae443f0.enc
+share/texmf-dist/fonts/enc/dvips/tetex/b6a4d7c7.enc
+share/texmf-dist/fonts/enc/dvips/tetex/bbad153f.enc
+share/texmf-dist/fonts/enc/dvips/tetex/d9b29452.enc
+share/texmf-dist/fonts/enc/dvips/tetex/f7b6d320.enc
+share/texmf-dist/fonts/enc/dvips/tetex/mtex.enc
+share/texmf-dist/fonts/map/dvips/tetex/Makefile
+share/texmf-dist/fonts/map/dvips/tetex/README
+share/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx
+share/texmf-dist/fonts/map/dvips/tetex/base14flags.tex
+share/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map
+share/texmf-dist/fonts/map/dvips/tetex/dvips35.map
+share/texmf-dist/fonts/map/dvips/tetex/mathpple.map
+share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
+share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map
 share/texmf-dist/web2c/updmap.cfg
-share/texmf/dvips/tetex/config.builtin35
-share/texmf/dvips/tetex/config.dfaxhigh
-share/texmf/dvips/tetex/config.dfaxlo
-share/texmf/dvips/tetex/config.download35
-share/texmf/dvips/tetex/config.gsftopk
-share/texmf/dvips/tetex/config.outline
-share/texmf/dvips/tetex/config.pdf
-share/texmf/dvips/tetex/config.pk
-share/texmf/dvips/tetex/config.www
-share/texmf/fonts/enc/dvips/tetex/09fbbfac.enc
-share/texmf/fonts/enc/dvips/tetex/0ef0afca.enc
-share/texmf/fonts/enc/dvips/tetex/10037936.enc
-share/texmf/fonts/enc/dvips/tetex/1b6d048e.enc
-share/texmf/fonts/enc/dvips/tetex/71414f53.enc
-share/texmf/fonts/enc/dvips/tetex/74afc74c.enc
-share/texmf/fonts/enc/dvips/tetex/aae443f0.enc
-share/texmf/fonts/enc/dvips/tetex/b6a4d7c7.enc
-share/texmf/fonts/enc/dvips/tetex/bbad153f.enc
-share/texmf/fonts/enc/dvips/tetex/d9b29452.enc
-share/texmf/fonts/enc/dvips/tetex/f7b6d320.enc
-share/texmf/fonts/enc/dvips/tetex/mtex.enc
-share/texmf/fonts/map/dvips/tetex/README
-share/texmf/fonts/map/dvips/tetex/dvipdfm35.map
-share/texmf/fonts/map/dvips/tetex/dvips35.map
-share/texmf/fonts/map/dvips/tetex/mathpple.map
-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 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex/distinfo
--- a/print/tex-tetex/distinfo  Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex/distinfo  Sun Nov 17 17:15:43 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: distinfo,v 1.14 2013/11/17 17:15:43 minskim Exp $
 
-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 (tex-tetex-32132/tetex.tar.xz) = a3d48983771318668f75085f89c291d8f074986a
+RMD160 (tex-tetex-32132/tetex.tar.xz) = 4b853290e39fb6b1d251398865b5876114e79f09
+Size (tex-tetex-32132/tetex.tar.xz) = 50824 bytes
 SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd
 SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e
 SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
@@ -10,6 +10,6 @@
 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) = f87dfc7759a8e49453f99c02134fa0bd94bb3912
+SHA1 (patch-bin_updmap) = 9472a7e1fd0842e1baa39378266017946be3aa03
+SHA1 (patch-bin_updmap-sys) = 4671c8a8bade0e282f72a76f34debbd502a5c905
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = e5ef9f07b356916a35fc43c1f157d3a3e61f3cfe
diff -r 4cd81e9d472a -r 13c2d0d70800 print/tex-tetex/patches/patch-bin_updmap
--- a/print/tex-tetex/patches/patch-bin_updmap  Sun Nov 17 17:13:29 2013 +0000
+++ b/print/tex-tetex/patches/patch-bin_updmap  Sun Nov 17 17:15:43 2013 +0000
@@ -1,42 +1,69 @@
-$NetBSD: patch-bin_updmap,v 1.3 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-bin_updmap,v 1.4 2013/11/17 17:15:43 minskim Exp $
 
---- bin/updmap.orig    2012-09-13 03:38:21.000000000 +0000
+--- bin/updmap.orig    2013-10-07 22:58:25.000000000 +0000
 +++ bin/updmap
-@@ -23,7 +23,7 @@ my $TEXMFROOT;
- 
+@@ -3,5 +3,5 @@
+ # updmap - maintain map files for outline fonts.
+ # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
+-# 
++#
+ # Copyright 2011, 2012, 2013 Norbert Preining
+ # This file is licensed under the GNU General Public License version 2
+@@ -24,5 +24,5 @@ my $TEXMFROOT;
  BEGIN {
    $^W=1;
 -  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
 +  $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`;
    if ($?) {
      print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n";
-     exit 1;
-@@ -50,10 +50,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
- # this function checks by itself whether it is running on windows or not
+@@ -38,5 +38,5 @@ my $version = '$Id: updmap.pl 31853 2013
+ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
+ use strict;
+-use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname 
++use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname
+   sort_uniq member touch);
+ 
+@@ -51,10 +51,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  reset_root_home();
  
--chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`);
+-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
 -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
+-chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
 -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
+-chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
 -chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`);
-+chomp(my $TEXMFMAIN = `@KPSEWHICH@ --var-value=TEXMFMAIN`);
++chomp(my $TEXMFDIST = `@KPSEWHICH@ --var-value=TEXMFDIST`);
 +chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`);
++chomp(my $TEXMFSYSVAR = `@KPSEWHICH@ -var-value=TEXMFSYSVAR`);
 +chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`);
++chomp(my $TEXMFSYSCONFIG = `@KPSEWHICH@ -var-value=TEXMFSYSCONFIG`);
 +chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
  
  # make sure that on windows *everything* is in lower case for comparison
- if (win32()) {
-@@ -215,7 +215,7 @@ sub main {
-     # in the list is the one where changes will be written to.
+@@ -80,6 +80,6 @@ my @cmdline_options = (
+   "sys",
+   "listfiles",
+-  "cnffile=s@", 
+-  "copy", 
++  "cnffile=s@",
++  "copy",
+   "disable=s@",
+   "dvipdfmoutputdir=s",
+@@ -191,5 +191,5 @@ sub main {
+     exit 0;
+   }
+- 
++
+   if ($opts{'showoptions'}) {
+     for my $o (@{$opts{'showoptions'}}) {
+@@ -231,5 +231,5 @@ sub main {
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
 -    my @all_files = `kpsewhich -all updmap.cfg`;
 +    my @all_files = `@KPSEWHICH@ -all updmap.cfg`;
      chomp(@all_files);
      my @used_files;
-     for my $f (@all_files) {
-@@ -225,10 +225,10 @@ sub main {
-     my $TEXMFLOCALVAR;
+@@ -241,8 +241,8 @@ sub main {
      my @TEXMFLOCAL;
      if (win32()) {
 -      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
@@ -47,22 +74,261 @@
 +      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`);
        @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
-     #



Home | Main Index | Thread Index | Old Index