svn commit: r325108 - in head/lang/mmix: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Aug 21 11:51:24 2013
New Revision: 325108
URL: http://svnweb.freebsd.org/changeset/ports/325108

Log:
  - Fix parallel (-jX) builds, drop ugly MAKE_JOBS_UNSAFE
  - Since patch is now required, remove post-patch target
  - Drop an article from COMMENT, optimize away .for loop
  
  Reported by:	marino
  Approved by:	miwi, bapt (portmgr, implicit)

Added:
  head/lang/mmix/files/
  head/lang/mmix/files/patch-Makefile   (contents, props changed)
Modified:
  head/lang/mmix/Makefile

Modified: head/lang/mmix/Makefile
==============================================================================
--- head/lang/mmix/Makefile	Wed Aug 21 11:24:07 2013	(r325107)
+++ head/lang/mmix/Makefile	Wed Aug 21 11:51:24 2013	(r325108)
@@ -8,18 +8,13 @@ MASTER_SITES=	http://www-cs-faculty.stan
 		http://mirror.mcx2.org/
 
 MAINTAINER=	dhn at FreeBSD.org
-COMMENT=	A RISC computer designed by Donald E. Knuth
+COMMENT=	RISC computer designed by Donald E. Knuth
 
 BUILD_DEPENDS=	ctangle:${PORTSDIR}/devel/cweb
 
-MAKE_JOBS_UNSAFE=yes
-
 NO_WRKSUBDIR=	yes
 FILES=		mmix.1 mmix.mp silly.out silly.run
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mmix ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mmixal ${PREFIX}/bin
@@ -31,8 +26,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.mmix ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.mms ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.w ${DATADIR}
-.for f in ${FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
-.endfor
+	${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/,} ${DATADIR}
 
 .include <bsd.port.mk>

Added: head/lang/mmix/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/mmix/files/patch-Makefile	Wed Aug 21 11:51:24 2013	(r325108)
@@ -0,0 +1,74 @@
+--- Makefile.orig	2011-03-30 07:47:08.000000000 +0800
++++ Makefile	2013-08-21 19:29:51.000000000 +0800
+@@ -6,7 +6,7 @@
+ #   In fact, CWEB 3.61 is recommended for making hardcopy or PDF documentation.
+ 
+ #   If you prefer optimization to debugging, change -g to something like -O:
+-CFLAGS = -g
++CFLAGS ?= -g
+ 
+ #   Uncomment the second line if you use pdftex to bypass .dvi files:
+ PDFTEX = dvipdfm
+@@ -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,12 +73,13 @@
+ clean:
+ 	rm -f *~ *.o *.c *.h *.tex *.log *.dvi *.toc *.idx *.scn *.ps core
+ 
+-mmix-pipe.o: mmix-pipe.c abstime
+-	./abstime > abstime.h
++abstime.h: abstime
++	./abstime > $@
++
++mmix-pipe.o: mmix-pipe.c abstime.h
+ 	$(CC) $(CFLAGS) -c mmix-pipe.c
+-	rm abstime.h
+ 
+-mmix-config.o: mmix-pipe.o
++mmix-config.o mmix-mem.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 \
+@@ -87,10 +88,8 @@
+ mmixal: mmix-arith.o mmixal.c
+ 	$(CC) $(CFLAGS) mmixal.c mmix-arith.o -o mmixal
+ 
+-mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime
+-	./abstime > abstime.h
++mmix:   mmix-arith.o mmix-io.o mmix-sim.c abstime.h
+ 	$(CC) $(CFLAGS) mmix-sim.c mmix-arith.o mmix-io.o -o mmix
+-	rm abstime.h
+ 
+ mmotype: mmotype.c
+ 	$(CC) $(CFLAGS) mmotype.c -o mmotype