Sat Sep 19 15:31:04 2009 UTC ()
Resolve conflicts between texlive-tetex and texlive-pdftools.


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

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

--- pkgsrc/print/texlive-tetex/Attic/PLIST 2009/06/14 18:12:02 1.2
+++ pkgsrc/print/texlive-tetex/Attic/PLIST 2009/09/19 15:31:03 1.3
@@ -1,47 +1,44 @@ @@ -1,47 +1,44 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:02 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2009/09/19 15:31:03 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
15bin/ps2frag 15bin/ps2frag
16bin/ps4pdf 
17bin/pslatex 16bin/pslatex
18bin/rubibtex 17bin/rubibtex
19bin/rumakeindex 18bin/rumakeindex
20bin/texconfig 19bin/texconfig
21bin/texconfig-dialog 20bin/texconfig-dialog
22bin/texconfig-sys 21bin/texconfig-sys
23bin/texhash 22bin/texhash
24bin/texlinks 23bin/texlinks
25bin/updmap 24bin/updmap
26bin/updmap-sys 25bin/updmap-sys
27man/man1/allcm.1 26man/man1/allcm.1
28man/man1/allec.1 27man/man1/allec.1
29man/man1/allneeded.1 28man/man1/allneeded.1
30man/man1/ctxtools.1 29man/man1/ctxtools.1
31man/man1/dvi2fax.1 30man/man1/dvi2fax.1
32man/man1/dvired.1 31man/man1/dvired.1
33man/man1/e2pall.1 
34man/man1/epstopdf.1 
35man/man1/fmtutil-sys.1 32man/man1/fmtutil-sys.1
36man/man1/fmtutil.1 33man/man1/fmtutil.1
37man/man1/fontinst.1 34man/man1/fontinst.1
38man/man1/kpsepath.1 35man/man1/kpsepath.1
39man/man1/kpsetool.1 36man/man1/kpsetool.1
40man/man1/kpsewhere.1 37man/man1/kpsewhere.1
41man/man1/kpsexpand.1 38man/man1/kpsexpand.1
42man/man1/makempy.1 39man/man1/makempy.1
43man/man1/mkjobtexmf.1 40man/man1/mkjobtexmf.1
44man/man1/mkocp.1 41man/man1/mkocp.1
45man/man1/mkofm.1 42man/man1/mkofm.1
46man/man1/mktexfmt.1 43man/man1/mktexfmt.1
47man/man1/mptopdf.1 44man/man1/mptopdf.1
cvs diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/Attic/distinfo 2009/04/13 20:52:56 1.2
+++ pkgsrc/print/texlive-tetex/Attic/distinfo 2009/09/19 15:31:03 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2009/04/13 20:52:56 minskim Exp $ 1$NetBSD: distinfo,v 1.3 2009/09/19 15:31:03 minskim Exp $
2 2
3SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d 3SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
4RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38 4RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
5Size (texlive-20080816-source.tar.lzma) = 23175835 bytes 5Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
6SHA1 (patch-aa) = 544ee603f56205215cda935eb4a12b3d253333f7 6SHA1 (patch-aa) = d8e7deffb731f1ad1f27ab085ef6185cd96d5461
7SHA1 (patch-ab) = c73c30b82530c57c0f832e2ddcf32697e2e50d04 7SHA1 (patch-ab) = c73c30b82530c57c0f832e2ddcf32697e2e50d04
cvs diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/texlive-tetex/patches/Attic/patch-aa 2009/04/13 20:52:56 1.2
+++ pkgsrc/print/texlive-tetex/patches/Attic/patch-aa 2009/09/19 15:31:03 1.3
@@ -1,17 +1,35 @@ @@ -1,17 +1,35 @@
1$NetBSD: patch-aa,v 1.2 2009/04/13 20:52:56 minskim Exp $ 1$NetBSD: patch-aa,v 1.3 2009/09/19 15:31:03 minskim Exp $
2 2
3--- Makefile.in.orig 2008-07-05 09:43:44.000000000 -0700 3--- Makefile.in.orig 2008-07-05 09:43:44.000000000 -0700
4+++ Makefile.in 4+++ Makefile.in
 5@@ -11,7 +11,7 @@ man5dir = $(mandir)/man5
 6
 7 SCRIPTS = \
 8 allcm allneeded dvi2fax dvired fmtutil fmtutil-sys fontinst \
 9- kpsetool kpsewhere ps2frag ps4pdf pslatex rubibtex rumakeindex \
 10+ kpsetool kpsewhere ps2frag pslatex rubibtex rumakeindex \
 11 texconfig texconfig-dialog texconfig-sys \
 12 texlinks updmap updmap-sys
 13
 14@@ -22,7 +22,7 @@ contextmanpgs = \
 15 # The man pages for script packages such as thumbpdf and mkjobtexmf are
 16 # copied here by hand; ctan2tl doesn't know how to handle this case. Help.
 17 manpgs = \
 18- allcm allec allneeded dvi2fax dvired e2pall epstopdf fontinst \
 19+ allcm allec allneeded dvi2fax dvired fontinst \
 20 kpsetool kpsewhere mkjobtexmf mkocp mkofm ofm2opl opl2ofm otp2ocp outocp \
 21 ovf2ovp ovp2ovf ps2frag pslatex rubibtex rumakeindex texconfig \
 22 texdoctk thumbpdf ttf2afm updmap
5@@ -34,7 +34,7 @@ install: install-data install-exec 23@@ -34,7 +34,7 @@ install: install-data install-exec
6  24
7 # Auxiliary files. 25 # Auxiliary files.
8 install-data:: 26 install-data::
9- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex 27- $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
10+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) 28+ $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir)
11 for p in $(manpgs); do \ 29 for p in $(manpgs); do \
12 $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ 30 $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
13 done 31 done
14@@ -46,29 +46,18 @@ install-data:: 32@@ -46,29 +46,18 @@ install-data::
15 $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5 33 $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5
16 $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5 34 $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5
17 cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \ 35 cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \