Pass ${LIBTOOL} to src/DoConfig so that it correctly uses ports libtool.

Regen patches and switch to newer LIB_DEPENDS while here.
This commit is contained in:
landry 2010-10-24 09:38:10 +00:00
parent 002897f053
commit 00697f6d21
6 changed files with 32 additions and 26 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2009/09/08 12:29:15 benoit Exp $
# $OpenBSD: Makefile,v 1.15 2010/10/24 09:38:10 landry Exp $
COMMENT = Victor Shoup's Number Theory Library
DISTNAME = ntl-5.5.2
REVISION = 0
SHARED_LIBS = ntl 0.0 # .0.1
CATEGORIES = math
@ -16,11 +17,11 @@ PERMIT_PACKAGE_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
WANTLIB = m
WANTLIB = m gmp
MASTER_SITES = ${HOMEPAGE}
LIB_DEPENDS = gmp.>=7::devel/gmp
LIB_DEPENDS = ::devel/gmp
MAKE_FILE = makefile

View File

@ -1,6 +1,6 @@
--- src/DoConfig.orig Tue May 5 08:46:39 2009
+++ src/DoConfig Thu May 21 21:46:51 2009
@@ -12,9 +12,9 @@
--- src/DoConfig.orig Fri Aug 14 14:53:11 2009
+++ src/DoConfig Sun Oct 24 11:03:33 2010
@@ -12,14 +12,14 @@
%MakeVal = (
@ -13,6 +13,12 @@
'CXXFLAGS' => '$(CFLAGS)',
'AR' => 'ar',
'ARFLAGS' => 'ruv',
'RANLIB' => 'ranlib',
-'LIBTOOL' => 'libtool',
+'LIBTOOL' => '${LIBTOOL}',
'LDFLAGS' => '',
'LDFLAGS_CXX' => '$(LDFLAGS)',
@@ -27,12 +27,14 @@
'LDLIBS_CXX' => '$(LDLIBS)',
'CPPFLAGS' => '',

View File

@ -1,5 +1,6 @@
--- src/VERSION_INFO~ Tue May 5 08:46:39 2009
+++ src/VERSION_INFO Fri May 22 09:58:36 2009
$OpenBSD: patch-src_VERSION_INFO,v 1.2 2010/10/24 09:38:10 landry Exp $
--- src/VERSION_INFO.orig Fri Aug 14 14:53:12 2009
+++ src/VERSION_INFO Sun Oct 24 10:56:43 2010
@@ -1 +1 @@
-0:1:0
-1:0:1
+0:0:0

View File

@ -1,8 +1,8 @@
--- src/WordVector.c.orig Sat Mar 14 18:36:31 2009
+++ src/WordVector.c Sat Mar 14 18:36:53 2009
@@ -3,6 +3,8 @@
--- src/WordVector.c.orig Fri Aug 14 14:53:10 2009
+++ src/WordVector.c Sun Oct 24 10:56:43 2010
@@ -4,6 +4,8 @@
#include <NTL/new.h>
#include <stdio.h>
+#include <cstdio>
+

View File

@ -1,18 +1,16 @@
--- src/tools.c.orig Sat Mar 14 18:37:45 2009
+++ src/tools.c Sat Mar 14 18:37:57 2009
@@ -5,6 +5,8 @@
--- src/tools.c.orig Fri Aug 14 14:53:11 2009
+++ src/tools.c Sun Oct 24 10:56:43 2010
@@ -13,13 +13,42 @@ void _ntl_abort_cxx_callback(void)
}
#include <NTL/new.h>
+#include <cstdio>
+
NTL_START_IMPL
void (*ErrorCallback)() = 0;
@@ -8,8 +8,35 @@
NTL_START_IMPL
+/*
+ The following code differs from vanilla NTL 5.4.2.
+
@ -43,5 +41,5 @@
+ ErrorCallbackFunction(s, ErrorCallbackContext);
+
cerr << s << "\n";
abort();
_ntl_abort();
}

View File

@ -1,8 +1,8 @@
--- src/vec_GF2.c.orig Sat Mar 14 18:38:29 2009
+++ src/vec_GF2.c Sat Mar 14 18:38:42 2009
@@ -3,6 +3,8 @@
--- src/vec_GF2.c.orig Fri Aug 14 14:53:11 2009
+++ src/vec_GF2.c Sun Oct 24 10:56:44 2010
@@ -4,6 +4,8 @@
#include <NTL/new.h>
#include <stdio.h>
+#include <cstdio>
+