6 files changed, 45 insertions, 138 deletions

diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 130a6356e518..dee938e2fb05 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	racoon2
-PORTVERSION=	20050128b
+PORTVERSION=	20050625b
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.kame.net/pub/racoon2/
 EXTRACT_SUFX=	.tgz
@@ -32,18 +32,10 @@ PORTDOCS=	INSTALL USAGE.iked USAGE.kinkd USAGE.spmd config-usage.ja.txt
 PORTDOCS+=	draft-ietf-ipsec-ikev2-17.txt draft-ietf-kink-kink-06.txt
 PORTDOCS+=	iked-memo.ja.txt kink-spec-supplement.ja.txt
 PORTDOCS+=	kinkd-data-struct.obj kinkd-impl.ja.txt kinkd-install.ja.txt
-PORTDOCS+=	kinkd-state-txn.obj libracoon.ja.txt specification.ja.txt
-PORTDOCS+=	spmif.txt system-message.ja.txt
+PORTDOCS+=	kinkd-state-txn.obj libracoon.ja.txt racoon2.conf.ikev2
+PORTDOCS+=	racoon2.conf.kink specification.ja.txt spmif.txt system-message.ja.txt
 .endif
 
-pre-patch:
-	(cd ${WRKSRC}/samples ;\
-	${MV} racoon2.conf racoon2.conf.in ;\
-	${MV} init.d-kinkd init.d-kinkd.in ;\
-	${MV} init.d-spmd init.d-spmd.in ;\
-	${MV} rc.d-kinkd rc.d-kinkd.in ;\
-	${MV} rc.d-spmd rc.d-spmd.in )
-
 post-patch:
 .if !defined(NOPORTDOCS)
 .for FILE in ${PORTDOCS}
@@ -57,7 +49,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.iked ${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
 .endfor
diff --git a/security/racoon2/distinfo b/security/racoon2/distinfo
index 4e5615141c2d..9113f194cc69 100644
--- a/security/racoon2/distinfo
+++ b/security/racoon2/distinfo
@@ -1,2 +1,2 @@
-MD5 (racoon2-20050128b.tgz) = 9c2f6365926485d47d85388a9e586cb6
-SIZE (racoon2-20050128b.tgz) = 503119
+MD5 (racoon2-20050625b.tgz) = 8ece7e9e2f2d908d7393ab557b9b76e6
+SIZE (racoon2-20050625b.tgz) = 750996
diff --git a/security/racoon2/files/patch-configure b/security/racoon2/files/patch-configure
deleted file mode 100644
index 08d42370722a..000000000000
--- a/security/racoon2/files/patch-configure
+++ /dev/null
@@ -1,122 +0,0 @@
---- configure.in.orig	Thu Jan 27 00:35:13 2005
-+++ configure.in	Tue Feb  1 17:51:25 2005
-@@ -43,7 +43,7 @@
- 	dnl support before 1.5.
- 	boot_mech_target=install-rc-d
- 	;;
--freebsd[5-9].*)
-+freebsd*)
- 	boot_mech_target=install-rc-d
- 	;;
- *)
-@@ -51,4 +51,5 @@
- 	;;
- esac
- 
--AC_OUTPUT([Makefile samples/Makefile])
-+AC_OUTPUT([Makefile samples/Makefile samples/racoon2.conf])
-+AC_OUTPUT([samples/init.d-kinkd samples/init.d-spmd samples/rc.d-kinkd samples/rc.d-spmd])
-diff -ur samples-/init.d-kinkd.in samples/init.d-kinkd.in
---- samples-/init.d-kinkd.in	Tue Feb  1 17:18:58 2005
-+++ samples/init.d-kinkd.in	Tue Feb  1 17:18:01 2005
-@@ -3,8 +3,11 @@
- # kinkd start up script
- #
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- NAME=kinkd
--DAEMON=/usr/local/racoon2/sbin/$NAME
-+DAEMON=@sbindir@/$NAME
- PIDFILE=/var/run/$NAME.pid
- 
- test -x $DAEMON || exit 0
-diff -ur samples-/init.d-spmd.in samples/init.d-spmd.in
---- samples-/init.d-spmd.in	Tue Feb  1 17:18:58 2005
-+++ samples/init.d-spmd.in	Tue Feb  1 17:18:01 2005
-@@ -1,7 +1,10 @@
- #! /bin/sh
- 
--PATH=/usr/local/racoon2/sbin:/usr/local/racoon2/bin:$PATH
--DAEMON=/usr/local/racoon2/sbin/spmd
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
-+PATH=@sbindir@:@bindir@:$PATH
-+DAEMON=@sbindir@/spmd
- DAEMON_OPT=""
- NAME="spmd"
- 
-diff -ur samples-/rc.d-kinkd.in samples/rc.d-kinkd.in
---- samples/Makefile.in.orig	Wed Jan 26 07:43:52 2005
-+++ samples/Makefile.in	Tue Feb  1 17:54:30 2005
-@@ -17,8 +17,8 @@
- 
- install-rc-d:
- 	$(INSTALL) -d $(sysconfdir)/rc.d
--	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
--	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd
-+	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
-+	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
- 
- install-init-d:
- 	$(INSTALL) -d $(sysconfdir)/init.d
-@@ -32,4 +32,4 @@
- 	-rm -f *~
- 
- distclean: clean
--	-rm -f Makefile
-+	-rm -f Makefile racoon2.conf init.d-kinkd init.d-spmd rc.d-kinkd rc.d-spmd
---- samples/rc.d-spmd.in.orig	Wed Jan 26 07:43:52 2005
-+++ samples/rc.d-spmd.in	Tue Feb  1 18:31:31 2005
-@@ -3,6 +3,9 @@
- # spmd rc.d script for NetBSD
- #
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- # PROVIDE: spmd
- # REQUIRE: isdnd ppp
- # BEFORE:  SERVERS
-@@ -10,10 +13,10 @@
- . /etc/rc.subr
- 
- name="spmd"
--rcvar=$name
--command="/usr/local/racoon2/sbin/${name}"
-+rcvar=`set_rcvar`
-+command="@sbindir@/${name}"
- pidfile="/var/run/${name}.pid"
--required_files="/usr/local/racoon2/etc/racoon2.conf"
-+required_files="@sysconfdir@/racoon2.conf"
- start_precmd="spmd_precmd"
- 
- spmd_precmd()
---- samples/rc.d-kinkd.in.orig	Tue Jan 11 02:00:29 2005
-+++ samples/rc.d-kinkd.in	Tue Feb  1 18:31:49 2005
-@@ -3,6 +3,9 @@
- # kinkd rc.d script for NetBSD
- #
- 
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+
- # PROVIDE: kink
- # REQUIRE: isdnd kdc ppp
- # BEFORE:  SERVERS
-@@ -11,10 +14,10 @@
- . /etc/rc.subr
- 
- name="kinkd"
--rcvar=$name
--command="/usr/local/racoon2/sbin/${name}"
-+rcvar=`set_rcvar`
-+command="@sbindir@/${name}"
- pidfile="/var/run/${name}.pid"
--required_files="/usr/local/racoon2/etc/racoon2.conf"
-+required_files="@sysconfdir@/racoon2.conf"
- 
- load_rc_config $name
- run_rc_command "$1"
diff --git a/security/racoon2/files/patch-pskgen-Makefile.in b/security/racoon2/files/patch-pskgen-Makefile.in
new file mode 100644
index 000000000000..9dfb047d3234
--- /dev/null
+++ b/security/racoon2/files/patch-pskgen-Makefile.in
@@ -0,0 +1,21 @@
+--- pskgen/Makefile.in-	Tue Jul  5 01:19:59 2005
++++ pskgen/Makefile.in	Tue Jul  5 01:23:07 2005
+@@ -7,8 +7,7 @@
+ sysconfdir=@sysconfdir@
+ 
+ INSTALL =@INSTALL@
+-INSTALL_PROG=@INSTALL_PROGRAM@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_SCRIPT=@INSTALL_SCRIPT@
+ 
+ PROG=pskgen
+ 
+@@ -16,7 +15,7 @@
+ 
+ install: all
+ 	$(INSTALL) -d $(sbindir)
+-	$(INSTALL_PROG) -m 555 $(PROG) $(sbindir)
++	$(INSTALL_SCRIPT) -m 555 $(PROG) $(sbindir)
+ 
+ depend:
+ 
diff --git a/security/racoon2/files/patch-samples-Makefile.in b/security/racoon2/files/patch-samples-Makefile.in
new file mode 100644
index 000000000000..2b2f2e9ee175
--- /dev/null
+++ b/security/racoon2/files/patch-samples-Makefile.in
@@ -0,0 +1,15 @@
+--- samples/Makefile.in-	Tue Jul  5 01:33:44 2005
++++ samples/Makefile.in	Tue Jul  5 01:33:57 2005
+@@ -17,9 +17,9 @@
+ 
+ install-startup-rc-d:
+ 	$(INSTALL) -d $(sysconfdir)/rc.d
+-	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked
+-	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd
+-	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd
++	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked.sh
++	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
++	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
+ 
+ install-startup-init-d:
+ 	$(INSTALL) -d $(sysconfdir)/init.d
diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist
index 1eb5c981d552..00089829feb0 100644
--- a/security/racoon2/pkg-plist
+++ b/security/racoon2/pkg-plist
@@ -1,9 +1,11 @@
-sbin/spmd
+sbin/iked
 sbin/kinkd
+sbin/spmd
+sbin/pskgen
 etc/racoon2.conf.sample
+etc/rc.d/iked.sh
 etc/rc.d/spmd.sh
 etc/rc.d/kinkd.sh
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.iked