svn commit: r384631 - head/security/strongswan

[Renato Botelho]

Author: garga
Date: Fri Apr 24 10:57:01 2015
New Revision: 384631
URL: https://svnweb.freebsd.org/changeset/ports/384631

Log:
  Fix PLIST when EAPAKA3GPP2 is unset and EAPDYNAMIC is set
  
  PR:		199652
  Approved by:	stronswan at Nanoteq.com (maintainer)
  Sponsored by:	Netgate

Modified:
  head/security/strongswan/Makefile
  head/security/strongswan/pkg-plist

Modified: head/security/strongswan/Makefile
==============================================================================
--- head/security/strongswan/Makefile	Fri Apr 24 08:56:15 2015	(r384630)
+++ head/security/strongswan/Makefile	Fri Apr 24 10:57:01 2015	(r384631)
@@ -100,12 +100,6 @@ PLIST_SUB+=	SIMAKA=""
 PLIST_SUB+=	SIMAKA="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MEAPDYNAMIC} || ${PORT_OPTIONS:MEAPAKA3GPP2}
-PLIST_SUB+=	DYNAKA=""
-.else
-PLIST_SUB+=	DYNAKA="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=	--enable-attr-sql --enable-sql
 PLIST_SUB+=	SQL=""

Modified: head/security/strongswan/pkg-plist
==============================================================================
--- head/security/strongswan/pkg-plist	Fri Apr 24 08:56:15 2015	(r384630)
+++ head/security/strongswan/pkg-plist	Fri Apr 24 10:57:01 2015	(r384631)
@@ -222,8 +222,8 @@ man/man8/charon-cmd.8.gz
 %%EAPAKA3GPP2%%@sample %%ETCDIR%%.d/charon/eap-aka-3gpp2.conf.sample
 %%EAPAKA3GPP2%%%%DATADIR%%/templates/config/plugins/eap-aka.conf
 %%EAPAKA3GPP2%%@sample %%ETCDIR%%.d/charon/eap-aka.conf.sample
-%%DYNAKA%%%%DATADIR%%/templates/config/plugins/gmp.conf
-%%DYNAKA%%@sample %%ETCDIR%%.d/charon/gmp.conf.sample
+%%EAPAKA3GPP2%%%%DATADIR%%/templates/config/plugins/gmp.conf
+%%EAPAKA3GPP2%%@sample %%ETCDIR%%.d/charon/gmp.conf.sample
 %%EAPDYNAMIC%%lib/ipsec/plugins/libstrongswan-eap-dynamic.a
 %%EAPDYNAMIC%%lib/ipsec/plugins/libstrongswan-eap-dynamic.la
 %%EAPDYNAMIC%%lib/ipsec/plugins/libstrongswan-eap-dynamic.so