diff options
author | Brendan Fabeny <bf@FreeBSD.org> | 2011-06-24 09:21:54 +0000 |
---|---|---|
committer | Brendan Fabeny <bf@FreeBSD.org> | 2011-06-24 09:21:54 +0000 |
commit | f8696dd8d9dfd11ab50688edb7bf1bb6ca051c68 (patch) | |
tree | 894c868d410531370519fc67838e9cbacc63ed87 /math/msieve | |
parent | 5bcb0c68b9a67bccc8413bdd69a22c56a46f786f (diff) | |
download | ports-f8696dd8d9dfd11ab50688edb7bf1bb6ca051c68.tar.gz ports-f8696dd8d9dfd11ab50688edb7bf1bb6ca051c68.zip |
Notes
Diffstat (limited to 'math/msieve')
-rw-r--r-- | math/msieve/Makefile | 36 | ||||
-rw-r--r-- | math/msieve/distinfo | 4 | ||||
-rw-r--r-- | math/msieve/files/patch-Makefile | 28 | ||||
-rw-r--r-- | math/msieve/files/patch-include_util.h | 4 |
4 files changed, 23 insertions, 49 deletions
diff --git a/math/msieve/Makefile b/math/msieve/Makefile index 8f6afb77b1a7..6aee0ef06a6c 100644 --- a/math/msieve/Makefile +++ b/math/msieve/Makefile @@ -6,7 +6,7 @@ # PORTNAME= msieve -PORTVERSION= 1.48 +PORTVERSION= 1.49 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= \ @@ -20,12 +20,12 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libecm.a:${PORTSDIR}/math/gmp-ecm WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= LDFLAGS="${LDFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1 -PLIST_FILES= bin/msieve lib/libmsieve.a include/msieve/msieve.h \ - include/msieve/mp.h include/msieve/util.h +HEADERS= mp.h msieve.h util.h +PLIST_FILES= bin/msieve lib/libmsieve.a ${HEADERS:S|^|include/msieve/|} PLIST_DIRS= include/msieve PORTDOCS= Changes Readme Readme.nfs Readme.qs @@ -38,30 +38,32 @@ CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -DNDEBUG .endif .if ${OSVERSION} >= 700042 && ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64-7 +BROKEN= Does not compile on sparc64 .endif -ALL_TARGET= generic .if ${ARCH} == "i386" ALL_TARGET= x86 -.endif -.if ${ARCH} == "amd64" +.elif ${ARCH} == "amd64" ALL_TARGET= x86_64 +.else +ALL_TARGET= generic .endif +post-patch: + @${REINPLACE_CMD} -e "\|^CC =|d" -e "\|^OPT_FLAGS =|d" \ + -e "\|^CFLAGS =|s|=|+=|" ${WRKSRC}/Makefile + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/msieve ${PREFIX}/bin - ${MKDIR} ${PREFIX}/include/msieve - ${INSTALL_DATA} ${WRKSRC}/include/msieve.h ${PREFIX}/include/msieve - ${INSTALL_DATA} ${WRKSRC}/include/mp.h ${PREFIX}/include/msieve - ${INSTALL_DATA} ${WRKSRC}/include/util.h ${PREFIX}/include/msieve - ${INSTALL_DATA} ${WRKSRC}/libmsieve.a ${PREFIX}/lib + @${INSTALL_PROGRAM} ${WRKSRC}/msieve ${PREFIX}/bin + @${MKDIR} ${PREFIX}/include/msieve + @(cd ${WRKSRC}/include; ${INSTALL_DATA} ${HEADERS} ${PREFIX}/include/msieve) + @${INSTALL_DATA} ${WRKSRC}/libmsieve.a ${PREFIX}/lib .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) .endif regression-test test check: build - @( cd ${WRKSRC} ; ./msieve -q -d 1 2385734365243128176756453434347656453122245767798 ) + @(cd ${WRKSRC}; ./msieve -q -d 1 2385734365243128176756453434347656453122245767798) .include <bsd.port.post.mk> diff --git a/math/msieve/distinfo b/math/msieve/distinfo index adfed15909c3..69b8addae292 100644 --- a/math/msieve/distinfo +++ b/math/msieve/distinfo @@ -1,2 +1,2 @@ -SHA256 (msieve148.tar.gz) = c3c0b36d230a797de84b3da18e073a328c8ae2d28308d5b0d67c6977eb109515 -SIZE (msieve148.tar.gz) = 369047 +SHA256 (msieve149.tar.gz) = cca83c5783ede1b839e22891b8daac90142581fb7e0775791fafba692e187c27 +SIZE (msieve149.tar.gz) = 457680 diff --git a/math/msieve/files/patch-Makefile b/math/msieve/files/patch-Makefile deleted file mode 100644 index 8daa6f6014f5..000000000000 --- a/math/msieve/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig 2011-02-06 19:12:31.000000000 -0500 -+++ Makefile 2011-02-06 19:12:39.000000000 -0500 -@@ -14,12 +14,12 @@ - - # gcc with basic optimization (-march flag could - # get overridden by architecture-specific builds) --CC = gcc -D_FILE_OFFSET_BITS=64 -+#CC = gcc -D_FILE_OFFSET_BITS=64 - WARN_FLAGS = -Wall -W --OPT_FLAGS = -O3 -fomit-frame-pointer -march=athlon-xp -DNDEBUG --OPT_FLAGS = -O3 -fomit-frame-pointer -march=k8 -DNDEBUG -D_LARGEFILE64_SOURCE -+#OPT_FLAGS = -O3 -fomit-frame-pointer -march=athlon-xp -DNDEBUG -+#OPT_FLAGS = -O3 -fomit-frame-pointer -march=k8 -DNDEBUG -D_LARGEFILE64_SOURCE - --CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \ -+CFLAGS += $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) \ - -I. -Iinclude -Ignfs -Ignfs/poly -Ignfs/poly/stage1 - - # tweak the compile flags -@@ -61,7 +61,7 @@ - # win32 or win64, so it's safe to pull libpthread into the link line. - # Of course this does mean you have to install the minGW pthreads bundle... - --LIBS += -lgmp -lm -lpthread -+LIBS += -lgmp -lm $(PTHREAD_LIBS) - - #---------------------------------- Generic file lists ------------------- - diff --git a/math/msieve/files/patch-include_util.h b/math/msieve/files/patch-include_util.h index 6a00a59a81c2..5659e8fd5a18 100644 --- a/math/msieve/files/patch-include_util.h +++ b/math/msieve/files/patch-include_util.h @@ -6,12 +6,12 @@ +#if defined(CPU_GENERIC) || \ + defined(CPU_PENTIUM2) || \ -+ defined(CPU_ATHLON) || \ + defined(CPU_PENTIUM3) || \ -+ defined(CPU_ATHLON_XP) || \ + defined(CPU_PENTIUM4) || \ + defined(CPU_PENTIUM_M) || \ + defined(CPU_CORE) || \ ++ defined(CPU_ATHLON) || \ ++ defined(CPU_ATHLON_XP) || \ + defined(CPU_OPTERON) #define HAS_CMOV #define HAS_MMX |