[patch] Changes for the dev-lang/mmix folder

changes.diff (text/plain), 3.56 KB, created by Matthias Maier on 2014-05-04 14:34:35 UTC

diff --git a/files/mmix-20060324-includes.patch b/files/mmix-20060324-includes.patch
deleted file mode 100644
index a48c56a..0000000
--- a/files/mmix-20060324-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mmmix.w	2004-07-11 02:39:28.000000000 +0200
-+++ b/mmmix.w	2010-09-18 03:16:39.000000000 +0200
-@@ -34,6 +34,8 @@
- 
- @c
- #include <stdio.h>
-+#include <stdlib.h> /* exit() */
-+#include <string.h> /* strlen() */
- #include "mmix-pipe.h"
- @#
- char *config_file_name, *prog_file_name;
diff --git a/files/mmix-20060324-makefile.patch b/files/mmix-20060324-makefile.patch
deleted file mode 100644
index 9dc65dd..0000000
--- a/files/mmix-20060324-makefile.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- Makefile.orig	2005-05-19 04:53:25.000000000 +0200
-+++ Makefile	2010-09-18 03:33:21.000000000 +0200
-@@ -27,23 +27,23 @@
- 	if test -r $*.ch; then cweave $*.w $*.ch; else cweave $*.w; fi
- 
- .w.o:
--	make $*.c
--	make $*.o
-+	$(MAKE) $*.c
-+	$(MAKE) $*.o
- 
- .w:
--	make $*.c
--	make $*
-+	$(MAKE) $*.c
-+	$(MAKE) $*
- 
- .w.dvi:
--	make $*.tex
--	make $*.dvi
-+	$(MAKE) $*.tex
-+	$(MAKE) $*.dvi
- 
- .w.ps:
--	make $*.dvi
--	make $*.ps
-+	$(MAKE) $*.dvi
-+	$(MAKE) $*.ps
- 
- .w.pdf:
--	make $*.tex
-+	$(MAKE) $*.tex
- 	case "$(PDFTEX)" in \
- 	 dvipdfm ) tex "\let\pdf+ \input $*"; dvipdfm $* ;; \
- 	 pdftex ) pdftex $* ;; \
-@@ -73,24 +73,23 @@
- clean:
- 	rm -f *~ *.o *.c *.h *.tex *.log *.dvi *.toc *.idx *.scn *.ps core
- 
--mmix-pipe.o: mmix-pipe.c abstime
-+abstime.h: abstime
- 	./abstime > abstime.h
-+
-+mmix-pipe.o: mmix-pipe.c abstime abstime.h
- 	$(CC) $(CFLAGS) -c mmix-pipe.c
--	rm abstime.h
- 
- mmix-config.o: mmix-pipe.o
- 
- mmmix:  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o mmmix.c
--	$(CC) $(CFLAGS) mmmix.c \
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmmix.c \
- 	  mmix-arith.o mmix-pipe.o mmix-config.o mmix-mem.o mmix-io.o -o mmmix
- 
- mmixal: mmix-arith.o mmixal.c
--	$(CC) $(CFLAGS) mmixal.c mmix-arith.o -o mmixal
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmixal.c mmix-arith.o -o mmixal
- 
--mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime
--	./abstime > abstime.h
--	$(CC) $(CFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
--	rm abstime.h
-+mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime abstime.h
-+	$(CC) $(CFLAGS) $(LDFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
- 
- tarfile: $(ALL)
- 	tar cvf /tmp/mmix.tar $(ALL)
diff --git a/mmix-20110605.ebuild b/mmix-20110605.ebuild
index 3c3cb5f..ef50aac 100644
--- a/mmix-20110605.ebuild
+++ b/mmix-20110605.ebuild
@@ -10,7 +10,12 @@ DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator."
 HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
 SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tar.gz"
 
-DEPEND="|| ( >=dev-util/cweb-3.63 virtual/tex-base )"
+# texlive-core contains the ctangle executable, texlive-basic (starting
+# from version 2013) the mktexfmt executable.
+DEPEND="
+	dev-texlive/texlive-core
+	doc? ( dev-texlive/texlive-basic )
+	"
 RDEPEND=""
 
 SLOT="0"
diff --git a/mmix-20131017.ebuild b/mmix-20131017.ebuild
index 6746054..1dd9ac0 100644
--- a/mmix-20131017.ebuild
+++ b/mmix-20131017.ebuild
@@ -10,8 +10,12 @@ DESCRIPTION="Donald Knuth's MMIX Assembler and Simulator."
 HOMEPAGE="http://www-cs-faculty.stanford.edu/~knuth/mmix.html"
 SRC_URI="http://www-cs-faculty.stanford.edu/~knuth/programs/${P}.tgz"
 
-DEPEND="|| ( >=dev-util/cweb-3.63
-	virtual/tex-base )"
+# texlive-core contains the ctangle executable, texlive-basic (starting
+# from version 2013) the mktexfmt executable.
+DEPEND="
+	dev-texlive/texlive-core
+	doc? ( dev-texlive/texlive-basic )
+	"
 RDEPEND=""
 
 SLOT="0"