[pkgsrc/trunk]: pkgsrc/print/teTeX3-bin Resolve conflicts between tex-a2ping,...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aeabf4c24ef5
branches:  trunk
changeset: 399672:aeabf4c24ef5
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Sep 24 18:53:46 2009 +0000

description:
Resolve conflicts between tex-a2ping, texlive-pdftools, and teTeX-bin,
so that the teTeX meta package can be installed.

This should have been done in teTeX3-bin-3.0nb35.

diffstat:

 print/teTeX3-bin/Makefile         |   4 ++--
 print/teTeX3-bin/distinfo         |   4 ++--
 print/teTeX3-bin/patches/patch-as |  16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r 6bfb550c8a29 -r aeabf4c24ef5 print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Thu Sep 24 18:46:26 2009 +0000
+++ b/print/teTeX3-bin/Makefile Thu Sep 24 18:53:46 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2009/09/20 09:45:28 tron Exp $
+# $NetBSD: Makefile,v 1.52 2009/09/24 18:53:46 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   36
+PKGREVISION=   37
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
diff -r 6bfb550c8a29 -r aeabf4c24ef5 print/teTeX3-bin/distinfo
--- a/print/teTeX3-bin/distinfo Thu Sep 24 18:46:26 2009 +0000
+++ b/print/teTeX3-bin/distinfo Thu Sep 24 18:53:46 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2009/04/13 21:58:26 minskim Exp $
+$NetBSD: distinfo,v 1.21 2009/09/24 18:53:46 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -17,7 +17,7 @@
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
-SHA1 (patch-as) = cfcd7450f30b4ce8c5775e398e0e964573ec62a0
+SHA1 (patch-as) = 767acf743b5f976187aa10fcb5fad5ae5508c324
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff -r 6bfb550c8a29 -r aeabf4c24ef5 print/teTeX3-bin/patches/patch-as
--- a/print/teTeX3-bin/patches/patch-as Thu Sep 24 18:46:26 2009 +0000
+++ b/print/teTeX3-bin/patches/patch-as Thu Sep 24 18:53:46 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.6 2009/04/13 21:58:26 minskim Exp $
+$NetBSD: patch-as,v 1.7 2009/09/24 18:53:47 minskim Exp $
 
---- texk/tetex/Makefile.in.orig        2005-02-04 14:20:54.000000000 -0800
+--- texk/tetex/Makefile.in.orig        2005-02-04 22:20:54.000000000 +0000
 +++ texk/tetex/Makefile.in
-@@ -8,10 +8,7 @@ ac_include ../make/programs.mk
+@@ -8,26 +8,21 @@ ac_include ../make/programs.mk
  man5dir = $(mandir)/man5
  
  SCRIPTS = \
@@ -12,9 +12,10 @@
 -  ps4pdf fmtutil-sys texconfig-sys updmap-sys
 +  texdoc texdoctk texexec
  
- PDFSCRIPTS = a2ping e2pall epstopdf
+-PDFSCRIPTS = a2ping e2pall epstopdf
++PDFSCRIPTS = ""
  
-@@ -19,11 +16,9 @@ PERLWRAPPED = fdf2tan fdf2tex makempy te
+ PERLWRAPPED = fdf2tan fdf2tex makempy texfind texfont texshow texutil \
    thumbpdf pdfcrop uniqleaf
  
  manpgs = \
@@ -29,6 +30,11 @@
  
  INFOFILES= latex.info
  POOLFILES = pdfetex-pl.pool
+-all: $(SCRIPTS) $(PDFSCRIPTS)
++all: $(SCRIPTS)
+ default: all
+ 
+ install: install-data install-exec
 @@ -39,30 +34,9 @@ install-data:: $(INFOFILES)
        for p in $(manpgs); do \
          $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \