aboutsummaryrefslogtreecommitdiff
path: root/math/msieve
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-06-09 21:37:22 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-06-09 21:37:22 +0000
commit77e34ba788a4423955e7e775dec06d709c86715b (patch)
treee1fbd1e33169a1855c92a89fc95e482e058c7ea7 /math/msieve
parenta237016cb378cef2a31aa7e2f80581ee23c0e2a0 (diff)
downloadports-77e34ba788a4423955e7e775dec06d709c86715b.tar.gz
ports-77e34ba788a4423955e7e775dec06d709c86715b.zip
- Update to 1.23
PR: 113173 Submitted by: Daniel Roethlisberger <daniel@roe.ch> (maintainer)
Notes
Notes: svn path=/head/; revision=193128
Diffstat (limited to 'math/msieve')
-rw-r--r--math/msieve/Makefile18
-rw-r--r--math/msieve/distinfo6
-rw-r--r--math/msieve/files/patch-Makefile72
-rw-r--r--math/msieve/files/patch-include-util.h14
4 files changed, 71 insertions, 39 deletions
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index 07827e327c61..f28291f69ba9 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= msieve
-PORTVERSION= 1.14
+PORTVERSION= 1.23
CATEGORIES= math
MASTER_SITES= http://www.boo.net/~jasonp/ \
http://mirror.roe.ch/dist/msieve/
@@ -31,14 +31,28 @@ OPTIONS= OCFLAGS "Enable optimized CFLAGS" On \
.include <bsd.port.pre.mk>
+# Does not build with GCC 4.2
+.if ${OSVERSION} >= 700042
+USE_GCC= 3.4
+.endif
+
.if !defined(WITHOUT_OCFLAGS)
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
.endif
.if !defined(WITHOUT_GNFS)
LIB_DEPENDS+= gsl.9:${PORTSDIR}/math/gsl
-ALL_TARGET= nfs
+ALLTGT_SUFX= _nfs
+.endif
+
+ALLTGT= generic
+.if ${ARCH} == "i386"
+ALLTGT= x86
+.endif
+.if ${ARCH} == "amd64"
+ALLTGT= x86_64
.endif
+ALL_TARGET= ${ALLTGT}${ALLTGT_SUFX}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/msieve ${PREFIX}/bin
diff --git a/math/msieve/distinfo b/math/msieve/distinfo
index 6da55f40953d..8308d3a40e40 100644
--- a/math/msieve/distinfo
+++ b/math/msieve/distinfo
@@ -1,3 +1,3 @@
-MD5 (msieve114.tar.gz) = 536957406a42230978b38e6c074d24e2
-SHA256 (msieve114.tar.gz) = 692ea969a884306f21debfaf0b5a42701ac7110a20d2d0d7a852aee45c39ed3e
-SIZE (msieve114.tar.gz) = 190549
+MD5 (msieve123.tar.gz) = 18743917ef837decb8c6d20c903523a0
+SHA256 (msieve123.tar.gz) = 4b5cb2149420b16805badfdc54af1b74b3907d49885e6a0a1a3a04372e4f119c
+SIZE (msieve123.tar.gz) = 241693
diff --git a/math/msieve/files/patch-Makefile b/math/msieve/files/patch-Makefile
index 1a8d7e1910fa..6197fb03e8ab 100644
--- a/math/msieve/files/patch-Makefile
+++ b/math/msieve/files/patch-Makefile
@@ -1,22 +1,19 @@
---- Makefile.orig Fri Jan 5 07:22:21 2007
-+++ Makefile Fri Jan 5 16:30:18 2007
-@@ -23,21 +23,21 @@
+--- Makefile.orig Sun May 27 07:36:20 2007
++++ Makefile Wed May 30 21:57:37 2007
+@@ -24,19 +24,19 @@
- # gcc for x86 and x86-64; use the k8 flag below if running
- # a 64-bit operating system on a 64-bit processor
+ # gcc with basic optimization (-march flag could
+ # get overridden by architecture-specific builds)
-CC = gcc
--OPT_FLAGS = -O3 -fomit-frame-pointer
+#CC = gcc
-+#OPT_FLAGS = -O3 -fomit-frame-pointer
- # MACHINE_FLAGS = -march=pentium4 -DHAVE_CMOV
- # MACHINE_FLAGS = -march=k8 -DHAVE_CMOV
--MACHINE_FLAGS = -march=athlon -DHAVE_CMOV
-+#MACHINE_FLAGS = -march=athlon -DHAVE_CMOV
- # MACHINE_FLAGS = -march=pentium-m -DHAVE_CMOV
WARN_FLAGS = -Wall -W -Wconversion
+-OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=athlon
++#OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=athlon
+ # OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=k8
# note that if GSL was built as a shared library you may need
# to append -lgslcblas to LIB_GSL, or even build a static version
+ # Note to MinGW users: comment out LIB_THREAD, you don't need it
-LIB_THREAD = -lpthread
-LIB_GSL = -lgsl
@@ -24,23 +21,58 @@
+LIB_GSL = -lgsl -lgslcblas
-CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) -Iinclude
-+CFLAGS += $(OPT_FLAGS) $(WARN_FLAGS) -DHAVE_CMOV -Iinclude $(CPPFLAGS)
++CFLAGS += $(WARN_FLAGS) -Iinclude $(CPPFLAGS)
- COMMON_HDR = \
- include/ap.h \
-@@ -101,13 +101,13 @@
+ #---------------------------------- Generic file lists -------------------
+
+@@ -160,7 +160,7 @@
+ ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86)
+ ranlib libmsieve.a
+- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
+
+ x86_64: $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64)
+@@ -168,13 +168,13 @@
+ ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64)
+ ranlib libmsieve.a
+- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
+
+ generic: $(COMMON_OBJS_NO_NFS) $(QS_OBJS) $(QS_CORE_OBJS)
rm -f libmsieve.a
- ar r libmsieve.a $(OBJS)
+ ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) $(QS_CORE_OBJS)
ranlib libmsieve.a
- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
+ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD)
- nfs: $(NFS_OBJS)
+ x86_nfs: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86)
+@@ -182,7 +182,7 @@
+ ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86)
+ ranlib libmsieve.a
+- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \
++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \
+ $(LIB_THREAD) $(LIB_GSL)
+
+ x86_64_nfs: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \
+@@ -191,14 +191,14 @@
+ ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \
+ $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64)
+ ranlib libmsieve.a
+- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \
++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \
+ $(LIB_THREAD) $(LIB_GSL)
+
+ generic_nfs: $(COMMON_OBJS) $(QS_OBJS) $(QS_CORE_OBJS) $(NFS_OBJS)
rm -f libmsieve.a
- ar r libmsieve.a $(NFS_OBJS)
+ ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) $(QS_CORE_OBJS)
ranlib libmsieve.a
- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \
+ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \
$(LIB_THREAD) $(LIB_GSL)
- %.o: %.c $(COMMON_HDR)
+ clean:
diff --git a/math/msieve/files/patch-include-util.h b/math/msieve/files/patch-include-util.h
deleted file mode 100644
index 35d8f0a6342e..000000000000
--- a/math/msieve/files/patch-include-util.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/util.h.orig Sun Dec 31 16:30:03 2006
-+++ include/util.h Wed Jan 3 18:00:10 2007
-@@ -43,7 +43,10 @@
- #include <math.h>
- #include <stdarg.h>
- #include <time.h>
--#ifndef _MSC_VER
-+#include <osreldate.h>
-+#if defined(FREEBSD) && (__FreeBSD_version < 500000)
-+#include <inttypes.h>
-+#elsif !defined(_MSC_VER)
- #include <stdint.h>
- #endif
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 13:55:40 +0000