From owner-svn-ports-head@FreeBSD.ORG Fri Apr 24 10:57:03 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 06CDCBF; Fri, 24 Apr 2015 10:57:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E890E18DE; Fri, 24 Apr 2015 10:57:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3OAv2xZ011401; Fri, 24 Apr 2015 10:57:02 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3OAv2a1011397; Fri, 24 Apr 2015 10:57:02 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201504241057.t3OAv2a1011397@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Fri, 24 Apr 2015 10:57:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384631 - head/security/strongswan X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2015 10:57:03 -0000 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@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