summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorminskim <minskim>2009-09-19 15:31:03 +0000
committerminskim <minskim>2009-09-19 15:31:03 +0000
commit47834afc0dccd8deda75bcb8e3d9f2f3e370e5a6 (patch)
treed47676e2991e3fc1e82362996fb19db32cb62eeb /print
parent6fbb7e8fbc386126ee3775409a30c7fd7be006f8 (diff)
downloadpkgsrc-47834afc0dccd8deda75bcb8e3d9f2f3e370e5a6.tar.gz
Resolve conflicts between texlive-tetex and texlive-pdftools.
Diffstat (limited to 'print')
-rw-r--r--print/texlive-tetex/Makefile4
-rw-r--r--print/texlive-tetex/PLIST5
-rw-r--r--print/texlive-tetex/distinfo4
-rw-r--r--print/texlive-tetex/patches/patch-aa20
4 files changed, 24 insertions, 9 deletions
diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index b6be237356f..ffc4c37654f 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 21:31:04 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/19 15:31:03 minskim Exp $
DISTNAME= texlive-20080816-source
PKGNAME= texlive-tetex-2008
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.lzma
diff --git a/print/texlive-tetex/PLIST b/print/texlive-tetex/PLIST
index 215916bc984..5e4f10fcc3d 100644
--- a/print/texlive-tetex/PLIST
+++ b/print/texlive-tetex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/19 15:31:03 minskim Exp $
bin/allcm
bin/allec
bin/allneeded
@@ -13,7 +13,6 @@ bin/kpsewhere
bin/kpsexpand
bin/mktexfmt
bin/ps2frag
-bin/ps4pdf
bin/pslatex
bin/rubibtex
bin/rumakeindex
@@ -30,8 +29,6 @@ man/man1/allneeded.1
man/man1/ctxtools.1
man/man1/dvi2fax.1
man/man1/dvired.1
-man/man1/e2pall.1
-man/man1/epstopdf.1
man/man1/fmtutil-sys.1
man/man1/fmtutil.1
man/man1/fontinst.1
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index a6d9900e9b6..7f80097063e 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/04/13 20:52:56 minskim Exp $
+$NetBSD: distinfo,v 1.3 2009/09/19 15:31:03 minskim Exp $
SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = 544ee603f56205215cda935eb4a12b3d253333f7
+SHA1 (patch-aa) = d8e7deffb731f1ad1f27ab085ef6185cd96d5461
SHA1 (patch-ab) = c73c30b82530c57c0f832e2ddcf32697e2e50d04
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index e006e4f3bb4..ca0465a436e 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,7 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2009/04/13 20:52:56 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2009/09/19 15:31:03 minskim Exp $
--- Makefile.in.orig 2008-07-05 09:43:44.000000000 -0700
+++ Makefile.in
+@@ -11,7 +11,7 @@ man5dir = $(mandir)/man5
+
+ SCRIPTS = \
+ allcm allneeded dvi2fax dvired fmtutil fmtutil-sys fontinst \
+- kpsetool kpsewhere ps2frag ps4pdf pslatex rubibtex rumakeindex \
++ kpsetool kpsewhere ps2frag pslatex rubibtex rumakeindex \
+ texconfig texconfig-dialog texconfig-sys \
+ texlinks updmap updmap-sys
+
+@@ -22,7 +22,7 @@ contextmanpgs = \
+ # The man pages for script packages such as thumbpdf and mkjobtexmf are
+ # copied here by hand; ctan2tl doesn't know how to handle this case. Help.
+ manpgs = \
+- allcm allec allneeded dvi2fax dvired e2pall epstopdf fontinst \
++ allcm allec allneeded dvi2fax dvired fontinst \
+ kpsetool kpsewhere mkjobtexmf mkocp mkofm ofm2opl opl2ofm otp2ocp outocp \
+ ovf2ovp ovp2ovf ps2frag pslatex rubibtex rumakeindex texconfig \
+ texdoctk thumbpdf ttf2afm updmap
@@ -34,7 +34,7 @@ install: install-data install-exec
# Auxiliary files.