Update to 20020104

PR:		33741
Submitted by:	Anders Andersson <anders@hack.org>
Obtained from:	NetBSD

7 files changed, 10 insertions, 42 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 63ad10b413ee..c8e2dcd778db 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -9,7 +9,7 @@
 #
 
 PORTNAME=	isakmpd
-PORTVERSION= 	20010403
+PORTVERSION= 	20020104
 CATEGORIES=	security net
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 MASTER_SITE_SUBDIR=	LOCAL_PORTS
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index 6e68df333aa5..2e482929f56c 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1 +1 @@
-MD5 (isakmpd-20010403.tar.gz) = 9813cb6735983eb00908616bb63a654c
+MD5 (isakmpd-20020104.tar.gz) = 80ade017ae4e95498416923872e0a233
diff --git a/security/isakmpd/files/patch-aa b/security/isakmpd/files/patch-aa
index 6685a63fa3d0..c94efc2bced5 100644
--- a/security/isakmpd/files/patch-aa
+++ b/security/isakmpd/files/patch-aa
@@ -1,12 +1,11 @@
---- Makefile.orig	Fri May 11 17:38:14 2001
-+++ Makefile	Fri May 11 17:38:33 2001
-@@ -44,10 +44,10 @@
- # 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.
+--- Makefile.orig	Sun Aug 26 00:22:26 2001
++++ Makefile	Wed Jan  9 22:06:58 2002
+@@ -43,9 +43,9 @@
+ 
+ # openbsd means OpenBSD 2.5 or newer. 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=		freebsd
 +OS=		freebsd
diff --git a/security/isakmpd/files/patch-ab b/security/isakmpd/files/patch-ab
index e63051e2e7b9..516941d79013 100644
--- a/security/isakmpd/files/patch-ab
+++ b/security/isakmpd/files/patch-ab
@@ -1,5 +1,5 @@
---- samples/Makefile.orig	Fri May 11 17:40:05 2001
-+++ samples/Makefile	Fri May 11 17:40:30 2001
+--- samples/Makefile.orig	Tue May  2 16:33:55 2000
++++ samples/Makefile	Wed Jan  9 22:08:47 2002
 @@ -31,7 +31,7 @@
  #
  
diff --git a/security/isakmpd/files/patch-ac b/security/isakmpd/files/patch-ac
deleted file mode 100644
index 55d66822a832..000000000000
--- a/security/isakmpd/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/certpatch/Makefile.orig	Fri May 11 17:50:35 2001
-+++ apps/certpatch/Makefile	Fri May 11 17:51:04 2001
-@@ -37,7 +37,7 @@
- 
- PROG=		certpatch
- SRCS=		certpatch.c
--BINDIR=		/usr/sbin
-+BINDIR?=	/usr/sbin
- TOPSRC=		${.CURDIR}/../..
- TOPOBJ!=	cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
- OS!=		awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
diff --git a/security/isakmpd/files/patch-ba b/security/isakmpd/files/patch-ba
deleted file mode 100644
index f1b370296456..000000000000
--- a/security/isakmpd/files/patch-ba
+++ /dev/null
@@ -1,10 +0,0 @@
---- x509.c.orig	Fri May 11 18:13:32 2001
-+++ x509.c	Fri May 11 18:14:00 2001
-@@ -545,7 +545,6 @@
- 	      return 0;
- 	    }
- 
--	  free (x509_policy_asserts);
- 	  x509_policy_asserts = new_asserts;
- 	}
- 
diff --git a/security/isakmpd/files/patch-ca b/security/isakmpd/files/patch-ca
deleted file mode 100644
index 1b1ac59fa416..000000000000
--- a/security/isakmpd/files/patch-ca
+++ /dev/null
@@ -1,10 +0,0 @@
---- sysdep/freebsd/sysdep-os.h.orig	Fri May 11 19:17:49 2001
-+++ sysdep/freebsd/sysdep-os.h	Fri May 11 19:18:01 2001
-@@ -44,7 +44,6 @@
- /* We need in_addr_t, in_port_t & socklen_t.  */
- typedef u_int32_t in_addr_t;
- typedef u_int16_t in_port_t;
--typedef u_int32_t socklen_t;
- 
- #if 0
- /* OpenSSL differs from OpenBSD very slightly... */