Index: head/security/racoon2/Makefile
===================================================================
--- head/security/racoon2/Makefile	(revision 405759)
+++ head/security/racoon2/Makefile	(revision 405760)
@@ -1,82 +1,82 @@
 # Created by: sumikawa
 # $FreeBSD$
 
 PORTNAME=	racoon2
 PORTVERSION=	20100526a
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.racoon2.wide.ad.jp/pub/racoon2/
 
 MAINTAINER= 	cy@FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 
 USES=		perl5 tar:tgz
 USE_RC_SUBR=	YES
 USE_OPENSSL=	YES
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${STAGEDIR}${PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc/racoon2
 CONFIGURE_ENV=	YACC=/usr/bin/yacc
 
 OPTIONS_DEFINE=	KINK DOCS
 KINK_DESC=	Enable KINK support
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	PFX=${PREFIX}
 
 pre-configure:
 .if ${PORT_OPTIONS:MKINK}
 .if !exists(/usr/lib/libkrb5.a)
 	@${ECHO_MSG} 'Required Kerberos5 is not in this system.  Disable KINK support.'
 CONFIGURE_ARGS+=	--disable-kinkd
 PLIST_SUB+=	KINK="@comment "
 .else
 CONFIGURE_ARGS+=	--enable-kinkd
 MAKE_ENV=	WITH_KINK=yes
 PLIST_SUB+=	KINK=""
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-kinkd
 PLIST_SUB+=	KINK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS+=	INSTALL USAGE config-usage.ja.txt config-usage.txt
 PORTDOCS+=	iked-memo.ja.txt libracoon.ja.txt specification.ja.txt
 PORTDOCS+=	spmif.txt style.txt system-message.ja.txt
 .if ${PORT_OPTIONS:MKINK}
 PORTDOCS+=	kinkd-data-struct.obj kinkd-impl.ja.txt
 PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj
 .endif
 .endif
 
 post-patch-DOCS-on:
 .for FILE in ${PORTDOCS}
 	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${PREFIX}|' ${WRKSRC}/doc/${FILE}
 .endfor
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|'
 	@${REINPLACE_CMD} -e '/INSTALL/s|\$$(prefix)|${STAGEDIR}&|' ${WRKSRC}/pskgen/Makefile
 	@${REINPLACE_CMD} -e '/^prefix=/s|/usr/local|${STAGEDIR}${PREFIX}|;/\/var\/run\/racoon2/d' ${WRKSRC}/samples/Makefile
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/run/racoon2
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && echo ipsec` ]; then \
 	    ${ECHO_MSG} "WARNING: IPsec feature is disabled on this host"; \
 	    ${ECHO_MSG} "         You must build the kernel if you want to run racoon on the host"; \
 	fi ;
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.jp ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for FILE in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/security/racoon2/files/patch-samples-rc.d-iked.in
===================================================================
--- head/security/racoon2/files/patch-samples-rc.d-iked.in	(revision 405759)
+++ head/security/racoon2/files/patch-samples-rc.d-iked.in	(revision 405760)
@@ -1,15 +1,21 @@
---- samples/rc.d-iked.in.orig	2005-10-28 15:33:16.000000000 +0900
-+++ samples/rc.d-iked.in	2008-04-17 15:11:55.000000000 +0900
-@@ -14,10 +14,10 @@
+--- samples/rc.d-iked.in.orig	2005-10-28 06:33:16 UTC
++++ samples/rc.d-iked.in
+@@ -10,14 +10,16 @@
+ 
+ . /etc/rc.subr
+ 
++: ${iked_enable="NO"}
++
+ prefix=@prefix@
  exec_prefix=@exec_prefix@
  
  name="iked"
 -rcvar=$name
 +rcvar=iked_enable
  command="@sbindir@/${name}"
  extra_commands="reload"
 -required_vars="spmd"
 +required_vars="spmd_enable"
  pidfile="/var/run/${name}.pid"
  required_files="@sysconfdir@/racoon2.conf"
  reload_cmd="iked_reload"
Index: head/security/racoon2/files/patch-samples-rc.d-spmd.in
===================================================================
--- head/security/racoon2/files/patch-samples-rc.d-spmd.in	(revision 405759)
+++ head/security/racoon2/files/patch-samples-rc.d-spmd.in	(revision 405760)
@@ -1,11 +1,17 @@
---- samples/rc.d-spmd.in.orig	2007-07-11 09:59:30.000000000 +0900
-+++ samples/rc.d-spmd.in	2008-04-17 15:11:55.000000000 +0900
-@@ -13,7 +13,7 @@
+--- samples/rc.d-spmd.in.orig	2007-07-11 00:59:30 UTC
++++ samples/rc.d-spmd.in
+@@ -9,11 +9,13 @@
+ 
+ . /etc/rc.subr
+ 
++: ${spmd_enable="NO"}
++
+ prefix=@prefix@
  exec_prefix=@exec_prefix@
  
  name="spmd"
 -rcvar=$name
 +rcvar=spmd_enable
  command="@sbindir@/${name}"
  extra_commands="reload"
  pidfile="/var/run/${name}.pid"