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 (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,61 +1,61 @@ @@ -1,61 +1,61 @@
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 \
19 ${DISTNAME}/texk/make \ 19 ${DISTNAME}/texk/make \
20 ${DISTNAME}/texk/install.sh \ 20 ${DISTNAME}/texk/install.sh \
21 ${DISTNAME}/texk/mkinstalldirs 21 ${DISTNAME}/texk/mkinstalldirs
22 22
23PKG_DESTDIR_SUPPORT= user-destdir 23PKG_DESTDIR_SUPPORT= user-destdir
24 24
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26WRKSRC= ${WRKDIR}/${DISTNAME}/texk/tetex 26WRKSRC= ${WRKDIR}/${DISTNAME}/texk/tetex
27 27
28PKG_SYSCONFSUBDIR= texmf 28PKG_SYSCONFSUBDIR= texmf
29 29
30MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c 30MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c
31CONF_FILES+= ${PREFIX}/share/texmf/web2c/fmtutil.cnf \ 31CONF_FILES+= ${PREFIX}/share/texmf/web2c/fmtutil.cnf \
32 ${PKG_SYSCONFDIR}/web2c/fmtutil.cnf 32 ${PKG_SYSCONFDIR}/web2c/fmtutil.cnf
33CONF_FILES+= ${PREFIX}/share/texmf/web2c/updmap.cfg \ 33CONF_FILES+= ${PREFIX}/share/texmf/web2c/updmap.cfg \
34 ${PKG_SYSCONFDIR}/web2c/updmap.cfg 34 ${PKG_SYSCONFDIR}/web2c/updmap.cfg
35FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys 35FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys
36 36
37FIND_PREFIX:= DIALOG_PREFIX=dialog 37FIND_PREFIX:= DIALOG_PREFIX=dialog
38.include "../../mk/find-prefix.mk" 38.include "../../mk/find-prefix.mk"
39 39
40SUBST_CLASSES+= paths 40SUBST_CLASSES+= paths
41SUBST_MESSAGE.paths= Setting a path to dialog. 41SUBST_MESSAGE.paths= Setting a path to dialog.
42SUBST_STAGE.paths= pre-configure 42SUBST_STAGE.paths= pre-configure
43SUBST_FILES.paths= texconfig-dialog 43SUBST_FILES.paths= texconfig-dialog
44SUBST_SED.paths= -e 's,@DIALOG_PREFIX@,${DIALOG_PREFIX},g' 44SUBST_SED.paths= -e 's,@DIALOG_PREFIX@,${DIALOG_PREFIX},g'
45 45
46INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ 46INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
47 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 47 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
48 48
49TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} 49TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR}
50TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf 50TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf
51 51
52.include "../../print/kpathsea/buildlink3.mk" 52.include "../../print/kpathsea/buildlink3.mk"
53.include "../../print/kpathsea/texmf.mk" 53.include "../../print/kpathsea/texmf.mk"
54 54
55post-install: 55post-install:
56.for f in fmtutil.cnf updmap.cfg 56.for f in fmtutil.cnf updmap.cfg
57 ${INSTALL_DATA} ${FILESDIR}/${f} \ 57 ${INSTALL_DATA} ${FILESDIR}/${f} \
58 ${DESTDIR}${PREFIX}/share/texmf/web2c 58 ${DESTDIR}${PREFIX}/share/texmf/web2c
59.endfor 59.endfor
60 60
61.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/Attic/PLIST (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,85 +1,82 @@ @@ -1,85 +1,82 @@
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
48man/man1/ofm2opl.1 45man/man1/ofm2opl.1
49man/man1/opl2ofm.1 46man/man1/opl2ofm.1
50man/man1/otp2ocp.1 47man/man1/otp2ocp.1
51man/man1/outocp.1 48man/man1/outocp.1
52man/man1/ovf2ovp.1 49man/man1/ovf2ovp.1
53man/man1/ovp2ovf.1 50man/man1/ovp2ovf.1
54man/man1/pdftools.1 51man/man1/pdftools.1
55man/man1/ps2frag.1 52man/man1/ps2frag.1
56man/man1/pslatex.1 53man/man1/pslatex.1
57man/man1/pstopdf.1 54man/man1/pstopdf.1
58man/man1/rubibtex.1 55man/man1/rubibtex.1
59man/man1/rumakeindex.1 56man/man1/rumakeindex.1
60man/man1/texconfig-sys.1 57man/man1/texconfig-sys.1
61man/man1/texconfig.1 58man/man1/texconfig.1
62man/man1/texdoctk.1 59man/man1/texdoctk.1
63man/man1/texexec.1 60man/man1/texexec.1
64man/man1/texfind.1 61man/man1/texfind.1
65man/man1/texfont.1 62man/man1/texfont.1
66man/man1/texhash.1 63man/man1/texhash.1
67man/man1/texlinks.1 64man/man1/texlinks.1
68man/man1/texmfstart.1 65man/man1/texmfstart.1
69man/man1/textools.1 66man/man1/textools.1
70man/man1/texutil.1 67man/man1/texutil.1
71man/man1/thumbpdf.1 68man/man1/thumbpdf.1
72man/man1/ttf2afm.1 69man/man1/ttf2afm.1
73man/man1/updmap-sys.1 70man/man1/updmap-sys.1
74man/man1/updmap.1 71man/man1/updmap.1
75man/man5/fmtutil.cnf.5 72man/man5/fmtutil.cnf.5
76man/man5/updmap.cfg.5 73man/man5/updmap.cfg.5
77share/texmf/texconfig/README 74share/texmf/texconfig/README
78share/texmf/texconfig/g/generic 75share/texmf/texconfig/g/generic
79share/texmf/texconfig/generic 76share/texmf/texconfig/generic
80share/texmf/texconfig/tcfmgr 77share/texmf/texconfig/tcfmgr
81share/texmf/texconfig/tcfmgr.map 78share/texmf/texconfig/tcfmgr.map
82share/texmf/texconfig/v/vt100 79share/texmf/texconfig/v/vt100
83share/texmf/texconfig/x/xterm 80share/texmf/texconfig/x/xterm
84share/texmf/web2c/fmtutil.cnf 81share/texmf/web2c/fmtutil.cnf
85share/texmf/web2c/updmap.cfg 82share/texmf/web2c/updmap.cfg
cvs diff -r1.2 -r1.3 pkgsrc/print/texlive-tetex/Attic/distinfo (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 (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,54 +1,72 @@ @@ -1,54 +1,72 @@
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) \
18- lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \ 36- lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
19- kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \ 37- kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
20- cweave.$(manext) odvicopy.$(manext) \ 38- cweave.$(manext) odvicopy.$(manext) \
21- odvitype.$(manext) texconfig-sys.$(manext) \ 39- odvitype.$(manext) texconfig-sys.$(manext) \
22+ kpsepath.$(manext) \ 40+ kpsepath.$(manext) \
23+ kpsexpand.$(manext) \ 41+ kpsexpand.$(manext) \
24+ texconfig-sys.$(manext) \ 42+ texconfig-sys.$(manext) \
25 updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext) 43 updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext)
26 ln -s allcm.$(manext) $(man1dir)/allec.$(manext) 44 ln -s allcm.$(manext) $(man1dir)/allec.$(manext)
27 ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext) 45 ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
28- ln -s omega.$(manext) $(man1dir)/lambda.$(manext) 46- ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
29- ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext) 47- ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext)
30 ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext) 48 ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext)
31 ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext) 49 ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext)
32- ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext) 50- ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
33- ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext) 51- ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
34- ln -s cweb.$(manext) $(man1dir)/cweave.$(manext) 52- ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
35- ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext) 53- ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
36- ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext) 54- ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
37 ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext) 55 ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext)
38 ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext) 56 ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
39 ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext) 57 ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
40 ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext) 58 ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
41- for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \ 59- for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
42- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \ 60- $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
43- done 61- done
44 $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x 62 $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
45 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g 63 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
46 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v 64 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v
47@@ -77,7 +66,6 @@ install-data:: 65@@ -77,7 +66,6 @@ install-data::
48 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig 66 $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
49 $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr 67 $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
50 $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map 68 $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
51- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf 69- $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf
52  70
53 install-exec:  71 install-exec:
54 -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) 72 -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)