Update to 2000-09-15 snapshot, to let this build on NetBSD-1.5, and remove

BROKEN variable. Unfortunately, no ChangeLog is available.

Patch system dependent make goo to use 'SSLBASE', mirroring it's use in
bsd.pkg.mk, rather than obsolete 'PATENTEDOPENSSLSRC'. Also, replace hard-
coded "/usr/pkg", replacing it with ${LOCALBASE}. Finally, set 'LOCALBASE'
and 'SSLBASE' conditionally within the package, for convenience.

5 files changed, 77 insertions, 26 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 05cbda40fb1..9bef5a8d3b9 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,33 +1,22 @@
-# $NetBSD: Makefile,v 1.9 2000/09/09 19:40:21 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2000/09/25 04:00:15 fredb Exp $
 #
 
-DISTNAME=		isakmpd-000220
-PKGNAME=		isakmpd-20000220
+DISTNAME=		isakmpd-000915-snap
+PKGNAME=		isakmpd-20000915
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.appli.se/pub/isakmpd/
 
-PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES=		isakmpd-20000220-20000427a.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=		itojun@kame.net
 
-BROKEN=			"broken by PF_KEY API change"
-CRYPTO=			yes
+DEPENDS+=		gmp-*:../../devel/gmp
+
+USE_SSL=		yes
 
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
 IGNORE+=		"${PKGNAME} requires ipsec-ready NetBSD"
 .endif
 
-# if PATENTEDOPENSSLSRC is defined, then we assume that
-# RSA already exists in the OpenSSL built as part of the
-# base distribution.
-.if !defined(PATENTEDOPENSSLSRC)
-DEPENDS+=		openssl-0.9.*:../../security/openssl
-.endif
-DEPENDS+=		gmp-*:../../devel/gmp
-
 ALL_TARGET=		depend all
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/isakmpd/files/md5 b/security/isakmpd/files/md5
index bea0441da90..a428e3a6029 100644
--- a/security/isakmpd/files/md5
+++ b/security/isakmpd/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.2 2000/04/27 14:55:55 itojun Exp $
+$NetBSD: md5,v 1.3 2000/09/25 04:00:15 fredb Exp $
 
-MD5 (isakmpd-000220.tar.gz) = 1d5c6da522d0a607b35ed5cb5fc26c4e
-MD5 (isakmpd-20000220-20000427a.diff.gz) = 61a70f0a4daac408a0dcc7dfb65d202d
+MD5 (isakmpd-000915-snap.tar.gz) = ec7d6e283b5eb33fedf407ca01e9731f
diff --git a/security/isakmpd/files/patch-sum b/security/isakmpd/files/patch-sum
index 74411d59cf2..244bf3afaec 100644
--- a/security/isakmpd/files/patch-sum
+++ b/security/isakmpd/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 2000/03/27 16:04:13 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/25 04:00:15 fredb Exp $
 
-MD5 (patch-aa) = 66d717423938c8f22b8725920fdbc811
+MD5 (patch-aa) = d69c92e5aaf9d13b0eafd8acae235257
 MD5 (patch-ab) = b6039bd41bca32eb07e53571c95cec84
+MD5 (patch-ac) = a08a59413d867fccd20286c1e3853ac2
diff --git a/security/isakmpd/patches/patch-aa b/security/isakmpd/patches/patch-aa
index 8f80c7070dd..413c0dcc1dd 100644
--- a/security/isakmpd/patches/patch-aa
+++ b/security/isakmpd/patches/patch-aa
@@ -1,7 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2000/03/27 16:04:13 itojun Exp $
---- Makefile-	Tue Mar 28 00:30:18 2000
-+++ Makefile	Tue Mar 28 00:31:27 2000
-@@ -59,7 +59,8 @@
+$NetBSD: patch-aa,v 1.2 2000/09/25 04:00:15 fredb Exp $
+
+--- Makefile.orig	Tue Sep 12 10:34:40 2000
++++ Makefile	Sun Sep 24 10:58:25 2000
+@@ -43,9 +43,9 @@
+ # openbsd means 2.5 or newer, openbsd-encap is for older kernels with PF_ENCAP
+ # linux is the name for Linux with FreeS/WAN integrated, freebsd/netbsd means
+ # FreeBSD/NetBSD with KAME IPsec.
+-OS=		openbsd
++#OS=		openbsd
+ #OS=		openbsd-encap
+-#OS=		netbsd
++OS=		netbsd
+ #OS=		freebsd
+ #OS=		linux
+ 
+@@ -56,7 +56,8 @@
  .PATH:		${.CURDIR}/sysdep/${OS}
  
  PROG=		isakmpd
diff --git a/security/isakmpd/patches/patch-ac b/security/isakmpd/patches/patch-ac
new file mode 100644
index 00000000000..c82d18cab6d
--- /dev/null
+++ b/security/isakmpd/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2000/09/25 04:00:15 fredb Exp $
+
+--- sysdep/netbsd/Makefile.sysdep.orig	Mon Jun 19 22:27:43 2000
++++ sysdep/netbsd/Makefile.sysdep	Sun Sep 24 22:28:35 2000
+@@ -32,20 +32,28 @@
+ # Not yet
+ #FEATURES+=	policy x509
+ 
+-LIBGMP=		/usr/pkg/lib/libgmp.a
++# The following defaults are the NetBSD package system defaults
++LOCALBASE?=	/usr/pkg
++.if exists(/usr/include/openssl/ssl.h)
++SSLBASE?=	/usr
++.else
++SSLBASE?=	${LOCALBASE}
++.endif
++
++LIBGMP=		${LOCALBASE}/lib/libgmp.a
+ LIBCRYPTO=	/usr/lib/libcrypto.a
+ LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
+ 
+ LDADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a -lipsec
+ DPADD+=		${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC}
+ 
+-CFLAGS+=	-DNO_RSA -DNO_IDEA -DNO_RC5 \
+-		-I${.CURDIR}/sysdep/common
+-.if !defined(PATENTEDOPENSSLSRC)
+-CFLAGS+=	-I/usr/pkg/include -I/usr/pkg/include/openssl
+-LDADD+=		-L/usr/pkg/lib
++CFLAGS+=	-DNO_IDEA -DNO_RC5 \
++		-I${.CURDIR}/sysdep/common -I${LOCALBASE}/include
++.if ${SSLBASE} == "/usr"
++CFLAGS+=	-I${SSLBASE}/include/openssl
+ .else
+-CFLAGS+=	-I/usr/include -I/usr/include/openssl
++CFLAGS+=	-I${SSLBASE}/include -I${SSLBASE}/include/openssl
++LDFLAGS+=	-L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib
+ .endif
+ 
+ IPSEC_SRCS=	pf_key_v2.c
+@@ -73,8 +81,3 @@
+ 
+ beforedepend:
+ 	rm -f ssl
+-.if !defined(PATENTEDOPENSSLSRC)
+-	ln -sf /usr/pkg/include/openssl ssl
+-.else
+-	ln -sf /usr/include/openssl ssl
+-.endif