summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2010-09-24 21:54:56 +0000
committerminskim <minskim@pkgsrc.org>2010-09-24 21:54:56 +0000
commitd6ab442905ffc1b3cfa14b78b938a69bb2313456 (patch)
treea9eac52d8965a7fcc3fd8246f4672f137fa0f95f /print
parent83b10cf527390c72f29bd1a3f06e2949d0f1dcae (diff)
downloadpkgsrc-d6ab442905ffc1b3cfa14b78b938a69bb2313456.tar.gz
Resolve conflicts between web2c and tex-latex-bin-doc.
Diffstat (limited to 'print')
-rw-r--r--print/web2c/Makefile4
-rw-r--r--print/web2c/PLIST3
-rw-r--r--print/web2c/distinfo4
-rw-r--r--print/web2c/patches/patch-am11
4 files changed, 15 insertions, 7 deletions
diff --git a/print/web2c/Makefile b/print/web2c/Makefile
index 21b8b3a1110..279385de7dc 100644
--- a/print/web2c/Makefile
+++ b/print/web2c/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/09/19 15:35:59 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2010/09/24 21:54:56 minskim Exp $
DISTNAME= texlive-20100720-source
PKGNAME= web2c-2010
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
EXTRACT_SUFX= .tar.xz
diff --git a/print/web2c/PLIST b/print/web2c/PLIST
index f29ebfb9443..b499e617ac1 100644
--- a/print/web2c/PLIST
+++ b/print/web2c/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/09/13 04:09:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/09/24 21:54:56 minskim Exp $
bin/aleph
bin/bibtex
bin/ctangle
@@ -77,7 +77,6 @@ man/man1/outocp.1
man/man1/ovf2ovp.1
man/man1/ovp2ovf.1
man/man1/patgen.1
-man/man1/pdflatex.1
man/man1/pdftex.1
man/man1/pdftosrc.1
man/man1/pktogf.1
diff --git a/print/web2c/distinfo b/print/web2c/distinfo
index 1b370bbdd0b..880c148837e 100644
--- a/print/web2c/distinfo
+++ b/print/web2c/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2010/09/13 04:09:54 minskim Exp $
+$NetBSD: distinfo,v 1.8 2010/09/24 21:54:56 minskim Exp $
SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
Size (texlive-20100720-source.tar.xz) = 33484212 bytes
-SHA1 (patch-am) = 05fca26634f16926e52820a6505dc99156dfae11
+SHA1 (patch-am) = c6c08e8c1bace8e93eb737f64f2d2f5128db0bfd
diff --git a/print/web2c/patches/patch-am b/print/web2c/patches/patch-am
index 31c18006c7f..41031530eaf 100644
--- a/print/web2c/patches/patch-am
+++ b/print/web2c/patches/patch-am
@@ -1,7 +1,16 @@
-$NetBSD: patch-am,v 1.3 2010/09/13 04:09:54 minskim Exp $
+$NetBSD: patch-am,v 1.4 2010/09/24 21:54:57 minskim Exp $
--- man/Makefile.in.orig 2010-07-06 09:17:20.000000000 +0000
+++ man/Makefile.in
+@@ -40,7 +40,7 @@ host_triplet = @host@
+ @MP_TRUE@am__append_5 = mpost.man
+ @ETEX_TRUE@am__append_6 = etex.man
+ @PDFTEX_TRUE@am__append_7 = $(pdftex_man_sources)
+-@PDFTEX_TRUE@am__append_8 = pdftex:pdflatex
++@PDFTEX_TRUE@am__append_8 = pdftex
+ @LUATEX_TRUE@am__append_9 = luatex.man
+ @XETEX_TRUE@am__append_10 = # xetex.man
+ @OTANGLE_TRUE@am__append_11 = $(otangle_man_sources)
@@ -308,7 +308,7 @@ x_tool_libs = @x_tool_libs@
man_sources = $(bootstrap_man_sources) $(am__append_1) $(am__append_2) \
$(am__append_3) $(am__append_5) $(am__append_6) \