From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 30 21:40:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3AC9016A46B for ; Wed, 30 May 2007 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 1594C13C44B for ; Wed, 30 May 2007 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l4ULe10r036109 for ; Wed, 30 May 2007 21:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l4ULe1Ha036103; Wed, 30 May 2007 21:40:01 GMT (envelope-from gnats) Resent-Date: Wed, 30 May 2007 21:40:01 GMT Resent-Message-Id: <200705302140.l4ULe1Ha036103@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Daniel Roethlisberger Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 624F116A46F for ; Wed, 30 May 2007 21:34:43 +0000 (UTC) (envelope-from daniel+roe=aphrodite@roe.ch) Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26]) by mx1.freebsd.org (Postfix) with ESMTP id E9F8113C46C for ; Wed, 30 May 2007 21:34:42 +0000 (UTC) (envelope-from daniel+roe=aphrodite@roe.ch) Received: from aphrodite.roe ([10.23.42.10]) by calvin.roe.ch (envelope-from ) with ESMTPS (TLSv1:AES256-SHA:256) id 1HtV7p-00099X-EK ; Wed, 30 May 2007 22:50:33 +0200 Received: from aphrodite.roe (aphrodite [127.0.0.1]) by aphrodite.roe (8.13.8/8.13.8) with ESMTP id l4UKrxvE004504; Wed, 30 May 2007 22:53:59 +0200 (CEST) (envelope-from roe@aphrodite.roe) Received: (from roe@localhost) by aphrodite.roe (8.13.8/8.13.8/Submit) id l4UKrx0O004503; Wed, 30 May 2007 22:53:59 +0200 (CEST) (envelope-from roe) Message-Id: <200705302053.l4UKrx0O004503@aphrodite.roe> Date: Wed, 30 May 2007 22:53:59 +0200 (CEST) From: Daniel Roethlisberger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: daniel@roe.ch Subject: ports/113173: [maintainer] Upgrade math/msieve to 1.22 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Roethlisberger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2007 21:40:02 -0000 >Number: 113173 >Category: ports >Synopsis: [maintainer] Upgrade math/msieve to 1.22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 30 21:40:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 6.2-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD aphrodite.roe 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:40:53 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: DELETE: files/patch-include-util.h Upgrade math/msieve to latest version 1.22. >How-To-Repeat: >Fix: --- msieve-1.22.diff begins here --- diff -ruN msieve.orig/Makefile msieve/Makefile --- msieve.orig/Makefile Tue Jan 9 22:31:56 2007 +++ msieve/Makefile Wed May 30 22:45:48 2007 @@ -6,7 +6,7 @@ # PORTNAME= msieve -PORTVERSION= 1.14 +PORTVERSION= 1.22 CATEGORIES= math MASTER_SITES= http://www.boo.net/~jasonp/ \ http://mirror.roe.ch/dist/msieve/ @@ -37,8 +37,17 @@ .if !defined(WITHOUT_GNFS) LIB_DEPENDS+= gsl.9:${PORTSDIR}/math/gsl -ALL_TARGET= nfs +ALLTGT_SUFX= _nfs .endif + +ALLTGT= generic +.if ${ARCH} == "i386" +ALLTGT= x86 +.endif +.if ${ARCH} == "amd64" +ALLTGT= x86_64 +.endif +ALL_TARGET= ${ALLTGT}${ALLTGT_SUFX} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/msieve ${PREFIX}/bin diff -ruN msieve.orig/distinfo msieve/distinfo --- msieve.orig/distinfo Tue Jan 9 22:31:56 2007 +++ msieve/distinfo Wed May 30 21:51:13 2007 @@ -1,3 +1,3 @@ -MD5 (msieve114.tar.gz) = 536957406a42230978b38e6c074d24e2 -SHA256 (msieve114.tar.gz) = 692ea969a884306f21debfaf0b5a42701ac7110a20d2d0d7a852aee45c39ed3e -SIZE (msieve114.tar.gz) = 190549 +MD5 (msieve122.tar.gz) = 0a87ca3950449f1a3aef3b8da4663784 +SHA256 (msieve122.tar.gz) = 04490e39d6f816c03f882143cd9ccf777d19ad649fdf5d20ed8dd8503a268cc3 +SIZE (msieve122.tar.gz) = 240289 diff -ruN msieve.orig/files/patch-Makefile msieve/files/patch-Makefile --- msieve.orig/files/patch-Makefile Tue Jan 9 22:31:56 2007 +++ msieve/files/patch-Makefile Wed May 30 21:57:51 2007 @@ -1,22 +1,19 @@ ---- Makefile.orig Fri Jan 5 07:22:21 2007 -+++ Makefile Fri Jan 5 16:30:18 2007 -@@ -23,21 +23,21 @@ +--- Makefile.orig Sun May 27 07:36:20 2007 ++++ Makefile Wed May 30 21:57:37 2007 +@@ -24,19 +24,19 @@ - # gcc for x86 and x86-64; use the k8 flag below if running - # a 64-bit operating system on a 64-bit processor + # gcc with basic optimization (-march flag could + # get overridden by architecture-specific builds) -CC = gcc --OPT_FLAGS = -O3 -fomit-frame-pointer +#CC = gcc -+#OPT_FLAGS = -O3 -fomit-frame-pointer - # MACHINE_FLAGS = -march=pentium4 -DHAVE_CMOV - # MACHINE_FLAGS = -march=k8 -DHAVE_CMOV --MACHINE_FLAGS = -march=athlon -DHAVE_CMOV -+#MACHINE_FLAGS = -march=athlon -DHAVE_CMOV - # MACHINE_FLAGS = -march=pentium-m -DHAVE_CMOV WARN_FLAGS = -Wall -W -Wconversion +-OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=athlon ++#OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=athlon + # OPT_FLAGS = -O3 -fomit-frame-pointer -DNDEBUG -march=k8 # note that if GSL was built as a shared library you may need # to append -lgslcblas to LIB_GSL, or even build a static version + # Note to MinGW users: comment out LIB_THREAD, you don't need it -LIB_THREAD = -lpthread -LIB_GSL = -lgsl @@ -24,23 +21,58 @@ +LIB_GSL = -lgsl -lgslcblas -CFLAGS = $(OPT_FLAGS) $(MACHINE_FLAGS) $(WARN_FLAGS) -Iinclude -+CFLAGS += $(OPT_FLAGS) $(WARN_FLAGS) -DHAVE_CMOV -Iinclude $(CPPFLAGS) ++CFLAGS += $(WARN_FLAGS) -Iinclude $(CPPFLAGS) - COMMON_HDR = \ - include/ap.h \ -@@ -101,13 +101,13 @@ + #---------------------------------- Generic file lists ------------------- + +@@ -160,7 +160,7 @@ + ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86) + ranlib libmsieve.a +- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) ++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) + + x86_64: $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64) +@@ -168,13 +168,13 @@ + ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64) + ranlib libmsieve.a +- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) ++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) + + generic: $(COMMON_OBJS_NO_NFS) $(QS_OBJS) $(QS_CORE_OBJS) rm -f libmsieve.a - ar r libmsieve.a $(OBJS) + ar r libmsieve.a $(COMMON_OBJS_NO_NFS) $(QS_OBJS) $(QS_CORE_OBJS) ranlib libmsieve.a - $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) + $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a $(LIB_THREAD) - nfs: $(NFS_OBJS) + x86_nfs: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86) +@@ -182,7 +182,7 @@ + ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86) + ranlib libmsieve.a +- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \ ++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \ + $(LIB_THREAD) $(LIB_GSL) + + x86_64_nfs: $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \ +@@ -191,14 +191,14 @@ + ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) \ + $(QS_CORE_OBJS) $(QS_CORE_OBJS_X86_64) + ranlib libmsieve.a +- $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \ ++ $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \ + $(LIB_THREAD) $(LIB_GSL) + + generic_nfs: $(COMMON_OBJS) $(QS_OBJS) $(QS_CORE_OBJS) $(NFS_OBJS) rm -f libmsieve.a - ar r libmsieve.a $(NFS_OBJS) + ar r libmsieve.a $(COMMON_OBJS) $(QS_OBJS) $(NFS_OBJS) $(QS_CORE_OBJS) ranlib libmsieve.a - $(CC) $(CFLAGS) demo.c -o msieve -lm libmsieve.a \ + $(CC) $(CFLAGS) $(LDFLAGS) demo.c -o msieve -lm libmsieve.a \ $(LIB_THREAD) $(LIB_GSL) - %.o: %.c $(COMMON_HDR) + clean: diff -ruN msieve.orig/files/patch-include-util.h msieve/files/patch-include-util.h --- msieve.orig/files/patch-include-util.h Fri Jan 5 08:58:52 2007 +++ msieve/files/patch-include-util.h Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ ---- include/util.h.orig Sun Dec 31 16:30:03 2006 -+++ include/util.h Wed Jan 3 18:00:10 2007 -@@ -43,7 +43,10 @@ - #include - #include - #include --#ifndef _MSC_VER -+#include -+#if defined(FREEBSD) && (__FreeBSD_version < 500000) -+#include -+#elsif !defined(_MSC_VER) - #include - #endif - --- msieve-1.22.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: