Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Feb 2014 14:37:36 +0000 (UTC)
From:      Bernhard Froehlich <decke@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r344214 - head/security/strongswan
Message-ID:  <201402141437.s1EEbaJa073899@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402141437.s1EEbaJa073899>