- Switch to options helpers

- Drop 8.x support

Approved by:	portmgr blanket

2 files changed, 29 insertions, 177 deletions

diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 21604ea0bd7d..781eb36c79af 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -55,113 +55,30 @@ WCPSKEY_DESC=	Allow wildcard matching for pre-shared keys
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 900007
-EXTRA_PATCHES=	${FILESDIR}/patch8-utmp.diff
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--disable-debug
-.endif
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if ${PORT_OPTIONS:MADMINPORT}
-CONFIGURE_ARGS+=	--enable-adminport
-.else
-CONFIGURE_ARGS+=	--disable-adminport
-.endif
-
-.if ${PORT_OPTIONS:MSTATS}
-CONFIGURE_ARGS+=	--enable-stats
-.else
-CONFIGURE_ARGS+=	--disable-stats
-.endif
-
-.if ${PORT_OPTIONS:MDPD}
-CONFIGURE_ARGS+=	--enable-dpd
-.else
-CONFIGURE_ARGS+=	--disable-dpd
-.endif
-
-.if ${PORT_OPTIONS:MNATT}
-.	if ${PORT_OPTIONS:MNATTF}
-CONFIGURE_ARGS+=	--enable-natt=yes
-.	else
-CONFIGURE_ARGS+=	--enable-natt=kernel
-.	endif
-.else
-CONFIGURE_ARGS+=	--disable-natt
-.endif
-
-.if ${PORT_OPTIONS:MFRAG}
-CONFIGURE_ARGS+=	--enable-frag
-.else
-CONFIGURE_ARGS+=	--disable-frag
-.endif
-
-.if ${PORT_OPTIONS:MHYBRID}
-CONFIGURE_ARGS+=	--enable-hybrid
-.else
-CONFIGURE_ARGS+=	--disable-hybrid
-.endif
-
-.if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=	--with-libpam
-.else
-CONFIGURE_ARGS+=	--without-libpam
-.endif
-
-.if ${PORT_OPTIONS:MGSSAPI}
-USES+=		iconv
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=	--enable-gssapi
-.else
-CONFIGURE_ARGS+=	--disable-gssapi
-.endif
-
-.if ${PORT_OPTIONS:MRADIUS}
-CONFIGURE_ARGS+=	--with-libradius
-.else
-CONFIGURE_ARGS+=	--without-libradius
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	YES
-CONFIGURE_ARGS+=	--with-libldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-libldap
-.endif
-
-.if ${PORT_OPTIONS:MSAUNSPEC}
-CONFIGURE_ARGS+=	--enable-samode-unspec
-.else
-CONFIGURE_ARGS+=	--disable-samode-unspec
-.endif
-
-.if ${PORT_OPTIONS:MRC5}
-CONFIGURE_ARGS+=	--enable-rc5
-.else
-CONFIGURE_ARGS+=	--disable-rc5
-.endif
-
-.if ${PORT_OPTIONS:MIDEA}
-CONFIGURE_ARGS+=	--enable-idea
-.else
-CONFIGURE_ARGS+=	--disable-idea
-.endif
-
-.if ${PORT_OPTIONS:MWCPSKEY}
-EXTRA_PATCHES=	${FILESDIR}/wildcard-psk.diff
-.endif
+DEBUG_CONFIGURE_ENABLE=	debug
+IPV6_CONFIGURE_ENABLE=	ipv6
+ADMINPORT_CONFIGURE_ENABLE=adminport
+STATS_CONFIGURE_ENABLE=	stats
+DPD_CONFIGURE_ENABLE=	dpd
+NATTF_VARS=		NATT=yes
+NATTF_VARS_OFF=		NATT=kernel
+NATT_CONFIGURE_ON=	--enable-natt=${NATT}
+NATT_CONFIGURE_OFF=	--disable-natt
+FRAG_CONFIGURE_ENABLE=	frag
+HYBRID_CONFIGURE_ENABLE=hybrid
+PAM_CONFIGURE_WITH=	libpam
+GSSAPI_USES=		iconv
+GSSAPI_CFLAGS=		-I${LOCALBASE}/include
+GSSAPI_LDFLAGS=		-L${LOCALBASE}/lib
+GSSAPI_CONFIGURE_ENABLE=gssapi
+RADIUS_CONFIGURE_WITH=	libradius
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_ON=	--with-libldap=${LOCALBASE}
+LDAP_CONFIGURE_OFF=	--without-libldap
+SAUNSPEC_CONFIGURE_ENABLE=	samode-unspec
+RC5_CONFIGURE_ENABLE=		rc5
+IDEA_CONFIGURE_ENABLE=		idea
+WCPSKEY_EXTRA_PATCHES=		${FILESDIR}/wildcard-psk.diff
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/-Werror//g ; s/-R$$libdir/-Wl,-rpath=$$libdir/g" ${WRKSRC}/configure
@@ -172,10 +89,14 @@ post-install:
 	    ${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-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 	@${RM} -f ${WRKSRC}/src/racoon/samples/*.in
 	@${CP} -r ${WRKSRC}/src/racoon/samples/* ${STAGEDIR}/${EXAMPLESDIR}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/racoon/doc/* ${STAGEDIR}/${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/ipsec-tools/files/patch8-utmp.diff b/security/ipsec-tools/files/patch8-utmp.diff
deleted file mode 100644
index db37400f4319..000000000000
--- a/security/ipsec-tools/files/patch8-utmp.diff
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/racoon/isakmp_cfg.c	21 Sep 2010 13:14:17 -0000	1.24
-+++ src/racoon/isakmp_cfg.c	4 Aug 2010 09:16:58 -0000	1.23
-@@ -38,7 +38,7 @@
- #include <sys/socket.h>
- #include <sys/queue.h>
- 
--#include <utmpx.h>
-+#include <utmp.h>
- #if defined(__APPLE__) && defined(__MACH__)
- #include <util.h>
- #endif
-@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
- 	int inout;
- {
- 	int error = 0;
--	struct utmpx ut;
-+	struct utmp ut;
-+	char term[UT_LINESIZE];
- 	char addr[NI_MAXHOST];
- 	
- 	if (usr == NULL || usr[0]=='\0') {
-@@ -1670,33 +1671,36 @@ isakmp_cfg_accounting_system(port, raddr
- 		return -1;
- 	}
- 
--	memset(&ut, 0, sizeof ut);
--	gettimeofday((struct timeval *)&ut.ut_tv, NULL);
--	snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
-+	sprintf(term, TERMSPEC, port);
- 
- 	switch (inout) {
- 	case ISAKMP_CFG_LOGIN:
--		ut.ut_type = USER_PROCESS;
--		strncpy(ut.ut_user, usr, sizeof ut.ut_user);
-+		strncpy(ut.ut_name, usr, UT_NAMESIZE);
-+		ut.ut_name[UT_NAMESIZE - 1] = '\0';
-+
-+		strncpy(ut.ut_line, term, UT_LINESIZE);
-+		ut.ut_line[UT_LINESIZE - 1] = '\0';
- 
- 		GETNAMEINFO_NULL(raddr, addr);
--		strncpy(ut.ut_host, addr, sizeof ut.ut_host);
-+		strncpy(ut.ut_host, addr, UT_HOSTSIZE);
-+		ut.ut_host[UT_HOSTSIZE - 1] = '\0';
- 
-+		ut.ut_time = time(NULL);
-+ 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' logging on '%s' from %s.\n",
--			ut.ut_user, ut.ut_id, addr);
-+			ut.ut_name, ut.ut_line, ut.ut_host);
- 
--		pututxline(&ut);
-+		login(&ut);
- 
- 		break;
- 	case ISAKMP_CFG_LOGOUT:	
--		ut.ut_type = DEAD_PROCESS;
- 
- 		plog(LLV_INFO, LOCATION, NULL,
- 			"Accounting : '%s' unlogging from '%s'.\n",
--			usr, ut.ut_id);
-+			usr, term);
- 
--		pututxline(&ut);
-+		logout(term);
- 
- 		break;
- 	default: