From owner-svn-ports-head@FreeBSD.ORG  Fri Feb 14 14:37:37 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2851D72;
 Fri, 14 Feb 2014 14:37:37 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 133C91D93;
 Fri, 14 Feb 2014 14:37:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEbaGT073901;
 Fri, 14 Feb 2014 14:37:36 GMT (envelope-from decke@svn.freebsd.org)
Received: (from decke@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EEbaJa073899;
 Fri, 14 Feb 2014 14:37:36 GMT (envelope-from decke@svn.freebsd.org)
Message-Id: <201402141437.s1EEbaJa073899@svn.freebsd.org>
From: Bernhard Froehlich <decke@FreeBSD.org>
Date: Fri, 14 Feb 2014 14:37:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344214 - 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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2014 14:37:37 -0000

Author: decke
Date: Fri Feb 14 14:37:36 2014
New Revision: 344214
URL: http://svnweb.freebsd.org/changeset/ports/344214
QAT: https://qat.redports.org/buildarchive/r344214/

Log:
  - Use OPTIONS_SUB=yes
  - Prefer ${INSTALL_DATA} over ${MV}
  - Whitespace fix
  
  Thanks to:	garga@

Modified:
  head/security/strongswan/Makefile

Modified: head/security/strongswan/Makefile
==============================================================================
--- head/security/strongswan/Makefile	Fri Feb 14 14:36:58 2014	(r344213)
+++ head/security/strongswan/Makefile	Fri Feb 14 14:37:36 2014	(r344214)
@@ -44,7 +44,7 @@ CONFIGURE_ARGS=	--enable-kernel-pfkey \
 OPTIONS_DEFINE=	CURL EAPAKA3GPP2 EAPDYNAMIC EAPRADIUS EAPSIMFILE IKEv1 \
 		IPSECKEY KERNELLIBIPSEC LOADTESTER LDAP MYSQL SQLITE \
 		TESTVECTOR UNBOUND XAUTH
-OPTIONS_SUB=	${OPTIONS_DEFINE}
+OPTIONS_SUB=	yes
 CURL_DESC=	Enable CURL to fetch CRL/OCSP
 EAPAKA3GPP2_DESC=	Enable EAP AKA with 3gpp2 backend
 EAPDYNAMIC_DESC=	Enable EAP dynamic proxy module
@@ -84,9 +84,9 @@ XAUTH_CONFIGURE_ON=	--enable-xauth-eap -
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEAPSIMFILE} || ${PORT_OPTIONS:MEAPAKA3GPP2}
-PLIST_SUB+=SIMAKA=""
+PLIST_SUB+=	SIMAKA=""
 .else
-PLIST_SUB+=SIMAKA="@comment "
+PLIST_SUB+=	SIMAKA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE}
@@ -98,7 +98,7 @@ PLIST_SUB+=	SQL="@comment "
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${MV} ${STAGEDIR}${PREFIX}/etc/strongswan.conf ${STAGEDIR}${EXAMPLESDIR}
-	${MV} ${STAGEDIR}${PREFIX}/etc/ipsec.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/strongswan.conf ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/ipsec.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>