On 05/02/2020 14:00, Stuart Henderson wrote:
On 2020/02/05 10:27, Benoit Lecocq wrote:


On 05/02/2020 08:04, wen heping wrote:
Do you mean SHARED_LIBS should be modified ?
But the shared_libs.log say it is :
SHARED_LIBS +=  ntl                  9.2      # 0.0

Yes, we need :

SHARED_LIBS =        ntl     10.0


shared_libs.log (if present) shows what it is currently set to in the
port, and what upstream has set.

Some upstreams follow the rules for updating the library version numbers
but many do not so we do our own checks.


Committed, thanks !


wen
------------------------------------------------------------------------
*发件人:* Stuart Henderson <s...@spacehopper.org>
*发送时间:* 2020年2月4日 22:35
*收件人:* wen heping <wenheping2...@hotmail.com>
*抄送:* ben...@openbsd.org <ben...@openbsd.org>; ports@openbsd.org
<ports@openbsd.org>
*主题:* Re: [Update]math/ntl:Update to 11.4.3
https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

On 2020/02/04 13:56, wen heping wrote:
Hi,

     Here is a patch for math/ntl:
      i) Update to 11.4.3
      ii) Switch HOMEPAGE to https

     It build well , run well and pass  tests on amd64-current system.
     No other ports depends on it.

Cheers !
wen

Index: Makefile
===================================================================
RCS file: /cvs/ports/math/ntl/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile  12 Jul 2019 20:47:43 -0000      1.52
+++ Makefile  4 Feb 2020 13:50:29 -0000
@@ -2,12 +2,11 @@
   COMMENT =    Victor Shoup's Number Theory Library
-DISTNAME =   ntl-9.11.0
-REVISION =   3
+DISTNAME =   ntl-11.4.3
   SHARED_LIBS =        ntl     9.2     # 0.0
   CATEGORIES = math
-HOMEPAGE =   http://www.shoup.net/ntl/
+HOMEPAGE =   https://www.shoup.net/ntl/
   MAINTAINER = Benoit Lecocq <ben...@openbsd.org>
@@ -39,7 +38,8 @@ do-install:
         @${INSTALL_DATA_DIR} ${PREFIX}/include/NTL
         @cd ${WRKSRC}/include/NTL; ${INSTALL_DATA} *.h ${PREFIX}/include/NTL
         @cd ${WRKBUILD}; ${INSTALL_DATA} .libs/libntl.a  ${PREFIX}/lib/libntl.a
-     @cd ${WRKBUILD}; ${INSTALL_DATA} .libs/libntl.so.${LIBntl_VERSION} 
${PREFIX}/lib/libntl.so.${LIBntl_VERSION}
+     @cd ${WRKBUILD}; ${INSTALL_DATA} .libs/libntl.so.${LIBntl_VERSION} \
+             ${PREFIX}/lib/libntl.so.${LIBntl_VERSION}
         @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/NTL
         @cd ${WRKSRC}/doc; ${INSTALL_DATA} * ${PREFIX}/share/doc/NTL
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/ntl/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo  30 Aug 2016 06:52:57 -0000      1.32
+++ distinfo  4 Feb 2020 13:50:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (ntl-9.11.0.tar.gz) = N5kBcJ5qv+qhykH8NuCnRmBMxggjfGYpBYUFv9jtnPE=
-SIZE (ntl-9.11.0.tar.gz) = 960952
+SHA256 (ntl-11.4.3.tar.gz) = t8HM3GSEDmokNR60oeaIh9KZdPAwc6GUHJBlYsC4OtI=
+SIZE (ntl-11.4.3.tar.gz) = 2274421
Index: patches/patch-src_DoConfig
===================================================================
RCS file: /cvs/ports/math/ntl/patches/patch-src_DoConfig,v
retrieving revision 1.9
diff -u -p -r1.9 patch-src_DoConfig
--- patches/patch-src_DoConfig        31 Jan 2016 09:03:50 -0000      1.9
+++ patches/patch-src_DoConfig        4 Feb 2020 13:50:29 -0000
@@ -1,22 +1,20 @@
-$OpenBSD: patch-src_DoConfig,v 1.9 2016/01/31 09:03:50 benoit Exp $
---- src/DoConfig.orig        Sat Jan 30 22:15:16 2016
-+++ src/DoConfig     Sun Jan 31 08:40:55 2016
-@@ -14,24 +14,26 @@
+$OpenBSD$
+
+Index: src/DoConfig
+--- src/DoConfig.orig
++++ src/DoConfig
+@@ -13,8 +13,8 @@ system("echo '*** CompilerOutput.log ***' > CompilerOu
    %MakeVal = (
   -'CXX'             => 'g++',
   -'CXXFLAGS'    => '-g -O2',
   +'CXX'             => '${CXX}',
-+'CXXFLAGS'    => '$(CFLAGS)',
++'CXXFLAGS'    => '${CFLAGS}',
    'CXXAUTOFLAGS'=> '',
+ 'NOCONTRACT'  => '',
    'AR'              => 'ar',
- 'ARFLAGS'     => 'ruv',
- 'RANLIB'      => 'ranlib',
--'LIBTOOL'     => 'libtool',
-+'LIBTOOL'     => '${LIBTOOL}',
- - 'LDFLAGS'     => '',
+@@ -28,12 +28,14 @@ system("echo '*** CompilerOutput.log ***' > CompilerOu
    'LDLIBS'      => '-lm',
    'CPPFLAGS'    => '',
Index: patches/patch-src_GF2EX_c
===================================================================
RCS file: patches/patch-src_GF2EX_c
diff -N patches/patch-src_GF2EX_c
--- patches/patch-src_GF2EX_c 15 Mar 2014 09:13:13 -0000      1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_GF2EX_c,v 1.3 2014/03/15 09:13:13 benoit Exp $
---- src/GF2EX.c.orig Fri Feb 15 15:44:26 2013
-+++ src/GF2EX.c      Tue Feb 19 10:26:58 2013
-@@ -6,6 +6,8 @@
- - #include <NTL/new.h>
- -+#include <cstdio>
-+
- NTL_START_IMPL
- - Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/ntl/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 7 Jun 2016 13:35:28 -0000       1.16
+++ pkg/PLIST 4 Feb 2020 13:50:29 -0000
@@ -1,7 +1,10 @@
   @comment $OpenBSD: PLIST,v 1.16 2016/06/07 13:35:28 benoit Exp $
   include/NTL/
+include/NTL/ALL_FEATURES.h
   include/NTL/BasicThreadPool.h
+include/NTL/ConfigLog.h
   include/NTL/FFT.h
+include/NTL/FFT_impl.h
   include/NTL/FacVec.h
   include/NTL/GF2.h
   include/NTL/GF2E.h
@@ -10,35 +13,45 @@ include/NTL/GF2EXFactoring.h
   include/NTL/GF2X.h
   include/NTL/GF2XFactoring.h
   include/NTL/GF2XVec.h
+include/NTL/HAVE_ALIGNED_ARRAY.h
   include/NTL/HAVE_AVX.h
+include/NTL/HAVE_AVX2.h
+include/NTL/HAVE_AVX512F.h
   include/NTL/HAVE_BUILTIN_CLZL.h
+include/NTL/HAVE_CHRONO_TIME.h
+include/NTL/HAVE_COPY_TRAITS1.h
+include/NTL/HAVE_COPY_TRAITS2.h
   include/NTL/HAVE_FMA.h
   include/NTL/HAVE_LL_TYPE.h
+include/NTL/HAVE_MACOS_TIME.h
+include/NTL/HAVE_PCLMUL.h
+include/NTL/HAVE_POSIX_TIME.h
+include/NTL/HAVE_SSSE3.h
   include/NTL/HNF.h
   include/NTL/LLL.h
   include/NTL/Lazy.h
   include/NTL/LazyTable.h
+include/NTL/MatPrime.h
+include/NTL/PD.h
+include/NTL/PackageInfo.h
+include/NTL/REPORT_ALL_FEATURES.h
   include/NTL/RR.h
-include/NTL/SPMM_ASM.h
   include/NTL/SmartPtr.h
   include/NTL/WordVector.h
   include/NTL/ZZ.h
   include/NTL/ZZVec.h
   include/NTL/ZZX.h
   include/NTL/ZZXFactoring.h
+include/NTL/ZZ_limbs.h
   include/NTL/ZZ_p.h
   include/NTL/ZZ_pE.h
   include/NTL/ZZ_pEX.h
   include/NTL/ZZ_pEXFactoring.h
   include/NTL/ZZ_pX.h
   include/NTL/ZZ_pXFactoring.h
-include/NTL/c_lip.h
   include/NTL/config.h
-include/NTL/config_log.h
   include/NTL/ctools.h
-include/NTL/def_config.h
   include/NTL/fileio.h
-include/NTL/g_lip.h
   include/NTL/gmp_aux.h
   include/NTL/lip.h
   include/NTL/lzz_p.h
@@ -69,6 +82,7 @@ include/NTL/pair_ZZ_pEX_long.h
   include/NTL/pair_ZZ_pX_long.h
   include/NTL/pair_lzz_pEX_long.h
   include/NTL/pair_lzz_pX_long.h
+include/NTL/pd_FFT.h
   include/NTL/quad_float.h
   include/NTL/sp_arith.h
   include/NTL/thread.h
@@ -100,9 +114,8 @@ include/NTL/vec_vec_ulong.h
   include/NTL/vec_xdouble.h
   include/NTL/vector.h
   include/NTL/version.h
-include/NTL/wizard_log.h
   include/NTL/xdouble.h
-lib/libntl.a
+@static-lib lib/libntl.a
   @lib lib/libntl.so.${LIBntl_VERSION}
   share/doc/NTL/
   share/doc/NTL/BasicThreadPool.cpp.html
@@ -133,6 +146,7 @@ share/doc/NTL/RR.cpp.html
   share/doc/NTL/RR.txt
   share/doc/NTL/SmartPtr.cpp.html
   share/doc/NTL/SmartPtr.txt
+share/doc/NTL/TFT-time.jpg
   share/doc/NTL/ZZ.cpp.html
   share/doc/NTL/ZZ.txt
   share/doc/NTL/ZZVec.cpp.html
@@ -141,6 +155,8 @@ share/doc/NTL/ZZX.cpp.html
   share/doc/NTL/ZZX.txt
   share/doc/NTL/ZZXFactoring.cpp.html
   share/doc/NTL/ZZXFactoring.txt
+share/doc/NTL/ZZ_limbs.cpp.html
+share/doc/NTL/ZZ_limbs.txt
   share/doc/NTL/ZZ_p.cpp.html
   share/doc/NTL/ZZ_p.txt
   share/doc/NTL/ZZ_pE.cpp.html
@@ -160,6 +176,7 @@ share/doc/NTL/config.txt
   share/doc/NTL/conversions.txt
   share/doc/NTL/copying.txt
   share/doc/NTL/flags.txt
+share/doc/NTL/flintrat.jpg
   share/doc/NTL/lzz_p.cpp.html
   share/doc/NTL/lzz_p.txt
   share/doc/NTL/lzz_pE.cpp.html
@@ -248,3 +265,4 @@ share/doc/NTL/version.cpp.html
   share/doc/NTL/version.txt
   share/doc/NTL/xdouble.cpp.html
   share/doc/NTL/xdouble.txt
+share/doc/NTL/zmulrat.jpg


Reply via email to