diff options
| author | minskim <minskim@pkgsrc.org> | 2013-12-18 02:30:32 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2013-12-18 02:30:32 +0000 |
| commit | 6511eaf127331616c32fd44c421c27f0c814ece6 (patch) | |
| tree | 6d3b897ca4038116db7569637d22af04bd64ddc4 /print | |
| parent | 7a7593c82a522f5cb938ac18d2bbcb170c42f210 (diff) | |
| download | pkgsrc-6511eaf127331616c32fd44c421c27f0c814ece6.tar.gz | |
Resolve conflicts between teTeX-bin and tex-context
Diffstat (limited to 'print')
| -rw-r--r-- | print/teTeX3-bin/Makefile | 4 | ||||
| -rw-r--r-- | print/teTeX3-bin/PLIST | 3 | ||||
| -rw-r--r-- | print/teTeX3-bin/distinfo | 4 | ||||
| -rw-r--r-- | print/teTeX3-bin/patches/patch-as | 13 |
4 files changed, 12 insertions, 12 deletions
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile index 2ca086e07d4..bb296a81fde 100644 --- a/print/teTeX3-bin/Makefile +++ b/print/teTeX3-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.75 2013/11/13 19:02:25 minskim Exp $ +# $NetBSD: Makefile,v 1.76 2013/12/18 02:30:32 minskim Exp $ DISTNAME= tetex-src-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/:C/src/bin/} -PKGREVISION= 54 +PKGREVISION= 55 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} diff --git a/print/teTeX3-bin/PLIST b/print/teTeX3-bin/PLIST index 2f385bfdca7..ef977a34278 100644 --- a/print/teTeX3-bin/PLIST +++ b/print/teTeX3-bin/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.26 2013/11/13 19:02:25 minskim Exp $ +@comment $NetBSD: PLIST,v 1.27 2013/12/18 02:30:32 minskim Exp $ bin/fdf2tan bin/fdf2tex bin/lamed bin/makempy -bin/texexec bin/texfind bin/texfont bin/texshow diff --git a/print/teTeX3-bin/distinfo b/print/teTeX3-bin/distinfo index fae7d4a9ea6..66c3c5d7322 100644 --- a/print/teTeX3-bin/distinfo +++ b/print/teTeX3-bin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2013/11/13 19:02:25 minskim Exp $ +$NetBSD: distinfo,v 1.27 2013/12/18 02:30:32 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-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47 SHA1 (patch-aq) = f03771a228c13d3a694319f785e3d67811058a05 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b -SHA1 (patch-as) = c96d45dc5cf0ca57299247aab6fe8e86494823e7 +SHA1 (patch-as) = 77a9ebceb0140cf3f318c23c833cc9f8def56534 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344 diff --git a/print/teTeX3-bin/patches/patch-as b/print/teTeX3-bin/patches/patch-as index 8c34f54a647..7121501b720 100644 --- a/print/teTeX3-bin/patches/patch-as +++ b/print/teTeX3-bin/patches/patch-as @@ -1,16 +1,17 @@ -$NetBSD: patch-as,v 1.12 2013/11/13 19:02:25 minskim Exp $ +$NetBSD: patch-as,v 1.13 2013/12/18 02:30:32 minskim Exp $ --- texk/tetex/Makefile.in.orig 2005-02-04 22:20:54.000000000 +0000 +++ texk/tetex/Makefile.in -@@ -8,26 +8,20 @@ ac_include ../make/programs.mk +@@ -7,27 +7,20 @@ ac_include ../make/programs.mk + man5dir = $(mandir)/man5 - SCRIPTS = \ +-SCRIPTS = \ - allcm allneeded dvi2fax dvired fmtutil fontinst \ - kpsetool kpsewhere ps2frag pslatex rubibtex rumakeindex \ - texconfig texconfig-dialog texdoc texdoctk texexec texlinks updmap \ - ps4pdf fmtutil-sys texconfig-sys updmap-sys -+ texexec ++SCRIPTS = -PDFSCRIPTS = a2ping e2pall epstopdf +PDFSCRIPTS = "" @@ -35,7 +36,7 @@ $NetBSD: patch-as,v 1.12 2013/11/13 19:02:25 minskim Exp $ default: all install: install-data install-exec -@@ -39,49 +33,11 @@ install-data:: $(INFOFILES) +@@ -39,49 +32,11 @@ install-data:: $(INFOFILES) for p in $(manpgs); do \ $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ done @@ -85,7 +86,7 @@ $NetBSD: patch-as,v 1.12 2013/11/13 19:02:25 minskim Exp $ install-exec: -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) -@@ -96,16 +52,10 @@ install-exec: +@@ -96,16 +51,10 @@ install-exec: else \ true; \ fi |