head	1.2;
access;
symbols
	RELEASE_8_3_0:1.2
	RELEASE_9_0_0:1.2
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	PRE_XORG_7:1.2
	RELEASE_4_EOL:1.2
	RELEASE_6_2_0:1.2
	RELEASE_6_1_0:1.2
	RELEASE_5_5_0:1.2
	RELEASE_6_0_0:1.2
	RELEASE_5_4_0:1.2
	RELEASE_4_11_0:1.2
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2004.12.14.11.49.45;	author simon;	state Exp;
branches;
next	1.1;

1.1
date	2003.10.17.12.41.12;	author edwin;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to a new snapshot from the OpenBSD 2.6 branch dated 20041207
  which, among many other things, fixes the know security
  vulnerabilities.
- Remove some notes about tracking NetBSD, since the port does not do
  that anymore.
- Remove out-of-date information from pkg-descr.
- Take maintainership.

Approved by:	nectar
@
text
@--- Makefile.orig	Tue Dec  7 21:06:56 2004
+++ Makefile	Mon Dec 13 12:06:21 2004
@@@@ -38,9 +38,9 @@@@
 
 # openbsd means OpenBSD 2.5 or newer. freeswan is the name for Linux with
 # FreeS/WAN integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec.
-OS=		openbsd
+#OS=		openbsd
 #OS=		netbsd
-#OS=		freebsd
+OS=		freebsd
 #OS=		freeswan
 #OS=		bsdi
 
@@@@ -133,9 +133,9 @@@@
 
 .ifdef USE_KEYNOTE
 USE_LIBCRYPTO=	yes
-USE_LIBDES=	yes
 LDADD+=		-lkeynote -lm
 DPADD+=		${LIBKEYNOTE} ${LIBM}
+POLICY=         policy.c
 CFLAGS+=	-DUSE_KEYNOTE
 .endif
 
@@@@ -181,7 +181,6 @@@@
 ${PROG} beforedepend: ${GENERATED}
 
 .include <bsd.prog.mk>
-.include <bsd.subdir.mk>
 
 debug:
 	(cd ${.CURDIR}; ${MAKE} DEBUG="-g -Werror")
@


1.1
log
@Upgrade to the latests isakmpd version.
@
text
@d1 2
a2 2
--- Makefile.orig	Fri Aug 29 00:43:35 2003
+++ Makefile	Thu Oct 16 18:54:23 2003
d15 5
a19 2
@@@@ -157,6 +157,7 @@@@
 USE_LIBDES=	yes
d26 1
a26 1
@@@@ -202,4 +203,3 @@@@
d31 3
@

