4 files changed, 71 insertions, 18 deletions

diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index cd203c67172f..278f3a44509a 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	racoon2
 PORTVERSION=	20051102a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net ipv6
 MASTER_SITES=	ftp://ftp.kame.net/pub/racoon2/
 EXTRACT_SUFX=	.tgz
@@ -15,33 +15,51 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 
-.if !exists(/usr/lib/libkrb5.a)
-BROKEN=		"Kerberos5 is required in the system"
-.endif
-
 USE_RC_SUBR=	YES
 USE_OPENSSL=	YES
 
 USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_TARGET=
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
-USE_REINPLACE=	yes
+CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc
+
+OPTIONS=	KINK "enable KINK support" off
+
+.include <bsd.port.pre.mk>
+
+pre-configure:
+.if defined (WITH_KINK)
+.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
+MAN8+=		kinkd.8
+PLIST_SUB+=	KINK=""
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-kinkd
+PLIST_SUB+=	KINK="@comment "
+.endif
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	INSTALL USAGE USAGE.iked USAGE.kinkd USAGE.spmd
-PORTDOCS+=	config-usage.ja.txt config-usage.txt
-PORTDOCS+=	iked-memo.ja.txt kinkd-data-struct.obj kinkd-impl.ja.txt
-PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj libracoon.ja.txt
+PORTDOCS+=	INSTALL USAGE USAGE.iked USAGE.spmd config-usage.ja.txt
+PORTDOCS+=	config-usage.txt iked-memo.ja.txt libracoon.ja.txt
 PORTDOCS+=	specification.ja.txt spmif.txt style.txt system-message.ja.txt
+.if defined (WITH_KINK)
+PORTDOCS+=	USAGE.kinkd kinkd-data-struct.obj kinkd-impl.ja.txt
+PORTDOCS+=	kinkd-install.ja.txt kinkd-state-txn.obj
+.endif
 .endif
 
-MAN8=		spmd.8 spmdctl.8 kinkd.8 pskgen.8
+MAN8+=		spmd.8 spmdctl.8 pskgen.8
 
 post-patch:
 .if !defined(NOPORTDOCS)
 .for FILE in ${PORTDOCS}
-	${REINPLACE_CMD} -e 's|/usr/local/racoon2|${LOCALBASE}|' ${WRKSRC}/doc/${FILE}
+	@${REINPLACE_CMD} -e 's|/usr/local/racoon2|${LOCALBASE}|' ${WRKSRC}/doc/${FILE}
 .endfor
 .endif
 
@@ -60,4 +78,4 @@ post-install:
 	    ${ECHO_MSG} "         You must build the kernel if you want to run racoon on the host"; \
 	fi ;
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/racoon2/files/patch-rcvar b/security/racoon2/files/patch-rcvar
new file mode 100644
index 000000000000..d736146fbfc6
--- /dev/null
+++ b/security/racoon2/files/patch-rcvar
@@ -0,0 +1,33 @@
+--- samples/rc.d-iked.in.orig	Tue Feb  7 02:19:19 2006
++++ samples/rc.d-iked.in	Tue Feb  7 02:19:19 2006
+@@ -14,7 +14,7 @@
+ exec_prefix=@exec_prefix@
+ 
+ name="iked"
+-rcvar=$name
++rcvar=`set_rcvar`
+ command="@sbindir@/${name}"
+ extra_commands="reload"
+ required_vars="spmd"
+--- samples/rc.d-kinkd.in.orig	Tue Feb  7 02:19:19 2006
++++ samples/rc.d-kinkd.in	Tue Feb  7 02:19:19 2006
+@@ -14,7 +14,7 @@
+ exec_prefix=@exec_prefix@
+ 
+ name="kinkd"
+-rcvar=$name
++rcvar=`set_rcvar`
+ command="@sbindir@/${name}"
+ extra_commands="reload"
+ required_vars="spmd"
+--- samples/rc.d-spmd.in.orig	Tue Feb  7 02:19:19 2006
++++ samples/rc.d-spmd.in	Tue Feb  7 02:19:19 2006
+@@ -13,7 +13,7 @@
+ exec_prefix=@exec_prefix@
+ 
+ name="spmd"
+-rcvar=$name
++rcvar=`set_rcvar`
+ command="@sbindir@/${name}"
+ extra_commands="reload"
+ pidfile="/var/run/${name}.pid"
diff --git a/security/racoon2/files/patch-samples-Makefile.in b/security/racoon2/files/patch-samples-Makefile.in
index ab9705f9d7f5..a37b5efc1673 100644
--- a/security/racoon2/files/patch-samples-Makefile.in
+++ b/security/racoon2/files/patch-samples-Makefile.in
@@ -1,6 +1,6 @@
 --- samples/Makefile.in.orig	Fri Oct 28 12:49:37 2005
-+++ samples/Makefile.in	Tue Nov  1 21:48:15 2005
-@@ -17,10 +17,10 @@
++++ samples/Makefile.in	Mon Feb 13 23:53:09 2006
+@@ -17,10 +17,12 @@
  
  install-startup-rc-d:
  	$(INSTALL) -d $(sysconfdir)/rc.d
@@ -9,7 +9,9 @@
 -	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd
 -	$(INSTALL) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2
 +	$(INSTALL) rc.d-iked $(sysconfdir)/rc.d/iked.sh
++.if defined (WITH_KINK)
 +	$(INSTALL) rc.d-kinkd $(sysconfdir)/rc.d/kinkd.sh
++.endif
 +	$(INSTALL) rc.d-spmd $(sysconfdir)/rc.d/spmd.sh
 +	$(INSTALL) rc.d-racoon2 $(sysconfdir)/rc.d/racoon2.sh
  
diff --git a/security/racoon2/pkg-plist b/security/racoon2/pkg-plist
index 3526106534cc..24970c76f5aa 100644
--- a/security/racoon2/pkg-plist
+++ b/security/racoon2/pkg-plist
@@ -1,12 +1,12 @@
 sbin/iked
-sbin/kinkd
+%%KINK%%sbin/kinkd
 sbin/spmd
 sbin/spmdctl
 sbin/pskgen
 etc/racoon2.conf.sample
 etc/rc.d/iked.sh
 etc/rc.d/spmd.sh
-etc/rc.d/kinkd.sh
+%%KINK%%etc/rc.d/kinkd.sh
 etc/rc.d/racoon2.sh
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.jp