[122277] trunk/dports/math/diehard

[jmr at macports.org]

Revision: 122277
          https://trac.macports.org/changeset/122277
Author:   jmr at macports.org
Date:     2014-07-18 21:24:35 -0700 (Fri, 18 Jul 2014)
Log Message:
-----------
diehard: fix build

Modified Paths:
--------------
    trunk/dports/math/diehard/Portfile

Added Paths:
-----------
    trunk/dports/math/diehard/files/
    trunk/dports/math/diehard/files/Makefile.patch
    trunk/dports/math/diehard/files/cdomso.c.patch
    trunk/dports/math/diehard/files/diehard.c.patch

Modified: trunk/dports/math/diehard/Portfile
===================================================================
--- trunk/dports/math/diehard/Portfile	2014-07-19 04:07:05 UTC (rev 122276)
+++ trunk/dports/math/diehard/Portfile	2014-07-19 04:24:35 UTC (rev 122277)
@@ -17,10 +17,13 @@
 distname		die.c
 checksums		md5 854ea157c0ff73dd0d58928c834b6122
 
+patchfiles		diehard.c.patch Makefile.patch cdomso.c.patch
+
 use_configure	no
 
 build.target
-build.args	CC=${configure.cc}
+build.args	CC=${configure.cc} LDFLAGS="${configure.ld_archflags}" \
+		CFLAGS="${configure.cflags} ${configure.cc_archflags}"
 
 destroot {
 	xinstall -m 755 ${worksrcpath}/diehard ${destroot}${prefix}/bin

Added: trunk/dports/math/diehard/files/Makefile.patch
===================================================================
--- trunk/dports/math/diehard/files/Makefile.patch	                        (rev 0)
+++ trunk/dports/math/diehard/files/Makefile.patch	2014-07-19 04:24:35 UTC (rev 122277)
@@ -0,0 +1,76 @@
+--- Makefile.orig	1998-04-03 01:28:43.000000000 +1000
++++ Makefile	2014-07-19 14:15:20.000000000 +1000
+@@ -9,55 +9,55 @@
+        funct.o cdomso.o craptest.o runtest.o
+ 
+ diehard: $(OBJS)
+-	$(CC) -lm -o diehard $(OBJS)
++	$(CC) $(LDFLAGS) -lm -o diehard $(OBJS)
+ 
+ diehard.o: diehard.c header.h macro.h
+-	$(CC) -c diehard.c
++	$(CC) $(CFLAGS) -c diehard.c
+ 
+ d3sphere.o: d3sphere.c header.h macro.h
+-	$(CC) -c d3sphere.c
++	$(CC) $(CFLAGS) -c d3sphere.c
+ 
+ kstest.o: kstest.c header.h macro.h	 
+-	$(CC) -c kstest.c
++	$(CC) $(CFLAGS) -c kstest.c
+ 
+ cdoperm5.o: cdoperm5.c header.h
+-	$(CC) -c cdoperm5.c
++	$(CC) $(CFLAGS) -c cdoperm5.c
+ 
+ squeez.o: squeez.c header.h macro.h
+-	$(CC) -c squeez.c
++	$(CC) $(CFLAGS) -c squeez.c
+ 
+ cdbday.o: cdbday.c header.h
+-	$(CC) -c cdbday.c
++	$(CC) $(CFLAGS) -c cdbday.c
+ 
+ cdosum.o: cdosum.c header.h
+-	$(CC) -c cdosum.c
++	$(CC) $(CFLAGS) -c cdosum.c
+ 
+ df.o: df.c 
+-	$(CC) -c df.c
++	$(CC) $(CFLAGS) -c df.c
+ 
+ funct.o: funct.c macro.h
+-	$(CC) -c funct.c
++	$(CC) $(CFLAGS) -c funct.c
+ 
+ mindist.o: mindist.c header.h macro.h
+-	$(CC) -c mindist.c
++	$(CC) $(CFLAGS) -c mindist.c
+ 
+ cdbinrnk.o: cdbinrnk.c header.h macro.h
+-	$(CC) -c cdbinrnk.c
++	$(CC) $(CFLAGS) -c cdbinrnk.c
+ 
+ cdpark.o: cdpark.c header.h macro.h
+-	$(CC) -c cdpark.c
++	$(CC) $(CFLAGS) -c cdpark.c
+ 
+ cdbitst.o: cdbitst.c header.h
+-	$(CC) -c cdbitst.c
++	$(CC) $(CFLAGS) -c cdbitst.c
+ 
+ cnt1s.o: cnt1s.c header.h
+-	$(CC) -c cnt1s.c
++	$(CC) $(CFLAGS) -c cnt1s.c
+ 
+ cdomso.o: cdomso.c header.h
+-	$(CC) -c cdomso.c
++	$(CC) $(CFLAGS) -c cdomso.c
+ 
+ craptest.o: craptest.c header.h macro.h
+-	$(CC) -c craptest.c
++	$(CC) $(CFLAGS) -c craptest.c
+ 	
+ runtest.o: runtest.c header.h macro.h
+-	$(CC) -c runtest.c
++	$(CC) $(CFLAGS) -c runtest.c

Added: trunk/dports/math/diehard/files/cdomso.c.patch
===================================================================
--- trunk/dports/math/diehard/files/cdomso.c.patch	                        (rev 0)
+++ trunk/dports/math/diehard/files/cdomso.c.patch	2014-07-19 04:24:35 UTC (rev 122277)
@@ -0,0 +1,11 @@
+--- cdomso.c.orig	1998-04-03 01:29:02.000000000 +1000
++++ cdomso.c	2014-07-19 14:21:26.000000000 +1000
+@@ -89,7 +89,7 @@ unsigned long get_w(char *fn, short bits
+ }
+ 
+ 
+-real monky_stat(char *filename, char *test, int no_tests)
++void monky_stat(char *filename, char *test, int no_tests)
+ {
+   const real bits_pw=20, mean=pow(2, bits_pw)*exp(-2);
+   const counter dim=pow(2, bits_pw-5);

Added: trunk/dports/math/diehard/files/diehard.c.patch
===================================================================
--- trunk/dports/math/diehard/files/diehard.c.patch	                        (rev 0)
+++ trunk/dports/math/diehard/files/diehard.c.patch	2014-07-19 04:24:35 UTC (rev 122277)
@@ -0,0 +1,15 @@
+--- diehard.c.orig	1998-04-03 01:29:40.000000000 +1000
++++ diehard.c	2014-07-19 14:11:38.000000000 +1000
+@@ -149,9 +149,9 @@ void diehard()
+ }
+ 
+ 
+-main()
++int main(void)
+ {
+   diehard();
+ 
+-   return;
+-}
++   return 0;
++}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140718/8ede711c/attachment-0001.html>