Date: Sun, 3 Mar 2013 02:09:07 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313321 - head/math/msieve Message-ID: <201303030209.r23297gM037206@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Sun Mar 3 02:09:06 2013 New Revision: 313321 URL: http://svnweb.freebsd.org/changeset/ports/313321 Log: update to 1.51; switch to new options format Modified: head/math/msieve/Makefile (contents, props changed) head/math/msieve/distinfo (contents, props changed) Modified: head/math/msieve/Makefile ============================================================================== --- head/math/msieve/Makefile Sun Mar 3 02:05:27 2013 (r313320) +++ head/math/msieve/Makefile Sun Mar 3 02:09:06 2013 (r313321) @@ -1,17 +1,13 @@ -# New ports collection makefile for: msieve -# Date created: 2007-01-02 -# Whom: Daniel Roethlisberger <daniel@roe.ch> -# +# Created by: Daniel Roethlisberger <daniel@roe.ch> # $FreeBSD$ -# PORTNAME= msieve -PORTVERSION= 1.50 +PORTVERSION= 1.51 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= \ - ${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION}/ -DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}src + ${PORTNAME}/${PORTNAME}/${PORTNAME:C/^m/M/}%20v${PORTVERSION} +DISTNAME= ${PORTNAME}${PORTVERSION:S/.//} MAINTAINER= bf@FreeBSD.org COMMENT= Fast factorization of big integers using MPQS and GNFS @@ -20,50 +16,63 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libecm.a WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" ECM=1 +MAKE_ENV= ECM=1 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 -OPTIONS= OCFLAGS "Enable optimized CFLAGS" On +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if !defined(WITHOUT_OCFLAGS) -CFLAGS+= -O3 -ffast-math -fomit-frame-pointer -DNDEBUG +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +CFLAGS+= -O3 -ffast-math +.if defined(WITHOUT_DEBUG) || !defined(WITH_DEBUG) +CFLAGS+= -fomit-frame-pointer -DNDEBUG +.endif .endif -.if ${OSVERSION} >= 700042 && ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 +.if ${MACHINE_CPU:Mathlon} +CFLAGS+= -DHAS_AMD_MMX +.endif + +.if ${MACHINE_CPU:Msse} +CFLAGS+= -DHAS_SSE .endif -.if ${ARCH} == "i386" -ALL_TARGET= x86 -.elif ${ARCH} == "amd64" -ALL_TARGET= x86_64 -.else -ALL_TARGET= generic +.if ${MACHINE_CPU:Msse2} +CFLAGS+= -DHAS_SSE2 +.endif + +.if ${OSVERSION} >= 700042 && ${ARCH} == "sparc64" +BROKEN= Does not compile on sparc64 .endif post-patch: - @${REINPLACE_CMD} -e "\|^CC =|d" -e "\|^OPT_FLAGS =|d" \ - -e "\|^CFLAGS =|s|=|+=|" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E \ + -e '/(^(CC|OPT_FLAGS) =|-DNDEBUG|svnversion|-ldl)/d' \ + -e '/^CFLAGS =/s/=/+=/' \ + -e 's@-Ignfs/poly/stage1@& -I${LOCALBASE}/include@' \ + -e 's@-lecm@-L${LOCALBASE}/lib &@' \ + -e 's/-lpthread/-pthread/' \ + -e 's/-DHAS_SSE2//' \ + ${WRKSRC}/Makefile do-install: @${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) + @cd ${WRKSRC}/include; ${INSTALL_DATA} ${HEADERS} ${PREFIX}/include/msieve + @${INSTALL_LIB} ${WRKSRC}/libmsieve.a ${PREFIX}/lib +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${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> +.include <bsd.port.mk> Modified: head/math/msieve/distinfo ============================================================================== --- head/math/msieve/distinfo Sun Mar 3 02:05:27 2013 (r313320) +++ head/math/msieve/distinfo Sun Mar 3 02:09:06 2013 (r313321) @@ -1,2 +1,2 @@ -SHA256 (msieve150src.tar.gz) = 42e58975fe03ba8d3ffae096962aa4d53d381aa0f9cfb5e6244da11eadcce676 -SIZE (msieve150src.tar.gz) = 547458 +SHA256 (msieve151.tar.gz) = 26bc1d0d89325986aacfbafb687451f3de5da1bd388e087ec3ac24813e9dc948 +SIZE (msieve151.tar.gz) = 623885
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303030209.r23297gM037206>