Index: head/math/mprime/Makefile =================================================================== --- head/math/mprime/Makefile (revision 502337) +++ head/math/mprime/Makefile (revision 502338) @@ -1,62 +1,63 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mprime PORTVERSION= 29.8b3 +PORTREVISION= 1 CATEGORIES= math benchmarks net MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \ ftp://mersenne.org/gimps/ DISTNAME= p95v${PORTVERSION:R}${PORTVERSION:E}.source MAINTAINER= rozhuk.im@gmail.com COMMENT= Great Internet Mersenne Prime Search LICENSE= EULA LICENSE_NAME= EULA LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror pkg-mirror auto-accept ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ libgmp.so:math/gmp USES= zip NO_WRKSUBDIR= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKEFILE= makebsd ALL_TARGET= mprime LLD_UNSAFE= yes SUB_FILES= wrapper.sh PLIST_FILES+= bin/mprime bin/mprime-real .include .if ${ARCH} == "amd64" WRKSRC_SUBDIR= linux64 .else WRKSRC_SUBDIR= linux .endif post-patch: @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${PATCH_WRKSRC}/linux64/makebsd \ ${PATCH_WRKSRC}/linux/makebsd pre-build: .if ${ARCH} == "amd64" @${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makebsd64 ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} .elif ${ARCH} == "i386" @${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makemsys ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} .endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mprime ${STAGEDIR}${PREFIX}/bin/mprime-real ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/mprime .include Index: head/math/mprime/files/patch-gwnum_makemsys =================================================================== --- head/math/mprime/files/patch-gwnum_makemsys (nonexistent) +++ head/math/mprime/files/patch-gwnum_makemsys (revision 502338) @@ -0,0 +1,27 @@ +--- gwnum/makemsys.orig 2019-04-22 22:05:20.000000000 +0300 ++++ gwnum/makemsys 2019-05-14 23:48:06.059075000 +0300 +@@ -1,13 +1,13 @@ + # Makefile for Mingw/msys gwnum library + # + +-CC = gcc +-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 -malign-double ++CC ?= cc ++CFLAGS += -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 + +-CPP = g++ +-CPPFLAGS = -I.. -I../qd -O2 -march=i486 -malign-double ++CXX ?= cc ++CXXFLAGS += -I.. -I../qd -O2 -march=i486 + +-AR = ar ++AR ?= ar + + LINUXOBJS = cpuid.o gwnum.o gwtables.o gwthread.o gwini.o gwbench.o gwutil.o gwdbldbl.o giants.o ecmstag1.o + +@@ -29,4 +29,4 @@ + $(CC) $(CFLAGS) -c $< + + .cpp.o: +- $(CPP) $(CPPFLAGS) -c $< ++ $(CXX) $(CXXFLAGS) -c $< Property changes on: head/math/mprime/files/patch-gwnum_makemsys ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/mprime/files/patch-linux_makebsd =================================================================== --- head/math/mprime/files/patch-linux_makebsd (nonexistent) +++ head/math/mprime/files/patch-linux_makebsd (revision 502338) @@ -0,0 +1,20 @@ +--- linux/makebsd.bak 2019-04-22 22:05:22.000000000 +0300 ++++ linux/makebsd 2019-05-14 23:41:22.010249000 +0300 +@@ -7,13 +7,13 @@ + # + + CC ?= cc +-CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double ++CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 + + CXX ?= cc +-CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double ++CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 + +-LDFLAGS += -fpie -Wl,-M -L$(LOCALBASE)/lib +-LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp ++LDFLAGS += -fpie -L$(LOCALBASE)/lib -Wl,-M ++LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lstdc++ -lcompat -lgmp + + FACTOROBJ = factor32.o + OBJS = prime.o menu.o Property changes on: head/math/mprime/files/patch-linux_makebsd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property