Received: by mail.netbsd.org (Postfix, from userid 605) id 1492184DFC; Fri, 23 Jun 2017 01:56:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 997DD84DE3 for ; Fri, 23 Jun 2017 01:56:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id n5GlD-MrsJUk for ; Fri, 23 Jun 2017 01:56:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A754A84D78 for ; Fri, 23 Jun 2017 01:56:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3A7AEFAE8; Fri, 23 Jun 2017 01:56:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498183008249180" MIME-Version: 1.0 Date: Fri, 23 Jun 2017 01:56:48 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/print/tex-texconfig To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20170623015648.3A7AEFAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498183008249180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Fri Jun 23 01:56:48 UTC 2017 Modified Files: pkgsrc/print/tex-texconfig: Makefile distinfo pkgsrc/print/tex-texconfig/patches: patch-bin_texconfig Log Message: Reinstate patches. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-texconfig/Makefile \ pkgsrc/print/tex-texconfig/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1498183008249180 Content-Disposition: inline Content-Length: 10475 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/tex-texconfig/Makefile diff -u pkgsrc/print/tex-texconfig/Makefile:1.5 pkgsrc/print/tex-texconfig/Makefile:1.6 --- pkgsrc/print/tex-texconfig/Makefile:1.5 Wed Jun 21 13:25:33 2017 +++ pkgsrc/print/tex-texconfig/Makefile Fri Jun 23 01:56:47 2017 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2017/06/21 13:25:33 markd Exp $ +# $NetBSD: Makefile,v 1.6 2017/06/23 01:56:47 markd Exp $ DISTNAME= texconfig PKGNAME= tex-${DISTNAME}-2017 +PKGREVISION= 1 TEXLIVE_REV= 44166 MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/print/tex-texconfig/distinfo diff -u pkgsrc/print/tex-texconfig/distinfo:1.5 pkgsrc/print/tex-texconfig/distinfo:1.6 --- pkgsrc/print/tex-texconfig/distinfo:1.5 Wed Jun 21 13:25:33 2017 +++ pkgsrc/print/tex-texconfig/distinfo Fri Jun 23 01:56:47 2017 @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.5 2017/06/21 13:25:33 markd Exp $ +$NetBSD: distinfo,v 1.6 2017/06/23 01:56:47 markd Exp $ SHA1 (tex-texconfig-44166/texconfig.tar.xz) = 5cd34a05bd65c9b7a3410f00b1dec50800dd975a RMD160 (tex-texconfig-44166/texconfig.tar.xz) = 3690e04e21ef60b02ea16bb48da0fe4181d5f183 SHA512 (tex-texconfig-44166/texconfig.tar.xz) = 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c Size (tex-texconfig-44166/texconfig.tar.xz) = 12492 bytes +SHA1 (patch-bin_texconfig) = 4fc6cb771683749ac4e54a3cd0530c97896cb1d0 +SHA1 (patch-texmf-dist_texconfig_tcfmgr) = f530f1f57a7bec42fcc4ee06dbf6c655f631d635 Index: pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig diff -u pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig:1.1 pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig:1.2 --- pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig:1.1 Sat Oct 13 22:29:21 2012 +++ pkgsrc/print/tex-texconfig/patches/patch-bin_texconfig Fri Jun 23 01:56:48 2017 @@ -1,8 +1,8 @@ -$NetBSD: patch-bin_texconfig,v 1.1 2012/10/13 22:29:21 minskim Exp $ +$NetBSD: patch-bin_texconfig,v 1.2 2017/06/23 01:56:48 markd Exp $ ---- bin/texconfig.orig 2012-10-09 17:17:14.000000000 +0000 +--- bin/texconfig.orig 2017-04-23 23:48:00.000000000 +0000 +++ bin/texconfig -@@ -91,7 +91,7 @@ echoShowKpseVariable() +@@ -94,7 +94,7 @@ echoShowKpseVariable() for eskv do var=$eskv @@ -11,7 +11,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ echo "$var=$val" done } -@@ -123,7 +123,7 @@ echoLocateCfgfile() +@@ -126,7 +126,7 @@ echoLocateCfgfile() for elc do case $elc in @@ -20,7 +20,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ *) elcLoc=`tcfmgr --cmd find --file "$elc"`;; esac case $elcLoc in -@@ -190,7 +190,7 @@ setupTmpDir() +@@ -193,7 +193,7 @@ setupTmpDir() setupTexmfmain() { case $MT_TEXMFMAIN in @@ -29,7 +29,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ *) return;; esac } -@@ -201,7 +201,7 @@ setupTexmfmain() +@@ -204,7 +204,7 @@ setupTexmfmain() setupTexmfdist() { case $MT_TEXMFDIST in @@ -38,7 +38,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ *) return;; esac } -@@ -212,7 +212,7 @@ setupTexmfdist() +@@ -215,7 +215,7 @@ setupTexmfdist() setupTexmfvar() { case $MT_TEXMVAR in @@ -47,7 +47,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ *) return;; esac } -@@ -223,7 +223,7 @@ setupTexmfvar() +@@ -226,7 +226,7 @@ setupTexmfvar() setupSystexmf() { case $MT_SYSTEXMF in @@ -56,7 +56,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ *) return;; esac } -@@ -478,7 +478,7 @@ listDvipsPapers() +@@ -481,7 +481,7 @@ listDvipsPapers() # getFormatsForHyphen() { @@ -65,16 +65,16 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ } ############################################################################### -@@ -607,7 +607,7 @@ TeX Live home page: &2 -@@ -736,7 +736,7 @@ Valid PAPER settings: +@@ -704,7 +704,7 @@ Valid PAPER settings: ;; *) printerName=$2 @@ -92,7 +92,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ case $pFile in "") setupTmpDir -@@ -773,7 +773,7 @@ Valid PAPER settings: +@@ -741,7 +741,7 @@ Valid PAPER settings: ;; *) printerName=$2 @@ -101,7 +101,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ case $pFile in "") echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2 -@@ -931,7 +931,7 @@ For more information about these \`featu +@@ -899,7 +899,7 @@ For more information about these \`featu ;; *) tcBatchFontVardir=$3 @@ -110,7 +110,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ if test -n "$tfc"; then if test -w "$tfc"; then configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS = $tcBatchFontVardir" -@@ -947,7 +947,7 @@ For more information about these \`featu +@@ -915,7 +915,7 @@ For more information about these \`featu esac ;; rw) @@ -119,7 +119,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ if test -z "$MT_VARTEXFONTS"; then echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1 return -@@ -973,7 +973,7 @@ For more information about these \`featu +@@ -941,7 +941,7 @@ For more information about these \`featu fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}" ;; ro) @@ -128,7 +128,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ if test -z "$MT_VARTEXFONTS"; then echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1 return -@@ -1024,10 +1024,10 @@ EOM +@@ -992,10 +992,10 @@ EOM setupTmpDir echo "$progname: analyzing old configuration..." >&2 @@ -142,7 +142,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then echo "$progname: no new/updated formats available ..." >&2 -@@ -1035,9 +1035,9 @@ EOM +@@ -1003,9 +1003,9 @@ EOM echo "$progname: updating formats ..." >&2 comm -13 $tmpdir/pre $tmpdir/post > $tmpdir/addOrChange for i in `awk '{print $1}' $tmpdir/addOrChange`; do @@ -154,7 +154,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ fi ;; -@@ -1077,7 +1077,7 @@ $formatsForHyphenFmt" +@@ -1045,7 +1045,7 @@ $formatsForHyphenFmt" *) if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then @@ -163,7 +163,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ case $tcBatchHyphenFile in "") echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2 -@@ -1134,7 +1134,7 @@ $formatsForHyphenFmt" +@@ -1102,7 +1102,7 @@ $formatsForHyphenFmt" fi ;; esac @@ -172,7 +172,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ fi else echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2 -@@ -1152,9 +1152,9 @@ $formatsForHyphenFmt" +@@ -1120,9 +1120,9 @@ $formatsForHyphenFmt" init) case $2 in "") @@ -185,7 +185,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ : else rc=1 -@@ -1163,7 +1163,7 @@ $formatsForHyphenFmt" +@@ -1131,7 +1131,7 @@ $formatsForHyphenFmt" *) shift 1 for i in "$@"; do @@ -194,7 +194,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ done ;; esac -@@ -1266,7 +1266,7 @@ Valid PAPER settings: +@@ -1228,7 +1228,7 @@ Valid PAPER settings: set x `getRes "$tcBatchPdftexMode"`; shift fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1" if $fmgrConfigReplaceChanged; then @@ -203,7 +203,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ fi else echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2 -@@ -1285,7 +1285,7 @@ Valid PAPER settings: +@@ -1247,7 +1247,7 @@ Valid PAPER settings: wChanged=$fmgrConfigReplaceChanged fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" if $wChanged || $fmgrConfigReplaceChanged; then @@ -212,7 +212,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ fi ;; a4) -@@ -1294,7 +1294,7 @@ Valid PAPER settings: +@@ -1256,7 +1256,7 @@ Valid PAPER settings: wChanged=$fmgrConfigReplaceChanged fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h" if $wChanged || $fmgrConfigReplaceChanged; then @@ -221,7 +221,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ fi ;; "") echo "$help" >&2; rc=1;; -@@ -1314,7 +1314,7 @@ Valid PAPER settings: +@@ -1276,7 +1276,7 @@ Valid PAPER settings: ;; rehash) @@ -230,7 +230,7 @@ $NetBSD: patch-bin_texconfig,v 1.1 2012/ ;; # -@@ -1417,7 +1417,7 @@ Valid PAPER settings: +@@ -1408,7 +1408,7 @@ Valid PAPER settings: ############################################################################### tcInteractive() { --_----------=_1498183008249180--