- Change Ocaml build dependency to a lighter lang/ocaml-nox11

- Change BDB dependency to (allegedly more reliable) db42
- Teach configure about amd64 machines

PR:		ports/74170
Submitted by:	Johan van Selst (maintainer)

5 files changed, 48 insertions, 5 deletions

diff --git a/security/sks/Makefile b/security/sks/Makefile
index 29333a4bf6f7..e783b31dd9de 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sks
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=sks
@@ -15,15 +16,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	johans@stack.nl
 COMMENT=	Synchronizing Key Server, a fast OpenPGP keyserver
 
-BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
-LIB_DEPENDS=	db41:${PORTSDIR}/databases/db41
+BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml-nox11
+LIB_DEPENDS=	db-4.2:${PORTSDIR}/databases/db42
 
 USE_GPG=	yes
 SIG_SUFFIX=	.sig
 USE_GMAKE=	yes
-MAKE_ENV=	BDBINCLUDE="-I${LOCALBASE}/include/db41" \
+MAKE_ENV=	BDBINCLUDE="-I${LOCALBASE}/include/db42" \
 		BDBLIB="-L${LOCALBASE}/lib" \
-		LIBDB="-ldb41" \
+		LIBDB="-ldb-4.2" \
 		MANDIR="${MANPREFIX}/man"
 ALL_TARGET=	all sks.8
 USE_PERL5_BUILD=	yes
diff --git a/security/sks/files/patch-bdb_bdb_stubs.c b/security/sks/files/patch-bdb_bdb_stubs.c
new file mode 100644
index 000000000000..af92cf2c40ab
--- /dev/null
+++ b/security/sks/files/patch-bdb_bdb_stubs.c
@@ -0,0 +1,11 @@
+--- bdb/bdb_stubs.c.orig	Thu Oct 21 04:56:02 2004
++++ bdb/bdb_stubs.c	Sat Nov 20 16:33:08 2004
+@@ -223,7 +223,7 @@
+ 
+ // Declaration of flag enums in ocaml must be in same order as in C
+ 
+-static int dbenv_create_flags[] = { DB_CLIENT };
++static int dbenv_create_flags[] = { DB_RPCCLIENT };
+ 
+ //+
+ //+   type create_flag = CLIENT
diff --git a/security/sks/files/patch-number.ml b/security/sks/files/patch-number.ml
new file mode 100644
index 000000000000..4026848573c3
--- /dev/null
+++ b/security/sks/files/patch-number.ml
@@ -0,0 +1,11 @@
+--- number.ml	Thu Oct 21 04:56:03 2004
++++ number.ml	Thu Nov 25 00:25:35 2004
+@@ -18,7 +18,7 @@
+ (** Basic operations and definitions for multi-precistion integers. *)
+
+ (* Change to Dlong for non x86 platforms *)
+-module Nx = Numerix.Slong
++module Nx = Numerix.Clong
+
+ let two = Nx.of_int 2
+ let one = Nx.of_int 1
diff --git a/security/sks/files/sks.numerix.patch b/security/sks/files/sks.numerix.patch
index a511404274ae..6ffd2ab314f5 100644
--- a/security/sks/files/sks.numerix.patch
+++ b/security/sks/files/sks.numerix.patch
@@ -8,6 +8,26 @@
    echo "$as_me:$LINENO: result: $ocaml_version" >&5
  echo "${ECHO_T}$ocaml_version" >&6
    echo "$as_me:$LINENO: checking for Ocaml directory" >&5
+--- numerix-0.19/config/config.sub	Thu Nov 25 00:33:31 2004
++++ numerix-0.19/config/config.sub	Thu Nov 25 00:35:01 2004
+@@ -155,7 +155,7 @@
+  		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+ 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+ 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+-		| mipstx39 | mipstx39el \
++		| mipstx39 | mipstx39el | amd64 \
+ 		| sparc | sparclet | sparclite | sparc64 | v850)
+ 		basic_machine=$basic_machine-unknown
+                ;;
+@@ -181,7 +181,7 @@
+ 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ 	      | sparc64-* | mips64-* | mipsel-* \
+ 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+-	      | mipstx39-* | mipstx39el-* \
++	      | mipstx39-* | mipstx39el-* | amd64-* \
+ 	      | f301-*)
+ 	        ;;
+ 	# Recognize the various machine names and aliases which stand
 --- numerix-0.19/lib/kernel/string.c	Sat Oct 16 15:47:19 2004
 +++ numerix-0.19/lib/kernel/string.c	Sat Oct 16 15:14:17 2004
 @@ -38,7 +38,7 @@
diff --git a/security/sks/pkg-descr b/security/sks/pkg-descr
index 639f99cc66ca..220d4ceeb7b6 100644
--- a/security/sks/pkg-descr
+++ b/security/sks/pkg-descr
@@ -7,7 +7,7 @@ servers; and even wildly out-of-date servers, or servers that experience
 spotty connectivity, can fully synchronize with rest of the system.
 
 Refer to the online wiki for pointers on downloading a full copy of the
-public PGP databse (about 4Gb) and on customising the local configuration
+public PGP databse (about 2Gb) and on customising the local configuration
 http://documentation.penguin.de/cgi-bin/twiki/view/SKSKeyserver/WebHome
 
 WWW:	http://www.nongnu.org/sks/