8 files changed, 22 insertions, 79 deletions

diff --git a/lang/mixal/Makefile b/lang/mixal/Makefile
index f817b26ba512..d76b7ee0e4fa 100644
--- a/lang/mixal/Makefile
+++ b/lang/mixal/Makefile
@@ -7,21 +7,25 @@
 #
 
 PORTNAME=	mixal
-PORTVERSION=	1.07
+PORTVERSION=	1.09
 CATEGORIES=	lang
-MASTER_SITES=	http://www.catb.org/~esr/retro/ \
-		http://dl.droso.net/ports/
+MASTER_SITES=	http://www.catb.org/~esr/mixal/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Assembler and interpreter for Donald Knuth's mythical MIX computer
 
-ALL_TARGET=	# none
+USE_GMAKE=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+ALL_TARGET=	${PORTNAME}
+
+MAN1=		mixal.1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mix ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mixal ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mixal.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for F in READ.ME MIX.DOC NOTES opcodes *.mix
+.for F in MIX.DOC NOTES README opcodes *.mix
 	${INSTALL_DATA} ${WRKSRC}/${F} ${DOCSDIR}
 .endfor
 .endif
diff --git a/lang/mixal/distinfo b/lang/mixal/distinfo
index 1963c5095304..25968e3524c3 100644
--- a/lang/mixal/distinfo
+++ b/lang/mixal/distinfo
@@ -1 +1 @@
-MD5 (mixal-1.07.tar.gz) = 478eae60676966f0049a330960de10c2
+MD5 (mixal-1.09.tar.gz) = f74c58bbd5d5f8b9ecb9a039b48d8744
diff --git a/lang/mixal/files/patch-01 b/lang/mixal/files/patch-01
deleted file mode 100644
index b25a494a48b7..000000000000
--- a/lang/mixal/files/patch-01
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Mon Jun  3 20:00:53 2002
-+++ Makefile	Mon Jun  3 20:01:02 2002
-@@ -3,7 +3,7 @@
- # Must be changed in the spec file as well.
- V=1.07
- 
--CFLAGS = -g
-+#CFLAGS = -g
- 
- CSRCS = asm.c cell.c charset.c driver.c io.c main.c parse.c run.c symbol.c
- HSRCS = asm.h cell.h charset.h driver.h io.h mix.h parse.h run.h symbol.h
diff --git a/lang/mixal/files/patch-io.c b/lang/mixal/files/patch-io.c
deleted file mode 100644
index 7e229050aa9b..000000000000
--- a/lang/mixal/files/patch-io.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- io.c.orig	Mon Jun  3 17:56:10 2002
-+++ io.c	Mon Jun  3 18:00:59 2002
-@@ -19,9 +19,12 @@
- } device_table[] = {
-     {tape}, {tape}, {tape}, {tape}, {tape}, {tape}, {tape}, {tape}, 
-     {disk}, {disk}, {disk}, {disk}, {disk}, {disk}, {disk}, {disk}, 
--    {card_in, stdin},
--    {card_out, stdout},
--    {printer, stdout},
-+    {card_in, 0}, /* was stdin */
-+#define PATCH_CARD_IN 16
-+    {card_out, 0}, /* was stdout */
-+#define PATCH_CARD_OUT 17
-+    {printer, 0}, /* was stdout */
-+#define PATCH_PRINTER 18
-     {console}
- };
- 
-@@ -54,6 +57,13 @@
- /* console */   {  14, console_in, console_out, console_ioc }
- 
- };
-+
-+void initialize_io(void)
-+{
-+    device_table[PATCH_CARD_IN].file = stdin;
-+    device_table[PATCH_CARD_OUT].file = stdout;
-+    device_table[PATCH_PRINTER].file = stdout;
-+}
- 
- static unsigned block_size(unsigned device)
- {
diff --git a/lang/mixal/files/patch-main.c b/lang/mixal/files/patch-main.c
deleted file mode 100644
index 82c1d366ae0a..000000000000
--- a/lang/mixal/files/patch-main.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- main.c.orig	Mon Jun  3 17:53:11 2002
-+++ main.c	Mon Jun  3 17:53:23 2002
-@@ -104,6 +104,7 @@
- 
- int main(int argc, char **argv)
- {
-+    initialize_io();
-     precompute_field_data();
- 
-     /* Assemble the input: */
diff --git a/lang/mixal/files/patch-mix.h b/lang/mixal/files/patch-mix.h
deleted file mode 100644
index 4b4d4120c783..000000000000
--- a/lang/mixal/files/patch-mix.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- mix.h.orig	Mon Jun  3 17:55:50 2002
-+++ mix.h	Mon Jun  3 17:56:02 2002
-@@ -16,6 +16,7 @@
- void warn(const char *message, ...);
- void error(const char *message, ...);
- void fatal_error(const char *message, ...);
-+void initialize_io(void);
- 
- #define memory_size 4000
- 
diff --git a/lang/mixal/pkg-descr b/lang/mixal/pkg-descr
index e02df69823a7..ee43fcffff90 100644
--- a/lang/mixal/pkg-descr
+++ b/lang/mixal/pkg-descr
@@ -8,3 +8,5 @@ mythical MIX computer, defined in:
 This preliminary release doesn't do floating point and has little
 documentation as yet, but it works well enough to be used in conjunction
 with the book. 
+
+WWW: http://www.catb.org/~esr/mixal/
diff --git a/lang/mixal/pkg-plist b/lang/mixal/pkg-plist
index f29120d8689c..75a9b99f202a 100644
--- a/lang/mixal/pkg-plist
+++ b/lang/mixal/pkg-plist
@@ -1,9 +1,9 @@
-bin/mix
-%%PORTDOCS%%share/doc/mixal/MIX.DOC
-%%PORTDOCS%%share/doc/mixal/NOTES
-%%PORTDOCS%%share/doc/mixal/READ.ME
-%%PORTDOCS%%share/doc/mixal/elevator.mix
-%%PORTDOCS%%share/doc/mixal/mystery.mix
-%%PORTDOCS%%share/doc/mixal/opcodes
-%%PORTDOCS%%share/doc/mixal/prime.mix
-@dirrm share/doc/mixal
+bin/mixal
+%%PORTDOCS%%%%DOCSDIR%%/MIX.DOC
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/elevator.mix
+%%PORTDOCS%%%%DOCSDIR%%/mystery.mix
+%%PORTDOCS%%%%DOCSDIR%%/opcodes
+%%PORTDOCS%%%%DOCSDIR%%/prime.mix
+@dirrm %%DOCSDIR%%