<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/5267622e3df50a74f0465f4606d702128caf6a3e">https://github.com/macports/macports-ports/commit/5267622e3df50a74f0465f4606d702128caf6a3e</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 5267622e3df msieve: add devel subport (#12940)
</span>5267622e3df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5267622e3df50a74f0465f4606d702128caf6a3e
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Nov 14 17:53:53 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> msieve: add devel subport (#12940)
</span>---
math/msieve/Portfile | 22 ++++++++++++--
...tch-Makefile.diff => patch-Makefile-trunk.diff} | 34 ++++++++++------------
math/msieve/files/patch-Makefile.diff | 2 +-
3 files changed, 37 insertions(+), 21 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 570b0e59e7f..61b50603c61 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;'>@@ -12,14 +12,16 @@ long_description ${description}
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://sourceforge.net/projects/msieve/
master_sites sourceforge:project/msieve/msieve/Msieve%20v${version}
distname ${name}[strsed ${version} {g/\.//}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}
</span>
distfiles ${distname}_src${extract.suffix}
checksums rmd160 81170f6ee363140c44bd07b9937cab0ab8c75f1a \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c5fcbaaff266a43aa8bca55239d5b087d3e3f138d1a95d75b776c04ce4d93bb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c5fcbaaff266a43aa8bca55239d5b087d3e3f138d1a95d75b776c04ce4d93bb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 976135
</span>
depends_lib port:gmp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +29,27 @@ patchfiles patch-Makefile.diff \
</span> patch-time.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VER@|${version}|g" ${worksrcpath}/Makefile
</span> reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
reinplace "s|-march=native||g" ${worksrcpath}/Makefile
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fetch.type svn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ svn.url https://svn.code.sf.net/p/msieve/code/trunk/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1043
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile-trunk.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.env CFLAGS=${configure.cflags} \
CPATH=${compiler.cpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/msieve/files/patch-Makefile.diff b/math/msieve/files/patch-Makefile-trunk.diff
</span>similarity index 82%
copy from math/msieve/files/patch-Makefile.diff
copy to math/msieve/files/patch-Makefile-trunk.diff
<span style='display:block; white-space:pre;color:#808080;'>index 4f83793e9bb..02143e36e46 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-trunk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2016-11-12 00:40:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-11-14 22:04:27.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,13 +12,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $Id: Makefile 989 2016-01-04 15:03:27Z jasonp_sf $
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-11-13 13:56:43.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-11-13 13:58:22.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,6 +12,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $Id: Makefile 1025 2018-08-19 02:20:28Z jasonp_sf $
</span> # --------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+VER = 1.53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++VER = @VER@
</span> +
# override from command line
WIN = 0
WIN64 = 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +21,7 @@
</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=native \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D_FILE_OFFSET_BITS=64 -DNDEBUG -D_LARGEFILE64_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,14 +31,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT_FLAGS = -O3 -fomit-frame-pointer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_FILE_OFFSET_BITS=64 -DNDEBUG -D_LARGEFILE64_SOURCE -DVBITS=$(VBITS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,14 +32,14 @@
</span> SVN_VERSION := unknown
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +35,12 @@
</span> LIBS += -lecm
endif
ifeq ($(WIN),1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,22 +63,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,12 +64,12 @@
</span> CUDA_ROOT = $(shell dirname $(NVCC))/../
CUDA_LIBS = -lcuda
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ L_CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -Imgpu -DHAVE_CUDA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ L_CFLAGS += -I"$(CUDA_ROOT)/include" -Icub -Imgpu -DHAVE_CUDA
</span> LIBS += $(CUDA_LIBS)
endif
ifeq ($(MPI),1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,10 +50,7 @@
</span> endif
ifeq ($(BOINC),1)
# fill in as appropriate
<span style='display:block; white-space:pre;background:#ffe0e0;'>- BOINC_INC_DIR = .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BOINC_LIB_DIR = .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ L_CFLAGS += -I$(BOINC_INC_DIR) -DHAVE_BOINC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +79,7 @@
</span> LIBS += -L$(BOINC_LIB_DIR) -lboinc_api -lboinc
endif
ifeq ($(NO_ZLIB),1)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +59,7 @@
</span> else
LIBS += -lz
endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,29 +236,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -256,29 +258,23 @@
</span> gnfs/gnfs.c \
gnfs/relation.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +91,7 @@
</span> #---------------------------------- make targets -------------------------
help:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,8 +270,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,8 +293,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;'>@@ -105,7 +103,7 @@
</span>
clean:
cd cub && make clean WIN=$(WIN) WIN64=$(WIN64) && cd ..
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,27 +285,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -310,27 +308,27 @@
</span> # common file build rules
%.o: %.c $(COMMON_HDR)
<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 4f83793e9bb..b8dcb26e14b 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;'>@@ -4,7 +4,7 @@
</span> # $Id: Makefile 989 2016-01-04 15:03:27Z jasonp_sf $
# --------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+VER = 1.53
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++VER = @VER@
</span> +
# override from command line
WIN = 0
</pre><pre style='margin:0'>
</pre>