[125085] trunk/dports/security/easy-rsa

[khindenburg at macports.org]

Revision: 125085
          https://trac.macports.org/changeset/125085
Author:   khindenburg at macports.org
Date:     2014-09-04 18:23:33 -0700 (Thu, 04 Sep 2014)
Log Message:
-----------
easy-rsa:  do not use /opt/local in diff - instead use dummy variable and reinplace

Modified Paths:
--------------
    trunk/dports/security/easy-rsa/Portfile
    trunk/dports/security/easy-rsa/files/patch-set-macports-paths.diff

Modified: trunk/dports/security/easy-rsa/Portfile
===================================================================
--- trunk/dports/security/easy-rsa/Portfile	2014-09-05 01:22:08 UTC (rev 125084)
+++ trunk/dports/security/easy-rsa/Portfile	2014-09-05 01:23:33 UTC (rev 125085)
@@ -27,6 +27,11 @@
 
 build {}
 
+post-patch {
+    reinplace "s|PREFIX|${prefix}|g" ${worksrcpath}/easyrsa
+    reinplace "s|PREFIX|${prefix}|g" ${worksrcpath}/vars.example
+}
+
 destroot {
     xinstall -m 755 ${worksrcpath}/easyrsa ${destroot}${prefix}/bin
 

Modified: trunk/dports/security/easy-rsa/files/patch-set-macports-paths.diff
===================================================================
--- trunk/dports/security/easy-rsa/files/patch-set-macports-paths.diff	2014-09-05 01:22:08 UTC (rev 125084)
+++ trunk/dports/security/easy-rsa/files/patch-set-macports-paths.diff	2014-09-05 01:23:33 UTC (rev 125085)
@@ -5,7 +5,7 @@
  
  	# set up program path
 -	local prog_vars="${0%/*}/vars"
-+	local prog_vars="/opt/local/share/easy-rsa"
++	local prog_vars="PREFIX/share/easy-rsa"
  
  	# command-line path:
  	if [ -f "$EASYRSA_VARS_FILE" ]; then
@@ -14,7 +14,7 @@
  	
  	# Set defaults, preferring existing env-vars if present
 -	set_var EASYRSA		"$PWD"
-+	set_var EASYRSA		"/opt/local/share/easy-rsa"
++	set_var EASYRSA		"PREFIX/share/easy-rsa"
  	set_var EASYRSA_OPENSSL	openssl
 -	set_var EASYRSA_PKI	"$EASYRSA/pki"
 +	set_var EASYRSA_PKI	"$PWD/pki"
@@ -28,7 +28,7 @@
  # this is taken to be the directory you are currently in.
  
 -#set_var EASYRSA	"$PWD"
-+#set_var EASYRSA	"/opt/local/share/easy-rsa"
++#set_var EASYRSA	"PREFIX/share/easy-rsa"
  
  # If your OpenSSL command is not in the system PATH, you will need to define the
  # path to it here. Normally this means a full path to the executable, otherwise
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140904/82095358/attachment.html>