NetBSD Problem Report #44447
From www@NetBSD.org Sun Jan 23 10:42:09 2011
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by www.NetBSD.org (Postfix) with ESMTP id 38CB163B883
for <gnats-bugs@gnats.NetBSD.org>; Sun, 23 Jan 2011 10:42:09 +0000 (UTC)
Message-Id: <20110123104205.8897E63B873@www.NetBSD.org>
Date: Sun, 23 Jan 2011 10:42:05 +0000 (UTC)
From: esg@sdf.lonestar.org
Reply-To: esg@sdf.lonestar.org
To: gnats-bugs@NetBSD.org
Subject: please update math/ntl to version 5.5.2
X-Send-Pr-Version: www-1.0
>Number: 44447
>Category: pkg
>Synopsis: please update math/ntl to version 5.5.2
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sun Jan 23 10:45:00 +0000 2011
>Closed-Date: Fri Feb 13 09:43:09 +0000 2015
>Last-Modified: Fri Feb 13 09:43:09 +0000 2015
>Originator: Emil Skoeldberg
>Release:
>Organization:
>Environment:
>Description:
math/ntl has not been updated in a long time. The patch
below updates to the latest version.
Changes between NTL 5.5.1 and 5.5.2
* New routines MulAddTo and MulSubFrom for computing x += a*b and
x -= a*b, where x and a are ZZ's and b is a ZZ or a long. In the
case where b is a long, this may be much faster than writing
mul(t, a, b); add(x, x, t). See ZZ.txt for details. These new
routines are used in a number of places in NTL to get faster
algorithms (for example, the LLL routine).
* Fixed a relatively benign indexing bug in GF2EX discovered by
Berend-Benjamin Tams using the valgrind tool.
Changes between NTL 5.5 and 5.5.1
* If using GMP (via either NTL_GMP_LIP or NTL_GMP_HACK), then the
new version (4.3.0) of GMP implements the XGCD functionality
differently, so that the coefficients do not always agree with
those returned by the classical extended Euclidean algorithm.
This version of NTL corrects the coefficients, so that the
"classical" coefficients are always produced, regardless of GMP's
implementation. This version of NTL also works around a bug in GMP
4.3.0's XGCD code (although that bug should be fixed in GMP 4.3.1).
* The configure script has been slightly modified: there is a new
configuration variable DEF_PREFIX, whose value can be used to set
PREFIX, GMP_PREFIX, and GF2X_PREFIX in one stroke. Also, the
(somewhat esoteric) configure variables GMP_LIBDIR, GMP_INCDIR,
GF2X_LIBDIR, and GF2X_INCDIR have slightly different meanings now.
Changes between NTL 5.4.2 and 5.5
* Added the ability to generate a shared library (with help from
Tim Abbott).
* Fixed some standardization issues (with help from Tim Abbot):
default location of installed documentation files now conforms
to standards; use of EOF now conforms to standards.
* Added a callback mechanism to NTL's error reporting function.
See ErrorCallback in tools.txt.
* Added support for the gf2x library for speeding up arithmetic
in GF2X (with help from Emmanuel Thomé).
* In conjuction with the above, I also changed the GF2X so that
it works better with very large polynomials: large blocks of
memory are released, recursive HalfGCD algorithms are used for
large polynomials.
* Fixed a bug in void TraceMod(zz_p& x, const zz_pX& a,
const zz_pXModulus& F) (reported by Luca De Feo).
* Fixed a performance issue in various versions of SetCoeff
(reported by Luca De Feo).
* Fixed the declaration of mat_zz_p transpose(const mat_zz_p& a)
(reported by Benoit Lacelle).
Changes between NTL 5.4.1 and 5.4.2
* Fixed a bug in the sub(ZZ_pEX, ZZ_pE, ZZ_pEX) and
sub(zz_pEX, zz_pE, zz_pEX) routines (reported by Charanjit Jutla).
Under certain circumstances, these could outout wrong answers.
Changes between NTL 5.4 and 5.4.1
* Fixed rounding bug in expm1 (reported by Paul Zimmermann).
* Fixed memory leak in several LLL routines
(reported by Friedrich Bahr).
* Fixed infinite loop in several LLL routines (this only occurred
on machines, like x86, with double rounding).
* Improved GF2X timing tests (suggested by Paul Zimmermann).
Changes between NTL 5.3.2 and 5.4
* By default, NTL now compiles in ISO mode (using namespaces, etc.).
You can always revert to traditional mode by unsetting the flag
NTL_STD_CXX (either pass NTL_STD_CXX=off to the configure script, or
manually edit the config.h file).
* Some bug fixes:
- The sqrt and log1p routines for the RR class would produce
incorrectly rounded results in certain circumstances (although
this only affected the relative error of the result very
marginally).
- The SqrRootPrec routine for the RR class could not be called,
because it was defined incorrectly.
Thanks to Paul Zimmermann for finding (and fixing) these bugs!
Paul has also validated NTL's RR class by cross-checking it with
the MPFR library.
* Some performance enhancements:
- Added a new MulModPrecon inline function for computing
(a * b) % n for single precision numbers, when b and n are fixed
for several computations. On some platforms this can be twice as
fast or more than the old MulMod2 routine. This indirectly affects
a lot of computations that are done via homomorphic imaging
(polynomial multiplication over zz_p, ZZ_p, and ZZ, matrix
computations over zz_p and ZZ).
- Rewrote the small prime FFT to take advantage of the new
MulModPrecon, and to be more cache friendly.
- Improved the performance of the GF2X multiplication routine.
On some platforms, it can be twice as fast as the old one.
Thanks (again) to Paul Zimmermann for suggesting some of these
improvements and supplying some of the code.
* Miscellany:
Rewrote several of the installation scripts in Perl (the old
shell scripts were getting too messy to maintain). However,
the syntax for all of the command-line interfaces remains
identical.
Changes between NTL 5.3.1 and 5.3.2
* Some bug fixes.
* Re-wrote SqrRootMod to make it run faster.
>How-To-Repeat:
>Fix:
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 24 Mar 2010 19:43:27 -0000 1.23
+++ Makefile 23 Jan 2011 10:40:37 -0000
@@ -1,19 +1,19 @@
# $NetBSD: Makefile,v 1.23 2010/03/24 19:43:27 asau Exp $
-DISTNAME= ntl-5.3.1
-PKGREVISION= 2
+DISTNAME= ntl-5.5.2
CATEGORIES= math devel
MASTER_SITES= http://www.shoup.net/ntl/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.shoup.net/ntl/
COMMENT= C++ library for doing number theory
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-NO_CONFIGURE= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= perl
USE_LIBTOOL= yes
MAKE_FILE= makefile
INSTALLATION_DIRS= lib
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 3 Dec 2009 17:48:58 -0000 1.6
+++ distinfo 23 Jan 2011 10:40:37 -0000
@@ -1,8 +1,5 @@
$NetBSD: distinfo,v 1.6 2009/12/03 17:48:58 joerg Exp $
-SHA1 (ntl-5.3.1.tar.gz) = 22f9004d59595ddf931150e39805880cca67f8bc
-RMD160 (ntl-5.3.1.tar.gz) = 2eec6b8c72f342e74c81fca432434818ce3615eb
-Size (ntl-5.3.1.tar.gz) = 669649 bytes
-SHA1 (patch-aa) = c6e4211c55d9c1e038718e690d485e195db6727b
-SHA1 (patch-ab) = 726bb373a3dc31c33763282c5cc7c07110a33f23
-SHA1 (patch-ac) = f6a1e211379e713aee4fb575cc2d92563cbdd6fd
+SHA1 (ntl-5.5.2.tar.gz) = b45e3858f7f351afeb7fbb831b256befc4892b06
+RMD160 (ntl-5.5.2.tar.gz) = 3ba508219276b3922ec6def391100a23b79f6193
+Size (ntl-5.5.2.tar.gz) = 707247 bytes
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa 3 Dec 2009 17:48:58 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,312 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
-
---- makefile.orig Tue Dec 17 15:43:30 2002
-+++ makefile
-@@ -7,7 +7,7 @@
- ###############################################################
-
-
--CC=gcc
-+#CC=gcc
- # A C or C++ compiler, e. g., gcc, cc, xlc.
- # There are a few components written in C which may be compiled
- # under C++, but C compilers tend to generate slightly better code.
-@@ -15,11 +15,11 @@ CC=gcc
- # compatible code.
-
-
--CXX=g++
-+#CXX=g++
- # A C++ compiler, e.g., g++, CC, xlC
-
-
--CFLAGS=-O2
-+#CFLAGS=-O2
- # Flags for the C compiler
- # Some useful flags:
- # -O2 -- recommended level of optimization
-@@ -31,7 +31,7 @@ CFLAGS=-O2
-
-
-
--CXXFLAGS=$(CFLAGS)
-+#CXXFLAGS=$(CFLAGS)
- # Flags for the C++ compiler (usually the same as CFLAGS)
- # Some useful flags:
- # -+ -- needed with xlC to make it treat .c files as C++ files
-@@ -40,16 +40,16 @@ CXXFLAGS=$(CFLAGS)
- # The defaults should almost always be OK.
-
-
--AR=ar
-+#AR=ar
- # command to make a library
-
--ARFLAGS=ruv
-+#ARFLAGS=ruv
- # arguments for AR
-
--RANLIB=ranlib
-+#RANLIB=ranlib
- # set to echo if you want to disable it completely
-
--LDFLAGS=
-+#LDFLAGS=
- # arguments for linker for C++ programs
-
- LDFLAGS_CXX=$(LDFLAGS)
-@@ -61,13 +61,13 @@ LDLIBS=-lm
- LDLIBS_CXX=$(LDLIBS)
- # libraries for linking C++ programs
-
--CPPFLAGS=
-+#CPPFLAGS=
- # arguments for the C preprocessor
-
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- LIBDIR=$(PREFIX)/lib
- INCLUDEDIR=$(PREFIX)/include
--DOCDIR=$(PREFIX)/doc
-+DOCDIR=$(PREFIX)/share/doc
- # where to install NTL
-
- ###############################################################
-@@ -87,15 +87,15 @@ DOCDIR=$(PREFIX)/doc
- ###############################################################
-
-
--GMP_INCDIR=
-+GMP_INCDIR= -I${BUILDLINK_PREFIX.gmp}/include
- # Set to -I<directory containing gmp.h> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
-
--GMP_LIBDIR=
-+GMP_LIBDIR= -Wl,-R${BUILDLINK_PREFIX.gmp}/lib -L${BUILDLINK_PREFIX.gmp}/lib
- # Set to -L<directory containing libgmp.a> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
-
--GMP_LIB=
-+GMP_LIB= -lgmp
- # Set to -lgmp if using GMP, empty otherwise
-
- ###############################################################
-@@ -147,7 +147,7 @@ OBJ=$(O19)
- S01=FFT.c FacVec.c GF2.c GF2E.c GF2EX.c GF2EXFactoring.c GF2X.c GF2X1.c
- S02=$(S01) GF2XFactoring.c GF2XVec.c HNF.c ctools.c LLL.c LLL_FP.c LLL_QP.c
- S03=$(S02) LLL_RR.c LLL_XD.c RR.c WordVector.c ZZ.c ZZVec.c ZZX.c ZZX1.c
--S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c
-+S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c
- S05=$(S04) ZZ_pEXFactoring.c ZZ_pX.c ZZ_pX1.c ZZ_pXCharPoly.c
- S06=$(S05) ZZ_pXFactoring.c fileio.c lip.c lzz_p.c lzz_pE.c lzz_pEX.c
- S07=$(S06) lzz_pEXFactoring.c lzz_pX.c lzz_pX1.c
-@@ -162,8 +162,8 @@ S15=$(S14) vec_long.c vec_lzz_p.c vec_lz
- S16=$(S15) vec_vec_GF2.c vec_vec_GF2E.c vec_vec_RR.c vec_vec_ZZ.c
- S17=$(S16) vec_vec_ZZ_p.c vec_vec_ZZ_pE.c vec_vec_long.c vec_vec_lzz_p.c
- S18=$(S17) vec_vec_lzz_pE.c vec_xdouble.c xdouble.c
--S19=$(S18) G_LLL_FP.c G_LLL_QP.c G_LLL_XD.c G_LLL_RR.c
--S20=$(S19) vec_ulong.c vec_vec_ulong.c
-+S19=$(S18) G_LLL_FP.c G_LLL_QP.c G_LLL_XD.c G_LLL_RR.c
-+S20=$(S19) vec_ulong.c vec_vec_ulong.c
-
- SRC = $(S20)
-
-@@ -178,7 +178,7 @@ SINC = c_lip_impl.h g_lip_impl.h
- # library header files
-
- IN01= FFT.h FacVec.h GF2.h GF2E.h GF2EX.h GF2EXFactoring.h GF2X.h
--IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
-+IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
- IN03=$(IN02) RR.h WordVector.h ZZ.h ZZVec.h ZZX.h ZZXFactoring.h ZZ_p.h
- IN04=$(IN03) ZZ_pE.h ZZ_pEX.h ZZ_pEXFactoring.h ZZ_pX.h ZZ_pXFactoring.h
- IN05=$(IN04) fileio.h lip.h lzz_p.h lzz_pE.h lzz_pEX.h lzz_pEXFactoring.h
-@@ -202,9 +202,9 @@ INCL=$(IN18)
-
- # test data
-
--TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut
--TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut
--TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn
-+TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut
-+TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut
-+TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn
- TD4=$(TD3) CharPolyTestOut QuadTestIn QuadTestOut
-
- TD = $(TD4)
-@@ -260,15 +260,15 @@ DOC = $(D18)
- # test program executables
-
- PROG1=QuickTest BerlekampTest CanZassTest ZZXFacTest MoreFacTest LLLTest BitMatTest
--PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
-+PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
- PROG3=$(PROG2) GF2EXTest subset ZZ_pEXTest lzz_pEXTest
- PROGS = $(PROG3)
-
- # things to save to a tar file
-
--SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
-+SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
- SFI2=$(SFI1) MulTimeTest.c PolyTimeTest.c clr_AVOID_BRANCHING clr_AVOID_FLOAT
--SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
-+SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
- SFI4=$(SFI3) InitSettings.c mul_banner poly_banner set_AVOID_BRANCHING set_AVOID_FLOAT
- SFI5=$(SFI4) set_FFT_PIPELINE set_LONG_LONG set_TBL_REM set_WIZARD_HACK
- SFI6=$(SFI5) WizComp.c DispSettings.c config_template WizardAux Wizard def_makefile
-@@ -285,11 +285,11 @@ SFILES=$(SFI6)
- NTL_INCLUDE = -I../include -I.
- # NTL needs this to find its include files
-
--COMPILE = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
--COMPILE_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
-+COMPILE_CXX = $(LIBTOOL) --mode=compile $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
-
--LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
--LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
-+LINK = $(LIBTOOL) --mode=link $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_CXX = $(LIBTOOL) --mode=link $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
-
-
-
-@@ -298,14 +298,14 @@ all:
- make setup2
- make setup3
- make setup4
-- make ntl.a
-+ make libntl.la
-
-
- # setup1 generates the file ../incluse/NTL/mach_desc.h
-
- setup1:
- $(COMPILE) MakeDescAux.c
-- $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.o $(LDLIBS)
-+ $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.lo $(LDLIBS)
- ./MakeDesc
- mv mach_desc.h ../include/NTL/mach_desc.h
-
-@@ -332,9 +332,10 @@ setup4:
- sh Wizard $(WIZARD)
-
-
--ntl.a: $(OBJ)
-- $(AR) $(ARFLAGS) ntl.a $(OBJ)
-- - $(RANLIB) ntl.a
-+libntl.la: $(OBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libntl.la $(OBJ:.o=.lo) \
-+ $(GMP_LIBDIR) $(GMP_LIB) -rpath $(LIBDIR) \
-+ -version-info 0:1
-
- lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- $(COMPILE) $(GMP_INCDIR) lip.c
-@@ -343,15 +344,15 @@ ctools.o: ctools.c
- $(COMPILE) ctools.c
-
-
--GetTime.o: GetTime.c
-+GetTime.o: GetTime.c
- $(COMPILE) GetTime.c
-
-
--.c.o:
-+.c.o:
- $(COMPILE_CXX) $<
-
--.c:
-- $(LINK_CXX) -o $@ $< ntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+.c:
-+ $(LINK_CXX) -o $@ $< libntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- #################################################################
- #
-@@ -372,25 +373,20 @@ check:
- # make install just does a simple copy of the include file
- # and library
- # make uninstall removes these files
--#
-+#
- #################################################################
-
-
-
-
- install:
-- mkdir -p $(LIBDIR)
-- cp ntl.a $(LIBDIR)/libntl.a
-- mkdir -p $(INCLUDEDIR)
-- - rm -r $(INCLUDEDIR)/NTL
-- mkdir $(INCLUDEDIR)/NTL
-- cp ../include/NTL/*.h $(INCLUDEDIR)/NTL
-- mkdir -p $(DOCDIR)
-- - rm -r $(DOCDIR)/NTL
-- mkdir $(DOCDIR)/NTL
-- cp ../doc/*.txt $(DOCDIR)/NTL
-- cp ../doc/*.html $(DOCDIR)/NTL
-- cp ../doc/*.gif $(DOCDIR)/NTL
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libntl.la ${DESTDIR}$(LIBDIR)
-+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INCLUDEDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../include/NTL/*.h ${DESTDIR}$(INCLUDEDIR)/NTL
-+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../doc/*.txt ${DESTDIR}$(DOCDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../doc/*.html ${DESTDIR}$(DOCDIR)/NTL
-+
-
-
- uninstall:
-@@ -409,17 +405,17 @@ uninstall:
- #
- #################################################################
-
--clobber:
-- - rm ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-- - rm lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
-+clobber:
-+ - rm -fr libntl.la .libs mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-+ - rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
- - sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm *.o
-- - rm -r small
-+ - rm -f *.o *.lo
-+ - rm -fr small
-
- clean:
-- - rm *.o
-+ - rm -f *.o *.lo
- - sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm -r small
-+ - rm -fr small
-
- #################################################################
- #
-@@ -436,7 +432,7 @@ DIRNAME=ntl-5.3.1
- WINDIR=WinNTL-5_3_1
-
- package:
-- sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
-+ sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
- -rm -r $(DIRNAME)
- mv unix $(DIRNAME)
- chmod -R a+rX $(DIRNAME)
-@@ -467,17 +463,17 @@ WO2 = $(WO1) ZZ_pX1.o lip.o tools.o vec_
- WOBJ = $(WO2)
-
-
--wntl.a: $(WOBJ)
-- $(AR) $(ARFLAGS) wntl.a $(WOBJ)
-- - $(RANLIB) wntl.a
-+libwntl.la: $(WOBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
-+ -version-info 0:0
-
-
-
- MulTimeTest:
-- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- PolyTimeTest:
-- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- InitSettings:
- $(LINK_CXX) -o InitSettings InitSettings.c $(LDLIBS_CXX)
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab 29 Jan 2001 06:53:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/01/29 06:53:28 jtb Exp $
-
---- ../include/NTL/config.h.orig Mon Jan 29 06:50:11 2001
-+++ ../include/NTL/config.h
-@@ -71,7 +71,7 @@
- #endif
-
-
--#if 0
-+#if 1
- #define NTL_GMP_LIP
-
- /*
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 20 Jun 2001 10:19:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/06/20 10:19:28 jtb Exp $
-
---- WizardAux.orig Fri Jun 8 14:23:16 2001
-+++ WizardAux
-@@ -12,7 +12,7 @@
- cat clr_LONG_LONG clr_AVOID_FLOAT > best1
- cat clr_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
--make wntl.a
-+make libwntl.la
- sh RemoveProg MulTimeTest
-
- if test -f NO_GMP_LIP
-@@ -33,7 +33,7 @@
- cat clr_LONG_LONG set_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg MulTimeTest
- make MulTimeTest
- if test -f MulTimeTest
-@@ -55,7 +55,7 @@
- cat set_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg MulTimeTest
- make MulTimeTest
- if test -f MulTimeTest
-@@ -79,7 +79,7 @@
- cat best1 clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -95,7 +95,7 @@
- cat best1 clr_TBL_REM clr_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm FFT.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -123,7 +123,7 @@
- cat best1 set_TBL_REM clr_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -151,7 +151,7 @@
- cat best1 clr_TBL_REM set_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm *.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -167,7 +167,7 @@
- cat best1 clr_TBL_REM set_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm FFT.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -196,7 +196,7 @@
- cat best1 set_TBL_REM set_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
>Release-Note:
>Audit-Trail:
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/44447: please update math/ntl to version 5.5.2
Date: Sun, 23 Jan 2011 14:50:45 +0100
--xjamM5M9kpPM/bcu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sun, Jan 23, 2011 at 10:45:00AM +0000, esg@sdf.lonestar.org wrote:
> >Synopsis: please update math/ntl to version 5.5.2
I tried it. It tried installing into /usr/local, and the PLIST didn't
match. In particular, a static library is created instead of a libtool
one.
I've updated the patch, attached. Is that version fine with you or do
you have improvements?
Thomas
--xjamM5M9kpPM/bcu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ntl.diff"
? log
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 24 Mar 2010 19:43:27 -0000 1.23
+++ Makefile 23 Jan 2011 13:49:27 -0000
@@ -1,21 +1,22 @@
# $NetBSD: Makefile,v 1.23 2010/03/24 19:43:27 asau Exp $
-DISTNAME= ntl-5.3.1
-PKGREVISION= 2
+DISTNAME= ntl-5.5.2
CATEGORIES= math devel
MASTER_SITES= http://www.shoup.net/ntl/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.shoup.net/ntl/
COMMENT= C++ library for doing number theory
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-NO_CONFIGURE= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= perl
USE_LIBTOOL= yes
MAKE_FILE= makefile
+MAKE_FLAGS+= DEF_PREFIX=${DESTDIR}${PREFIX}
INSTALLATION_DIRS= lib
.include "../../devel/gmp/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 14 Jun 2009 18:05:46 -0000 1.4
+++ PLIST 23 Jan 2011 13:49:27 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:05:46 joerg Exp $
+@comment $NetBSD$
include/NTL/FFT.h
include/NTL/FacVec.h
include/NTL/GF2.h
@@ -11,6 +11,7 @@
include/NTL/HNF.h
include/NTL/LLL.h
include/NTL/RR.h
+include/NTL/SPMM_ASM.h
include/NTL/WordVector.h
include/NTL/ZZ.h
include/NTL/ZZVec.h
@@ -88,7 +89,7 @@
include/NTL/vector.h
include/NTL/version.h
include/NTL/xdouble.h
-lib/libntl.la
+lib/libntl.a
share/doc/NTL/GF2.txt
share/doc/NTL/GF2E.txt
share/doc/NTL/GF2EX.txt
@@ -109,6 +110,9 @@
share/doc/NTL/ZZ_pEXFactoring.txt
share/doc/NTL/ZZ_pX.txt
share/doc/NTL/ZZ_pXFactoring.txt
+share/doc/NTL/arrow1.gif
+share/doc/NTL/arrow2.gif
+share/doc/NTL/arrow3.gif
share/doc/NTL/config.txt
share/doc/NTL/conversions.txt
share/doc/NTL/copying.txt
@@ -145,6 +149,7 @@
share/doc/NTL/tour-ex5.html
share/doc/NTL/tour-ex6.html
share/doc/NTL/tour-examples.html
+share/doc/NTL/tour-gf2x.html
share/doc/NTL/tour-gmp.html
share/doc/NTL/tour-impl.html
share/doc/NTL/tour-intro.html
@@ -153,6 +158,7 @@
share/doc/NTL/tour-stdcxx.html
share/doc/NTL/tour-struct.html
share/doc/NTL/tour-time.html
+share/doc/NTL/tour-tips.html
share/doc/NTL/tour-unix.html
share/doc/NTL/tour-win.html
share/doc/NTL/tour.html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/ntl/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 3 Dec 2009 17:48:58 -0000 1.6
+++ distinfo 23 Jan 2011 13:49:27 -0000
@@ -1,8 +1,5 @@
$NetBSD: distinfo,v 1.6 2009/12/03 17:48:58 joerg Exp $
-SHA1 (ntl-5.3.1.tar.gz) = 22f9004d59595ddf931150e39805880cca67f8bc
-RMD160 (ntl-5.3.1.tar.gz) = 2eec6b8c72f342e74c81fca432434818ce3615eb
-Size (ntl-5.3.1.tar.gz) = 669649 bytes
-SHA1 (patch-aa) = c6e4211c55d9c1e038718e690d485e195db6727b
-SHA1 (patch-ab) = 726bb373a3dc31c33763282c5cc7c07110a33f23
-SHA1 (patch-ac) = f6a1e211379e713aee4fb575cc2d92563cbdd6fd
+SHA1 (ntl-5.5.2.tar.gz) = b45e3858f7f351afeb7fbb831b256befc4892b06
+RMD160 (ntl-5.5.2.tar.gz) = 3ba508219276b3922ec6def391100a23b79f6193
+Size (ntl-5.5.2.tar.gz) = 707247 bytes
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa 3 Dec 2009 17:48:58 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,312 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/12/03 17:48:58 joerg Exp $
-
---- makefile.orig Tue Dec 17 15:43:30 2002
-+++ makefile
-@@ -7,7 +7,7 @@
- ###############################################################
-
-
--CC=gcc
-+#CC=gcc
- # A C or C++ compiler, e. g., gcc, cc, xlc.
- # There are a few components written in C which may be compiled
- # under C++, but C compilers tend to generate slightly better code.
-@@ -15,11 +15,11 @@ CC=gcc
- # compatible code.
-
-
--CXX=g++
-+#CXX=g++
- # A C++ compiler, e.g., g++, CC, xlC
-
-
--CFLAGS=-O2
-+#CFLAGS=-O2
- # Flags for the C compiler
- # Some useful flags:
- # -O2 -- recommended level of optimization
-@@ -31,7 +31,7 @@ CFLAGS=-O2
-
-
-
--CXXFLAGS=$(CFLAGS)
-+#CXXFLAGS=$(CFLAGS)
- # Flags for the C++ compiler (usually the same as CFLAGS)
- # Some useful flags:
- # -+ -- needed with xlC to make it treat .c files as C++ files
-@@ -40,16 +40,16 @@ CXXFLAGS=$(CFLAGS)
- # The defaults should almost always be OK.
-
-
--AR=ar
-+#AR=ar
- # command to make a library
-
--ARFLAGS=ruv
-+#ARFLAGS=ruv
- # arguments for AR
-
--RANLIB=ranlib
-+#RANLIB=ranlib
- # set to echo if you want to disable it completely
-
--LDFLAGS=
-+#LDFLAGS=
- # arguments for linker for C++ programs
-
- LDFLAGS_CXX=$(LDFLAGS)
-@@ -61,13 +61,13 @@ LDLIBS=-lm
- LDLIBS_CXX=$(LDLIBS)
- # libraries for linking C++ programs
-
--CPPFLAGS=
-+#CPPFLAGS=
- # arguments for the C preprocessor
-
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- LIBDIR=$(PREFIX)/lib
- INCLUDEDIR=$(PREFIX)/include
--DOCDIR=$(PREFIX)/doc
-+DOCDIR=$(PREFIX)/share/doc
- # where to install NTL
-
- ###############################################################
-@@ -87,15 +87,15 @@ DOCDIR=$(PREFIX)/doc
- ###############################################################
-
-
--GMP_INCDIR=
-+GMP_INCDIR= -I${BUILDLINK_PREFIX.gmp}/include
- # Set to -I<directory containing gmp.h> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
-
--GMP_LIBDIR=
-+GMP_LIBDIR= -Wl,-R${BUILDLINK_PREFIX.gmp}/lib -L${BUILDLINK_PREFIX.gmp}/lib
- # Set to -L<directory containing libgmp.a> if using GMP and GMP
- # is not installed in a standard system directory, empty otherwise
-
--GMP_LIB=
-+GMP_LIB= -lgmp
- # Set to -lgmp if using GMP, empty otherwise
-
- ###############################################################
-@@ -147,7 +147,7 @@ OBJ=$(O19)
- S01=FFT.c FacVec.c GF2.c GF2E.c GF2EX.c GF2EXFactoring.c GF2X.c GF2X1.c
- S02=$(S01) GF2XFactoring.c GF2XVec.c HNF.c ctools.c LLL.c LLL_FP.c LLL_QP.c
- S03=$(S02) LLL_RR.c LLL_XD.c RR.c WordVector.c ZZ.c ZZVec.c ZZX.c ZZX1.c
--S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c
-+S04=$(S03) ZZXCharPoly.c ZZXFactoring.c ZZ_p.c ZZ_pE.c ZZ_pEX.c
- S05=$(S04) ZZ_pEXFactoring.c ZZ_pX.c ZZ_pX1.c ZZ_pXCharPoly.c
- S06=$(S05) ZZ_pXFactoring.c fileio.c lip.c lzz_p.c lzz_pE.c lzz_pEX.c
- S07=$(S06) lzz_pEXFactoring.c lzz_pX.c lzz_pX1.c
-@@ -162,8 +162,8 @@ S15=$(S14) vec_long.c vec_lzz_p.c vec_lz
- S16=$(S15) vec_vec_GF2.c vec_vec_GF2E.c vec_vec_RR.c vec_vec_ZZ.c
- S17=$(S16) vec_vec_ZZ_p.c vec_vec_ZZ_pE.c vec_vec_long.c vec_vec_lzz_p.c
- S18=$(S17) vec_vec_lzz_pE.c vec_xdouble.c xdouble.c
--S19=$(S18) G_LLL_FP.c G_LLL_QP.c G_LLL_XD.c G_LLL_RR.c
--S20=$(S19) vec_ulong.c vec_vec_ulong.c
-+S19=$(S18) G_LLL_FP.c G_LLL_QP.c G_LLL_XD.c G_LLL_RR.c
-+S20=$(S19) vec_ulong.c vec_vec_ulong.c
-
- SRC = $(S20)
-
-@@ -178,7 +178,7 @@ SINC = c_lip_impl.h g_lip_impl.h
- # library header files
-
- IN01= FFT.h FacVec.h GF2.h GF2E.h GF2EX.h GF2EXFactoring.h GF2X.h
--IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
-+IN02=$(IN01) GF2XFactoring.h GF2XVec.h HNF.h ctools.h LLL.h
- IN03=$(IN02) RR.h WordVector.h ZZ.h ZZVec.h ZZX.h ZZXFactoring.h ZZ_p.h
- IN04=$(IN03) ZZ_pE.h ZZ_pEX.h ZZ_pEXFactoring.h ZZ_pX.h ZZ_pXFactoring.h
- IN05=$(IN04) fileio.h lip.h lzz_p.h lzz_pE.h lzz_pEX.h lzz_pEXFactoring.h
-@@ -202,9 +202,9 @@ INCL=$(IN18)
-
- # test data
-
--TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut
--TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut
--TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn
-+TD1=BerlekampTestIn BerlekampTestOut CanZassTestIn CanZassTestOut
-+TD2=$(TD1) ZZXFacTestIn ZZXFacTestOut MoreFacTestIn LLLTestIn LLLTestOut RRTestIn RRTestOut
-+TD3=$(TD2) MatrixTestIn MatrixTestOut CharPolyTestIn
- TD4=$(TD3) CharPolyTestOut QuadTestIn QuadTestOut
-
- TD = $(TD4)
-@@ -260,15 +260,15 @@ DOC = $(D18)
- # test program executables
-
- PROG1=QuickTest BerlekampTest CanZassTest ZZXFacTest MoreFacTest LLLTest BitMatTest
--PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
-+PROG2=$(PROG1) MatrixTest CharPolyTest RRTest QuadTest
- PROG3=$(PROG2) GF2EXTest subset ZZ_pEXTest lzz_pEXTest
- PROGS = $(PROG3)
-
- # things to save to a tar file
-
--SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
-+SFI1=makefile $(SRC) $(SINC) $(SCRIPTS) $(MD) $(GT) $(TS) $(TD) mach_desc.win
- SFI2=$(SFI1) MulTimeTest.c PolyTimeTest.c clr_AVOID_BRANCHING clr_AVOID_FLOAT
--SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
-+SFI3=$(SFI2) clr_FFT_PIPELINE clr_LONG_LONG clr_TBL_REM clr_WIZARD_HACK
- SFI4=$(SFI3) InitSettings.c mul_banner poly_banner set_AVOID_BRANCHING set_AVOID_FLOAT
- SFI5=$(SFI4) set_FFT_PIPELINE set_LONG_LONG set_TBL_REM set_WIZARD_HACK
- SFI6=$(SFI5) WizComp.c DispSettings.c config_template WizardAux Wizard def_makefile
-@@ -285,11 +285,11 @@ SFILES=$(SFI6)
- NTL_INCLUDE = -I../include -I.
- # NTL needs this to find its include files
-
--COMPILE = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
--COMPILE_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
-+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) -c
-+COMPILE_CXX = $(LIBTOOL) --mode=compile $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) -c
-
--LINK = $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
--LINK_CXX = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
-+LINK = $(LIBTOOL) --mode=link $(CC) $(NTL_INCLUDE) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
-+LINK_CXX = $(LIBTOOL) --mode=link $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS_CXX)
-
-
-
-@@ -298,14 +298,14 @@ all:
- make setup2
- make setup3
- make setup4
-- make ntl.a
-+ make libntl.la
-
-
- # setup1 generates the file ../incluse/NTL/mach_desc.h
-
- setup1:
- $(COMPILE) MakeDescAux.c
-- $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.o $(LDLIBS)
-+ $(LINK) -o MakeDesc MakeDesc.c MakeDescAux.lo $(LDLIBS)
- ./MakeDesc
- mv mach_desc.h ../include/NTL/mach_desc.h
-
-@@ -332,9 +332,10 @@ setup4:
- sh Wizard $(WIZARD)
-
-
--ntl.a: $(OBJ)
-- $(AR) $(ARFLAGS) ntl.a $(OBJ)
-- - $(RANLIB) ntl.a
-+libntl.la: $(OBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libntl.la $(OBJ:.o=.lo) \
-+ $(GMP_LIBDIR) $(GMP_LIB) -rpath $(LIBDIR) \
-+ -version-info 0:1
-
- lip.o: lip.c g_lip_impl.h c_lip_impl.h lip_gmp_aux_impl.h
- $(COMPILE) $(GMP_INCDIR) lip.c
-@@ -343,15 +344,15 @@ ctools.o: ctools.c
- $(COMPILE) ctools.c
-
-
--GetTime.o: GetTime.c
-+GetTime.o: GetTime.c
- $(COMPILE) GetTime.c
-
-
--.c.o:
-+.c.o:
- $(COMPILE_CXX) $<
-
--.c:
-- $(LINK_CXX) -o $@ $< ntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+.c:
-+ $(LINK_CXX) -o $@ $< libntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- #################################################################
- #
-@@ -372,25 +373,20 @@ check:
- # make install just does a simple copy of the include file
- # and library
- # make uninstall removes these files
--#
-+#
- #################################################################
-
-
-
-
- install:
-- mkdir -p $(LIBDIR)
-- cp ntl.a $(LIBDIR)/libntl.a
-- mkdir -p $(INCLUDEDIR)
-- - rm -r $(INCLUDEDIR)/NTL
-- mkdir $(INCLUDEDIR)/NTL
-- cp ../include/NTL/*.h $(INCLUDEDIR)/NTL
-- mkdir -p $(DOCDIR)
-- - rm -r $(DOCDIR)/NTL
-- mkdir $(DOCDIR)/NTL
-- cp ../doc/*.txt $(DOCDIR)/NTL
-- cp ../doc/*.html $(DOCDIR)/NTL
-- cp ../doc/*.gif $(DOCDIR)/NTL
-+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libntl.la ${DESTDIR}$(LIBDIR)
-+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INCLUDEDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../include/NTL/*.h ${DESTDIR}$(INCLUDEDIR)/NTL
-+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../doc/*.txt ${DESTDIR}$(DOCDIR)/NTL
-+ $(BSD_INSTALL_DATA) ../doc/*.html ${DESTDIR}$(DOCDIR)/NTL
-+
-
-
- uninstall:
-@@ -409,17 +405,17 @@ uninstall:
- #
- #################################################################
-
--clobber:
-- - rm ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-- - rm lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
-+clobber:
-+ - rm -fr libntl.la .libs mach_desc.h ../include/NTL/mach_desc.h GetTime.c
-+ - rm -f lip_gmp_aux_impl.h ../include/NTL/gmp_aux.h
- - sh RemoveProg $(PROGS) MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm *.o
-- - rm -r small
-+ - rm -f *.o *.lo
-+ - rm -fr small
-
- clean:
-- - rm *.o
-+ - rm -f *.o *.lo
- - sh RemoveProg MakeDesc TestGetTime gen_lip_gmp_aux gen_gmp_aux
-- - rm -r small
-+ - rm -fr small
-
- #################################################################
- #
-@@ -436,7 +432,7 @@ DIRNAME=ntl-5.3.1
- WINDIR=WinNTL-5_3_1
-
- package:
-- sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
-+ sh unixify "$(SFILES)" "$(INCL)" "$(DOC)"
- -rm -r $(DIRNAME)
- mv unix $(DIRNAME)
- chmod -R a+rX $(DIRNAME)
-@@ -467,17 +463,17 @@ WO2 = $(WO1) ZZ_pX1.o lip.o tools.o vec_
- WOBJ = $(WO2)
-
-
--wntl.a: $(WOBJ)
-- $(AR) $(ARFLAGS) wntl.a $(WOBJ)
-- - $(RANLIB) wntl.a
-+libwntl.la: $(WOBJ)
-+ $(LIBTOOL) --mode=link $(CC) -o libwntl.la $(WOBJ:.o=.lo) -rpath $(LIBDIR) \
-+ -version-info 0:0
-
-
-
- MulTimeTest:
-- $(LINK_CXX) -o MulTimeTest MulTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o MulTimeTest MulTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- PolyTimeTest:
-- $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c wntl.a $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-+ $(LINK_CXX) -o PolyTimeTest PolyTimeTest.c libwntl.la $(GMP_LIBDIR) $(GMP_LIB) $(LDLIBS_CXX)
-
- InitSettings:
- $(LINK_CXX) -o InitSettings InitSettings.c $(LDLIBS_CXX)
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab 29 Jan 2001 06:53:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/01/29 06:53:28 jtb Exp $
-
---- ../include/NTL/config.h.orig Mon Jan 29 06:50:11 2001
-+++ ../include/NTL/config.h
-@@ -71,7 +71,7 @@
- #endif
-
-
--#if 0
-+#if 1
- #define NTL_GMP_LIP
-
- /*
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 20 Jun 2001 10:19:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,85 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/06/20 10:19:28 jtb Exp $
-
---- WizardAux.orig Fri Jun 8 14:23:16 2001
-+++ WizardAux
-@@ -12,7 +12,7 @@
- cat clr_LONG_LONG clr_AVOID_FLOAT > best1
- cat clr_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
--make wntl.a
-+make libwntl.la
- sh RemoveProg MulTimeTest
-
- if test -f NO_GMP_LIP
-@@ -33,7 +33,7 @@
- cat clr_LONG_LONG set_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg MulTimeTest
- make MulTimeTest
- if test -f MulTimeTest
-@@ -55,7 +55,7 @@
- cat set_LONG_LONG clr_AVOID_FLOAT clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg MulTimeTest
- make MulTimeTest
- if test -f MulTimeTest
-@@ -79,7 +79,7 @@
- cat best1 clr_TBL_REM clr_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -95,7 +95,7 @@
- cat best1 clr_TBL_REM clr_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm FFT.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -123,7 +123,7 @@
- cat best1 set_TBL_REM clr_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -151,7 +151,7 @@
- cat best1 clr_TBL_REM set_AVOID_BRANCHING clr_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm *.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -167,7 +167,7 @@
- cat best1 clr_TBL_REM set_AVOID_BRANCHING set_FFT_PIPELINE set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm FFT.o
--make wntl.a
-+make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
-@@ -196,7 +196,7 @@
- cat best1 set_TBL_REM set_AVOID_BRANCHING best2 set_WIZARD_HACK isettings > isettings1
- sed -f isettings1 config_template > ../include/NTL/config.h
- rm lip.o
-- make wntl.a
-+ make libwntl.la
- sh RemoveProg PolyTimeTest
- make PolyTimeTest
- if test -f PolyTimeTest
--xjamM5M9kpPM/bcu--
From: Emil Skoeldberg <esg@SDF.LONESTAR.ORG>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/44447: please update math/ntl to version 5.5.2
Date: Sun, 23 Jan 2011 18:04:24 +0000
On Sun, Jan 23, 2011 at 01:55:01PM +0000, Thomas Klausner wrote:
> I've updated the patch, attached. Is that version fine with you or do
> you have improvements?
Looks good to me. Thanks for fixing my omissions in my patch.
Emil
From: Thomas Klausner <wiz@NetBSD.org>
To: NetBSD bugtracking <gnats-bugs@NetBSD.org>
Cc:
Subject: Re: pkg/44447: please update math/ntl to version 5.5.2
Date: Mon, 24 Jan 2011 01:37:24 +0100
On Sun, Jan 23, 2011 at 06:05:03PM +0000, Emil Skoeldberg wrote:
> Looks good to me. Thanks for fixing my omissions in my patch.
Oh, I just saw that you removed the patches that made the package
build a libtool library -- we'd prefer it if those stayed. Could you
please reinstate them or (even better) convince upstream to use them?
Thanks,
Thomas
State-Changed-From-To: open->closed
State-Changed-By: snj@NetBSD.org
State-Changed-When: Fri, 13 Feb 2015 09:43:09 +0000
State-Changed-Why:
updated in 2012
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.
Home