Thu Jun 17 00:21:17 2010 UTC ()
Resolve conflicts between texlive-tetex and tex-context-doc.

tex-context{,-doc} were imported during freeze to fix context format
generation in teTeX-bin.


(minskim)
diff -r1.6 -r1.7 pkgsrc/print/texlive-tetex/Makefile
diff -r1.6 -r1.7 pkgsrc/print/texlive-tetex/distinfo
diff -r1.3 -r1.4 pkgsrc/print/texlive-tetex/PLIST
diff -r1.4 -r1.5 pkgsrc/print/texlive-tetex/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/print/texlive-tetex/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/Attic/Makefile 2010/01/16 03:40:44 1.6
+++ pkgsrc/print/texlive-tetex/Attic/Makefile 2010/06/17 00:21:16 1.7
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2010/01/16 03:40:44 minskim Exp $ 1# $NetBSD: Makefile,v 1.7 2010/06/17 00:21:16 minskim Exp $
2 2
3DISTNAME= texlive-20091011-source 3DISTNAME= texlive-20091011-source
4PKGNAME= texlive-tetex-2009 4PKGNAME= texlive-tetex-2009
 5PKGREVISION= 1
5CATEGORIES= print 6CATEGORIES= print
6MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} 7MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://www.tug.org/texlive/ 11HOMEPAGE= http://www.tug.org/texlive/
11COMMENT= Scripts included in teTeX 12COMMENT= Scripts included in teTeX
12 13
13CONFLICTS+= teTeX-bin<=3.0nb22 14CONFLICTS+= teTeX-bin<=3.0nb22
14DEPENDS+= dialog>=1.0:../../misc/dialog 15DEPENDS+= dialog>=1.0:../../misc/dialog
15DEPENDS+= tex-tetex-[0-9]*:../../print/tex-tetex 16DEPENDS+= tex-tetex-[0-9]*:../../print/tex-tetex
16 17
17EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ 18EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
cvs diff -r1.6 -r1.7 pkgsrc/print/texlive-tetex/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/Attic/distinfo 2010/01/16 03:40:44 1.6
+++ pkgsrc/print/texlive-tetex/Attic/distinfo 2010/06/17 00:21:16 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.6 2010/01/16 03:40:44 minskim Exp $ 1$NetBSD: distinfo,v 1.7 2010/06/17 00:21:16 minskim Exp $
2 2
3SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d 3SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
4RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9 4RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
5Size (texlive-20091011-source.tar.xz) = 29683728 bytes 5Size (texlive-20091011-source.tar.xz) = 29683728 bytes
6SHA1 (patch-aa) = 0ecc9a662343bc64a95da24ca010fcbf3aab5582 6SHA1 (patch-aa) = 4caa7aeea5254998165ab929b3f57233db4c0347
7SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b 7SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
8SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6 8SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
9SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495 9SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
10SHA1 (patch-ae) = 8dd5b7987d5e2b60b8158136141c3b9e3a569705 10SHA1 (patch-ae) = 8dd5b7987d5e2b60b8158136141c3b9e3a569705
11SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d 11SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
12SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c 12SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
13SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7 13SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
14SHA1 (patch-ai) = 59d06c8fa109226045f56ff6cbfcaf18b77582ce 14SHA1 (patch-ai) = 59d06c8fa109226045f56ff6cbfcaf18b77582ce
15SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b 15SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b
16SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2 16SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2
17SHA1 (patch-al) = 0b51e3aecd3a048132ffd02bacfb9a63f55051ef 17SHA1 (patch-al) = 0b51e3aecd3a048132ffd02bacfb9a63f55051ef
cvs diff -r1.3 -r1.4 pkgsrc/print/texlive-tetex/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/Attic/PLIST 2009/09/19 15:31:03 1.3
+++ pkgsrc/print/texlive-tetex/Attic/PLIST 2010/06/17 00:21:16 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2009/09/19 15:31:03 minskim Exp $ 1@comment $NetBSD: PLIST,v 1.4 2010/06/17 00:21:16 minskim Exp $
2bin/allcm 2bin/allcm
3bin/allec 3bin/allec
4bin/allneeded 4bin/allneeded
5bin/dvi2fax 5bin/dvi2fax
6bin/dvired 6bin/dvired
7bin/fmtutil 7bin/fmtutil
8bin/fmtutil-sys 8bin/fmtutil-sys
9bin/fontinst 9bin/fontinst
10bin/kpsepath 10bin/kpsepath
11bin/kpsetool 11bin/kpsetool
12bin/kpsewhere 12bin/kpsewhere
13bin/kpsexpand 13bin/kpsexpand
14bin/mktexfmt 14bin/mktexfmt
@@ -16,65 +16,54 @@ bin/ps2frag @@ -16,65 +16,54 @@ bin/ps2frag
16bin/pslatex 16bin/pslatex
17bin/rubibtex 17bin/rubibtex
18bin/rumakeindex 18bin/rumakeindex
19bin/texconfig 19bin/texconfig
20bin/texconfig-dialog 20bin/texconfig-dialog
21bin/texconfig-sys 21bin/texconfig-sys
22bin/texhash 22bin/texhash
23bin/texlinks 23bin/texlinks
24bin/updmap 24bin/updmap
25bin/updmap-sys 25bin/updmap-sys
26man/man1/allcm.1 26man/man1/allcm.1
27man/man1/allec.1 27man/man1/allec.1
28man/man1/allneeded.1 28man/man1/allneeded.1
29man/man1/ctxtools.1 
30man/man1/dvi2fax.1 29man/man1/dvi2fax.1
31man/man1/dvired.1 30man/man1/dvired.1
32man/man1/fmtutil-sys.1 31man/man1/fmtutil-sys.1
33man/man1/fmtutil.1 32man/man1/fmtutil.1
34man/man1/fontinst.1 33man/man1/fontinst.1
35man/man1/kpsepath.1 34man/man1/kpsepath.1
36man/man1/kpsetool.1 35man/man1/kpsetool.1
37man/man1/kpsewhere.1 36man/man1/kpsewhere.1
38man/man1/kpsexpand.1 37man/man1/kpsexpand.1
39man/man1/makempy.1 
40man/man1/mkjobtexmf.1 38man/man1/mkjobtexmf.1
41man/man1/mkocp.1 39man/man1/mkocp.1
42man/man1/mkofm.1 40man/man1/mkofm.1
43man/man1/mktexfmt.1 41man/man1/mktexfmt.1
44man/man1/mptopdf.1 
45man/man1/ofm2opl.1 42man/man1/ofm2opl.1
46man/man1/opl2ofm.1 43man/man1/opl2ofm.1
47man/man1/otp2ocp.1 44man/man1/otp2ocp.1
48man/man1/outocp.1 45man/man1/outocp.1
49man/man1/ovf2ovp.1 46man/man1/ovf2ovp.1
50man/man1/ovp2ovf.1 47man/man1/ovp2ovf.1
51man/man1/pdftools.1 
52man/man1/ps2frag.1 48man/man1/ps2frag.1
53man/man1/pslatex.1 49man/man1/pslatex.1
54man/man1/pstopdf.1 
55man/man1/rubibtex.1 50man/man1/rubibtex.1
56man/man1/rumakeindex.1 51man/man1/rumakeindex.1
57man/man1/texconfig-sys.1 52man/man1/texconfig-sys.1
58man/man1/texconfig.1 53man/man1/texconfig.1
59man/man1/texdoctk.1 54man/man1/texdoctk.1
60man/man1/texexec.1 
61man/man1/texfind.1 
62man/man1/texfont.1 
63man/man1/texhash.1 55man/man1/texhash.1
64man/man1/texlinks.1 56man/man1/texlinks.1
65man/man1/texmfstart.1 
66man/man1/textools.1 
67man/man1/texutil.1 
68man/man1/thumbpdf.1 57man/man1/thumbpdf.1
69man/man1/ttf2afm.1 58man/man1/ttf2afm.1
70man/man1/updmap-sys.1 59man/man1/updmap-sys.1
71man/man1/updmap.1 60man/man1/updmap.1
72man/man5/fmtutil.cnf.5 61man/man5/fmtutil.cnf.5
73man/man5/updmap.cfg.5 62man/man5/updmap.cfg.5
74share/texmf/texconfig/README 63share/texmf/texconfig/README
75share/texmf/texconfig/g/generic 64share/texmf/texconfig/g/generic
76share/texmf/texconfig/generic 65share/texmf/texconfig/generic
77share/texmf/texconfig/tcfmgr 66share/texmf/texconfig/tcfmgr
78share/texmf/texconfig/tcfmgr.map 67share/texmf/texconfig/tcfmgr.map
79share/texmf/texconfig/v/vt100 68share/texmf/texconfig/v/vt100
80share/texmf/texconfig/x/xterm 69share/texmf/texconfig/x/xterm
cvs diff -r1.4 -r1.5 pkgsrc/print/texlive-tetex/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/patches/Attic/patch-aa 2010/01/16 03:40:44 1.4
+++ pkgsrc/print/texlive-tetex/patches/Attic/patch-aa 2010/06/17 00:21:17 1.5
@@ -1,71 +1,84 @@ @@ -1,71 +1,84 @@
1$NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $ 1$NetBSD: patch-aa,v 1.5 2010/06/17 00:21:17 minskim Exp $
2 2
3--- Makefile.in.orig 2009-09-28 08:46:20.000000000 -0700 3--- Makefile.in.orig 2009-09-28 15:46:20.000000000 +0000
4+++ Makefile.in 4+++ Makefile.in
5@@ -197,7 +197,6 @@ dist_bin_SCRIPTS = \ 5@@ -197,7 +197,6 @@ dist_bin_SCRIPTS = \
6 kpsetool \ 6 kpsetool \
7 kpsewhere \ 7 kpsewhere \
8 ps2frag \ 8 ps2frag \
9- ps4pdf \ 9- ps4pdf \
10 pslatex \ 10 pslatex \
11 rubibtex \ 11 rubibtex \
12 rumakeindex \ 12 rumakeindex \
13@@ -225,7 +224,6 @@ dist_man1_MANS = \ 13@@ -212,20 +211,8 @@ dist_man1_MANS = \
14 context/texutil.man \ 14 allcm.man \
 15 allec.man \
 16 allneeded.man \
 17- context/ctxtools.man \
 18- context/makempy.man \
 19- context/mptopdf.man \
 20- context/pdftools.man \
 21- context/pstopdf.man \
 22- context/texexec.man \
 23- context/texfind.man \
 24- context/texfont.man \
 25- context/texmfstart.man \
 26- context/textools.man \
 27- context/texutil.man \
15 dvi2fax.man \ 28 dvi2fax.man \
16 dvired.man \ 29 dvired.man \
17- e2pall.man \ 30- e2pall.man \
18 fmtutil.man \ 31 fmtutil.man \
19 fontinst.man \ 32 fontinst.man \
20 kpsetool.man \ 33 kpsetool.man \
21@@ -254,14 +252,14 @@ dist_man5_MANS = \ 34@@ -254,14 +241,14 @@ dist_man5_MANS = \
22 fmtutil.cnf.5 \ 35 fmtutil.cnf.5 \
23 updmap.cfg.5 36 updmap.cfg.5
24  37
25-tetexdocdir = ${prefix}/texmf/doc/tetex 38-tetexdocdir = ${prefix}/texmf/doc/tetex
26+tetexdocdir = ${prefix}/texmf 39+tetexdocdir = ${prefix}/texmf
27 dist_tetexdoc_DATA = \ 40 dist_tetexdoc_DATA = \
28 doc/TETEXDOC.dvi \ 41 doc/TETEXDOC.dvi \
29 doc/TETEXDOC.pdf \ 42 doc/TETEXDOC.pdf \
30 doc/TETEXDOC.ps \ 43 doc/TETEXDOC.ps \
31 doc/teTeX-FAQ 44 doc/teTeX-FAQ
32  45
33-texconfdir = ${prefix} 46-texconfdir = ${prefix}
34+texconfdir = ${prefix}/share 47+texconfdir = ${prefix}/share
35 nobase_dist_texconf_DATA = \ 48 nobase_dist_texconf_DATA = \
36 texmf/texconfig/README \ 49 texmf/texconfig/README \
37 texmf/texconfig/g/generic \ 50 texmf/texconfig/g/generic \
38@@ -269,7 +267,7 @@ nobase_dist_texconf_DATA = \ 51@@ -269,7 +256,7 @@ nobase_dist_texconf_DATA = \
39 texmf/texconfig/v/vt100 \ 52 texmf/texconfig/v/vt100 \
40 texmf/texconfig/x/xterm 53 texmf/texconfig/x/xterm
41  54
42-texconfigdir = ${prefix}/texmf/texconfig 55-texconfigdir = ${prefix}/texmf/texconfig
43+texconfigdir = ${prefix}/share/texmf/texconfig 56+texconfigdir = ${prefix}/share/texmf/texconfig
44 dist_texconfig_SCRIPTS = tcfmgr 57 dist_texconfig_SCRIPTS = tcfmgr
45 dist_texconfig_DATA = tcfmgr.map 58 dist_texconfig_DATA = tcfmgr.map
46 web2cdir = ${prefix}/texmf/web2c 59 web2cdir = ${prefix}/texmf/web2c
47@@ -753,8 +751,8 @@ info: info-am 60@@ -753,8 +740,8 @@ info: info-am
48  61
49 info-am: 62 info-am:
50  63
51-install-data-am: install-dist_tetexdocDATA install-dist_texconfigDATA \ 64-install-data-am: install-dist_tetexdocDATA install-dist_texconfigDATA \
52- install-dist_texconfigSCRIPTS install-dist_web2cDATA \ 65- install-dist_texconfigSCRIPTS install-dist_web2cDATA \
53+install-data-am: install-dist_texconfigDATA \ 66+install-data-am: install-dist_texconfigDATA \
54+ install-dist_texconfigSCRIPTS \ 67+ install-dist_texconfigSCRIPTS \
55 install-man install-nobase_dist_texconfDATA 68 install-man install-nobase_dist_texconfDATA
56 @$(NORMAL_INSTALL) 69 @$(NORMAL_INSTALL)
57 $(MAKE) $(AM_MAKEFLAGS) install-data-hook 70 $(MAKE) $(AM_MAKEFLAGS) install-data-hook
58@@ -848,22 +846,15 @@ install-exec-hook: 71@@ -848,22 +835,15 @@ install-exec-hook:
59  72
60 install-data-hook: 73 install-data-hook:
61 cd $(DESTDIR)$(man1dir) \ 74 cd $(DESTDIR)$(man1dir) \
62- && rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \ 75- && rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \
63- kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \ 76- kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \
64- odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 \ 77- odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 \
65- && $(LN_S) aleph.1 lambda.1 \ 78- && $(LN_S) aleph.1 lambda.1 \
66+ && rm -f allec.1 fmtutil-sys.1 kpsexpand.1 \ 79+ && rm -f allec.1 fmtutil-sys.1 kpsexpand.1 \
67+ kpsepath.1 mktexfmt.1 \ 80+ kpsepath.1 mktexfmt.1 \
68+ texconfig-sys.1 texhash.1 updmap-sys.1 \ 81+ texconfig-sys.1 texhash.1 updmap-sys.1 \
69 && $(LN_S) allcm.1 allec.1 \ 82 && $(LN_S) allcm.1 allec.1 \
70- && $(LN_S) cweb.1 ctangle.1 \ 83- && $(LN_S) cweb.1 ctangle.1 \
71- && $(LN_S) cweb.1 cweave.1 \ 84- && $(LN_S) cweb.1 cweave.1 \