<pre style='margin:0'>
NicosPavlov pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7b571f2dcc80a4650dfd5f9be8f03a40bb53cad7">https://github.com/macports/macports-ports/commit/7b571f2dcc80a4650dfd5f9be8f03a40bb53cad7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7b571f2 msieve: upgrade to 1.53, add ecm variant, take maintainership
</span>7b571f2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b571f2dcc80a4650dfd5f9be8f03a40bb53cad7
</span>Author: Nicolas Pavillon <nicos@macports.org>
AuthorDate: Mon Nov 14 22:25:31 2016 +0900
<span style='display:block; white-space:pre;color:#404040;'> msieve: upgrade to 1.53, add ecm variant, take maintainership
</span>---
math/msieve/Portfile | 19 ++++++++++++----
math/msieve/files/patch-Makefile.diff | 43 +++++++++++++----------------------
2 files changed, 30 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/msieve/Portfile b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e97630a..88fe9fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/msieve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,22 +4,23 @@
</span> PortSystem 1.0
name msieve
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.53
</span> categories math
license public-domain Apache-2 zlib BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nicos openmaintainer
</span> description A library for factoring large integers
long_description ${description}
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.boo.net/~jasonp/qs.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://sourceforge.net/projects/msieve/
</span> master_sites sourceforge:project/msieve/msieve/Msieve%20v${version}
distname ${name}[strsed ${version} {g/\.//}]
worksrcdir ${name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 91288b1b016938a4167f83b012deaaf773f1ea99 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cca48291f5e439b469989c4ad2631a09a3c067bb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}_src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 81170f6ee363140c44bd07b9937cab0ab8c75f1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5fcbaaff266a43aa8bca55239d5b087d3e3f138d1a95d75b776c04ce4d93bb4
</span>
depends_lib port:gmp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +33,10 @@ post-patch {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset ecm]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args ECM=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.env CFLAGS="${configure.cflags}" \
CPATH="${compiler.cpath}" \
LIBRARY_PATH="${compiler.library_path}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +58,10 @@ destroot {
</span> ${destroot}${prefix}/share/${name}/demo
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant ecm description "Use elliptic curve method for factorisation" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gmp-ecm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://sourceforge.net/projects/${name}/files/
livecheck.regex {Msieve v([0-9.]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/msieve/files/patch-Makefile.diff b/math/msieve/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8de7443..4f83793 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/msieve/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/msieve/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +1,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2013-05-15 08:51:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2013-05-15 09:33:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,14 +12,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $Id: Makefile 823 2012-11-17 13:22:46Z jasonp_sf $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2016-11-12 00:40:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2016-11-14 22:04:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,13 +12,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $Id: Makefile 989 2016-01-04 15:03:27Z jasonp_sf $
</span> # --------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+VER = 1.51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++VER = 1.53
</span> +
# override from command line
WIN = 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ WIN64 = 0
</span>
# gcc with basic optimization (-march flag could
# get overridden by architecture-specific builds)
-CC = gcc
+CC = @CC@
WARN_FLAGS = -Wall -W
<span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_FLAGS = -O3 -fomit-frame-pointer -march=core2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPT_FLAGS = -O3 -fomit-frame-pointer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT_FLAGS = -O3 -fomit-frame-pointer -march=native \
</span> -D_FILE_OFFSET_BITS=64 -DNDEBUG -D_LARGEFILE64_SOURCE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use := instead of = so we only run the following once
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,14 +30,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,14 +31,14 @@
</span> SVN_VERSION := unknown
endif
-CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \
+L_CFLAGS = $(CFLAGS) $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \
-DMSIEVE_SVN_VERSION="\"$(SVN_VERSION)\"" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -I. -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I. -Iaprcl -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1
</span>
# tweak the compile flags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,21 +34,12 @@
</span> LIBS += -lecm
endif
ifeq ($(WIN),1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -ldl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(LARGEBLOCKS),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS += -DLARGEBLOCKS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ L_CFLAGS += -DLARGEBLOCKS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(CUDA),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,22 +59,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,22 +63,22 @@
</span> CUDA_ROOT = $(shell dirname $(NVCC))/../
CUDA_LIBS = -lcuda
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS += -I"$(CUDA_ROOT)include" -Ib40c -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ L_CFLAGS += -I"$(CUDA_ROOT)include" -Ib40c -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ L_CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
</span> LIBS += $(CUDA_LIBS)
endif
ifeq ($(MPI),1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +61,7 @@
</span> else
LIBS += -lz
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -228,29 +230,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,29 +236,23 @@
</span> gnfs/gnfs.c \
gnfs/relation.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +93,7 @@
</span> #---------------------------------- make targets -------------------------
help:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -267,8 +263,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,8 +270,10 @@
</span> rm -f libmsieve.a
ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS)
ranlib libmsieve.a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,8 +104,8 @@
</span> + $(CC) -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -install_name @PREFIX@/lib/libmsieve.$(VER).dylib -Wl,-single_module $(LDFLAGS) -compatibility_version $(VER) -current_version $(VER) -o libmsieve.$(VER).dylib $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) $(LIBS)
clean:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- cd b40c && make clean WIN=$(WIN) && cd ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,27 +278,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd cub && make clean WIN=$(WIN) WIN64=$(WIN64) && cd ..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -287,27 +285,27 @@
</span> # common file build rules
%.o: %.c $(COMMON_HDR)
</pre><pre style='margin:0'>
</pre>