security/softether5: Avoid hardcoded path in patches

Respect SE_LOGDIR, SE_DBDIR defined in Makefile. Unintended replaced with
hardcoded path by `make makepatch`.

While here, bump PORTREVISION to force rebuild with these paths.

Sponsored by:	HAW International, Inc.

6 files changed, 10 insertions, 9 deletions

diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index 6a510f552f2b..be674efd1686 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	softether
 DISTVERSION=	5.01.9669
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	5
 
diff --git a/security/softether5/files/patch-chain-certs-dir b/security/softether5/files/patch-chain-certs-dir
index 886d7773f674..7a962c115e04 100644
--- a/security/softether5/files/patch-chain-certs-dir
+++ b/security/softether5/files/patch-chain-certs-dir
@@ -5,7 +5,7 @@
  
  		GetExeDirW(exedir, sizeof(exedir));
 -		CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
-+		CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs");
++		CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs");
  		MakeDirExW(dirname);
  
  		if (auto_save)
@@ -14,7 +14,7 @@
  	GetExeDirW(exedir, sizeof(exedir));
  
 -	CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
-+	CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs");
++	CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs");
  
  	MakeDirExW(dirname);
  
@@ -25,7 +25,7 @@
  	GetExeDirW(exedir, sizeof(exedir));
  
 -	CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs");
-+	CombinePathW(dirname, sizeof(dirname), L"/var/db/softether", L"chain_certs");
++	CombinePathW(dirname, sizeof(dirname), L"%%SE_DBDIR%%", L"chain_certs");
  
  	MakeDirExW(dirname);
  
diff --git a/security/softether5/files/patch-piddir b/security/softether5/files/patch-piddir
index b91b81fe27b3..c8375df27fcc 100644
--- a/security/softether5/files/patch-piddir
+++ b/security/softether5/files/patch-piddir
@@ -5,7 +5,7 @@
  
  	// File name generation
 -	Format(name, sizeof(name), "%s/.%s", dir, tmp);
-+	Format(name, sizeof(name), "/var/db/softether/.%s", tmp);
++	Format(name, sizeof(name), "%%SE_DBDIR%%/.%s", tmp);
  
  	fd = open(name, O_WRONLY);
  	if (fd == -1)
@@ -14,7 +14,7 @@
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.pid_%s", dir, tmp1);
-+	Format(name, size, "/var/db/softether/.pid_%s", tmp1);
++	Format(name, size, "%%SE_DBDIR%%/.pid_%s", tmp1);
  }
  
  // Delete the PID file
@@ -23,7 +23,7 @@
  	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
  
 -	Format(name, size, "%s/.ctl_%s", dir, tmp1);
-+	Format(name, size, "/var/db/softether/.ctl_%s", tmp1);
++	Format(name, size, "%%SE_DBDIR%%/.ctl_%s", tmp1);
  }
  
  // Write the CTL file
diff --git a/security/softether5/files/softether_bridge.in b/security/softether5/files/softether_bridge.in
index 7080fe33b4ab..4fe713a961ce 100644
--- a/security/softether5/files/softether_bridge.in
+++ b/security/softether5/files/softether_bridge.in
@@ -20,7 +20,7 @@ load_rc_config ${name}
 
 command="%%PREFIX%%/libexec/softether/vpnbridge/vpnbridge"
 
-datadir="/var/db/softether"
+datadir="%%SE_DBDIR%%"
 
 start_precmd="${name}_precmd"
 start_cmd="${command} start"
diff --git a/security/softether5/files/softether_client.in b/security/softether5/files/softether_client.in
index b9dc04eceef4..c4cb29ebdb47 100644
--- a/security/softether5/files/softether_client.in
+++ b/security/softether5/files/softether_client.in
@@ -20,7 +20,7 @@ load_rc_config ${name}
 
 command="%%PREFIX%%/libexec/softether/vpnclient/vpnclient"
 
-datadir="/var/db/softether"
+datadir="%%SE_DBDIR%%"
 
 start_precmd="${name}_precmd"
 start_cmd="${command} start"
diff --git a/security/softether5/files/softether_server.in b/security/softether5/files/softether_server.in
index 6485a3e4e41a..242efb47c801 100644
--- a/security/softether5/files/softether_server.in
+++ b/security/softether5/files/softether_server.in
@@ -20,7 +20,7 @@ load_rc_config ${name}
 
 command="%%PREFIX%%/libexec/softether/vpnserver/vpnserver"
 
-datadir="/var/db/softether"
+datadir="%%SE_DBDIR%%"
 
 start_precmd="${name}_precmd"
 start_cmd="${command} start"