diff -ruN softether/Makefile softether_new/Makefile
--- softether/Makefile	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/Makefile	2014-09-09 15:55:37.000000000 +0200
@@ -24,10 +24,13 @@
 USE_OPENSSL=	yes
 USES=		iconv ncurses readline dos2unix gmake
 USE_RC_SUBR=	softether_bridge softether_client softether_server
+SUB_FILES=	vpncmd
 
 # a pity the source directory has such a naming scheme, but well
 WRKSRC=		${WRKDIR}/v4.08-9449
 
+ALL_TARGET=	build
+
 .include <bsd.port.options.mk>
 
 # requires OpenSSL from ports
@@ -47,13 +50,7 @@
 	@${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile
 
-# gmake all is not defined, use gmake build
-do-build:
-	@cd ${WRKSRC}/ && ${SETENV} ${GMAKE_ENV} ${GMAKE} build
-	@${CP} ${FILESDIR}/vpncmd.in ${WRKDIR}/vpncmd
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${LOCALBASE},g' ${WRKDIR}/vpncmd
-
-# manually install to libexec, then the final install will copy scripts
+# manually install to ${PREFIX}/libexec/softether, then the final install will copy scripts
 # into ${PREFIX}/sbin
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
@@ -61,9 +58,8 @@
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
+	@${INSTALL_DATA} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
 	@${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
-	@${ECHO} en > ${STAGEDIR}/${PREFIX}/libexec/softether/lang.config
 
 post-install:
 .for i in vpnbridge vpnclient vpncmd vpnserver
diff -ruN softether/files/patch-src__Cedar__Cedar.h softether_new/files/patch-src__Cedar__Cedar.h
--- softether/files/patch-src__Cedar__Cedar.h	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Cedar__Cedar.h	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,75 @@
+--- src/Cedar/Cedar.h.orig	2014-06-08 06:19:15 UTC
++++ src/Cedar/Cedar.h
+@@ -477,22 +477,22 @@
+ #define	LOG_ENGINE_BUFFER_CACHE_SIZE_MAX	(10 * 1024 * 1024)	// Write cache size
+ 
+ // Constant such as a file name
+-#define	SERVER_LOG_DIR_NAME			"@server_log"
++#define	SERVER_LOG_DIR_NAME			"/var/db/softether/server_log"
+ #define	BRIDGE_LOG_DIR_NAME			SERVER_LOG_DIR_NAME
+ #define	SERVER_LOG_PERFIX			"vpn"
+ 
+-#define	HUB_SECURITY_LOG_DIR_NAME	"@security_log"
+-#define	HUB_SECURITY_LOG_FILE_NAME	"@security_log/%s"
++#define	HUB_SECURITY_LOG_DIR_NAME	"/var/db/softether/security_log"
++#define	HUB_SECURITY_LOG_FILE_NAME	"/var/db/softether/security_log/%s"
+ #define	HUB_SECURITY_LOG_PREFIX		"sec"
+-#define	HUB_PACKET_LOG_DIR_NAME		"@packet_log"
+-#define	HUB_PACKET_LOG_FILE_NAME	"@packet_log/%s"
++#define	HUB_PACKET_LOG_DIR_NAME		"/var/db/softether/packet_log"
++#define	HUB_PACKET_LOG_FILE_NAME	"/var/db/softether/packet_log/%s"
+ #define	HUB_PACKET_LOG_PREFIX		"pkt"
+ 
+-#define	NAT_LOG_DIR_NAME			"@secure_nat_log"
+-#define	NAT_LOG_FILE_NAME			"@secure_nat_log/%s"
++#define	NAT_LOG_DIR_NAME			"/var/db/softether/secure_nat_log"
++#define	NAT_LOG_FILE_NAME			"/var/db/softether/secure_nat_log/%s"
+ #define	NAT_LOG_PREFIX				"snat"
+ 
+-#define	CLIENT_LOG_DIR_NAME			"@client_log"
++#define	CLIENT_LOG_DIR_NAME			"/var/db/softether/client_log"
+ #define	CLIENT_LOG_PREFIX			"client"
+ 
+ // Packet log settings
+@@ -527,8 +527,8 @@
+ #define	DISK_FREE_CHECK_INTERVAL	(5 * 60 * 1000)
+ 
+ // Simple log
+-#define TINY_LOG_DIRNAME			"@tiny_log"
+-#define TINY_LOG_FILENAME			"@tiny_log/%04u%02u%02u_%02u%02u%02u.log"
++#define TINY_LOG_DIRNAME			"/var/db/softether/tiny_log"
++#define TINY_LOG_FILENAME			"/var/db/softether/tiny_log/%04u%02u%02u_%02u%02u%02u.log"
+ 
+ 
+ //////////////////////////////////////////////////////////////////////
+@@ -541,7 +541,7 @@
+ //#define CE_SNAPSHOT_INTERVAL		((UINT64)(3000))
+ #define CE_SNAPSHOT_POLLING_INTERVAL	(1 * 1000)
+ #define CE_SNAPSHOT_POLLING_INTERVAL_LICENSE	(30 * 1000)
+-#define CE_SNAPSHOT_DIR_NAME		"@carrier_log"
++#define CE_SNAPSHOT_DIR_NAME		"/var/db/softether/carrier_log"
+ #define CE_SNAPSHOT_PREFIX			"carrier"
+ 
+ 
+@@ -558,7 +558,7 @@
+ // Expiration date of random size cache
+ #define	RAND_SIZE_CACHE_EXPIRE		(24 * 60 * 60 * 1000)
+ // Management allowed IP address list file name
+-#define	ADMINIP_TXT					"@adminip.txt"
++#define	ADMINIP_TXT					"/var/db/softether/adminip.txt"
+ 
+ #define NON_SSL_MIN_COUNT			60
+ #define NON_SSL_ENTRY_EXPIRES		(10 * 60 * 1000)
+@@ -609,9 +609,9 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #define	EL_ADMIN_PORT			22888
+-#define	EL_CONFIG_FILENAME		"@etherlogger.config"
+-#define	EL_PACKET_LOG_DIR_NAME	"@etherlogger_log"
+-#define	EL_PACKET_LOG_FILE_NAME	"@etherlogger_log/%s"
++#define	EL_CONFIG_FILENAME		"/var/db/softether/etherlogger.config"
++#define	EL_PACKET_LOG_DIR_NAME	"/var/db/softether/etherlogger_log"
++#define	EL_PACKET_LOG_FILE_NAME	"/var/db/softether/etherlogger_log/%s"
+ #define	EL_PACKET_LOG_PREFIX	"pkt"
+ #define	EL_LICENSE_CHECK_SPAN	(10 * 1000)
+ 
diff -ruN softether/files/patch-src__Cedar__Client.h softether_new/files/patch-src__Cedar__Client.h
--- softether/files/patch-src__Cedar__Client.h	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Cedar__Client.h	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,20 @@
+--- src/Cedar/Client.h.orig	2014-06-08 06:19:15 UTC
++++ src/Cedar/Client.h
+@@ -110,7 +110,7 @@
+ 
+ 
+ // Constants
+-#define	CLIENT_CONFIG_FILE_NAME				"@vpn_client.config"
++#define	CLIENT_CONFIG_FILE_NAME				"/var/db/softether/vpn_client.config"
+ #define	CLIENT_DEFAULT_KEEPALIVE_HOST		"keepalive.softether.org"
+ #define	CLIENT_DEFAULT_KEEPALIVE_PORT		80
+ #define	CLIENT_DEFAULT_KEEPALIVE_INTERVAL	KEEP_INTERVAL_DEFAULT
+@@ -130,7 +130,7 @@
+ #define	CLIENT_WIN32_EXE_FILENAME_X64		"vpnclient_x64.exe"
+ #define	CLIENT_WIN32_EXE_FILENAME_IA64		"vpnclient_ia64.exe"
+ 
+-#define CLIENT_CUSTOM_INI_FILENAME			"@custom.ini"
++#define CLIENT_CUSTOM_INI_FILENAME			"/var/db/softether/custom.ini"
+ 
+ #define	CLIENT_GLOBAL_PULSE_NAME			"clientglobalpulse"
+ 
diff -ruN softether/files/patch-src__Cedar__Nat.h softether_new/files/patch-src__Cedar__Nat.h
--- softether/files/patch-src__Cedar__Nat.h	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Cedar__Nat.h	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/Cedar/Nat.h.orig	2014-06-08 06:19:15 UTC
++++ src/Cedar/Nat.h
+@@ -100,7 +100,7 @@
+ #define	NAT_H
+ 
+ // Constants
+-#define	NAT_CONFIG_FILE_NAME			"@vpn_router.config"	// NAT configuration file
++#define	NAT_CONFIG_FILE_NAME			"/var/db/softether/vpn_router.config"	// NAT configuration file
+ #define	DEFAULT_NAT_ADMIN_PORT			2828		// Default port number for management
+ #define	NAT_ADMIN_PORT_LISTEN_INTERVAL	1000		// Interval for trying to open a port for management
+ #define	NAT_FILE_SAVE_INTERVAL			(30 * 1000)	// Interval to save
diff -ruN softether/files/patch-src__Cedar__Server.c softether_new/files/patch-src__Cedar__Server.c
--- softether/files/patch-src__Cedar__Server.c	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Cedar__Server.c	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,15 @@
+--- src/Cedar/Server.c.orig	2014-06-08 06:19:15 UTC
++++ src/Cedar/Server.c
+@@ -100,9 +100,9 @@
+ 
+ static SERVER *server = NULL;
+ static LOCK *server_lock = NULL;
+-char *SERVER_CONFIG_FILE_NAME = "@vpn_server.config";
+-char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "@vpn_gate_svc.config";
+-char *BRIDGE_CONFIG_FILE_NAME = "@vpn_bridge.config";
++char *SERVER_CONFIG_FILE_NAME = "/var/db/softether/vpn_server.config";
++char *SERVER_CONFIG_FILE_NAME_IN_CLIENT = "/var/db/softether/vpn_gate_svc.config";
++char *BRIDGE_CONFIG_FILE_NAME = "/var/db/softether/vpn_bridge.config";
+ 
+ static bool server_reset_setting = false;
+ 
diff -ruN softether/files/patch-src__Mayaqua__Cfg.c softether_new/files/patch-src__Mayaqua__Cfg.c
--- softether/files/patch-src__Mayaqua__Cfg.c	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Mayaqua__Cfg.c	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/Mayaqua/Cfg.c.orig	2014-06-08 06:19:14 UTC
++++ src/Mayaqua/Cfg.c
+@@ -124,7 +124,7 @@
+ 	}
+ 
+ 	// Determine the directory name
+-	UniFormat(dirname, sizeof(dirname), L"@backup.%s", original[0] == L'@' ? original + 1 : original);
++	UniFormat(dirname, sizeof(dirname), L"/var/db/softether/backup.%s", original[0] == L'@' ? original + 1 : original);
+ 
+ 	// Determine the file name
+ 	LocalTime(&st);
diff -ruN softether/files/patch-src__Mayaqua__Cfg.h softether_new/files/patch-src__Mayaqua__Cfg.h
--- softether/files/patch-src__Mayaqua__Cfg.h	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Mayaqua__Cfg.h	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/Mayaqua/Cfg.h.orig	2014-06-08 06:19:14 UTC
++++ src/Mayaqua/Cfg.h
+@@ -102,7 +102,7 @@
+ // Macro
+ //#define	CHECK_CFG_NAME_EXISTS			// Check duplication of the existing name
+ 
+-#define	SAVE_BINARY_FILE_NAME_SWITCH	L"@save_binary"
++#define	SAVE_BINARY_FILE_NAME_SWITCH	L"/var/db/softether/save_binary"
+ 
+ // Constants
+ #define	TAG_DECLARE			"declare"
diff -ruN softether/files/patch-src__Mayaqua__Kernel.c softether_new/files/patch-src__Mayaqua__Kernel.c
--- softether/files/patch-src__Mayaqua__Kernel.c	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Mayaqua__Kernel.c	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/Mayaqua/Kernel.c.orig	2014-06-08 06:19:14 UTC
++++ src/Mayaqua/Kernel.c
+@@ -2160,7 +2160,7 @@
+ 		msg = "Unknown Error";
+ 	}
+ 
+-	f = fopen("abort_error_log.txt", "w");
++	f = fopen("/var/db/softether/abort_error_log.txt", "w");
+ 	if (f != NULL)
+ 	{
+ 		fwrite(msg, 1, strlen(msg), f);
diff -ruN softether/files/patch-src__Mayaqua__Table.h softether_new/files/patch-src__Mayaqua__Table.h
--- softether/files/patch-src__Mayaqua__Table.h	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Mayaqua__Table.h	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/Mayaqua/Table.h.orig	2014-06-08 06:19:14 UTC
++++ src/Mayaqua/Table.h
+@@ -102,7 +102,7 @@
+ #define	UNICODE_CACHE_FILE		L".unicode_cache_%s.dat"
+ 
+ #define	LANGLIST_FILENAME		"|languages.txt"
+-#define	LANG_CONFIG_FILENAME	L"@lang.config"
++#define	LANG_CONFIG_FILENAME	L"/var/db/softether/lang.config"
+ #define	LANG_CONFIG_TEMPLETE	"|lang.config"
+ 
+ // Language constant
diff -ruN softether/files/patch-src__Mayaqua__Unix.c softether_new/files/patch-src__Mayaqua__Unix.c
--- softether/files/patch-src__Mayaqua__Unix.c	1970-01-01 01:00:00.000000000 +0100
+++ softether_new/files/patch-src__Mayaqua__Unix.c	2014-09-09 15:39:42.000000000 +0200
@@ -0,0 +1,29 @@
+--- src/Mayaqua/Unix.c.orig	2014-06-08 06:19:14 UTC
++++ src/Mayaqua/Unix.c
+@@ -916,7 +916,7 @@
+ 	GetExeDir(dir, sizeof(dir));
+ 
+ 	// File name generation
+-	Format(name, sizeof(name), "%s/.%s", dir, tmp);
++	Format(name, sizeof(name), "/var/db/softether/.%s", tmp);
+ 
+ 	fd = open(name, O_WRONLY);
+ 	if (fd == -1)
+@@ -2254,7 +2254,7 @@
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
+ 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
+ 
+-	Format(name, size, "%s/.pid_%s", dir, tmp1);
++	Format(name, size, "/var/db/softether/.pid_%s", tmp1);
+ }
+ 
+ // Delete the PID file
+@@ -2299,7 +2299,7 @@
+ 	Hash(hash, exe_name, StrLen(exe_name), false);
+ 	BinToStr(tmp1, sizeof(tmp1), hash, sizeof(hash));
+ 
+-	Format(name, size, "%s/.ctl_%s", dir, tmp1);
++	Format(name, size, "/var/db/softether/.ctl_%s", tmp1);
+ }
+ 
+ // Write the CTL file
diff -ruN softether/files/softether_bridge.in softether_new/files/softether_bridge.in
--- softether/files/softether_bridge.in	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/files/softether_bridge.in	2014-09-09 12:33:34.000000000 +0200
@@ -20,17 +20,17 @@
 
 command="%%PREFIX%%/libexec/softether/vpnbridge"
 
+datadir="/var/db/softether"
+
+start_precmd="${name}_precmd"
 start_cmd="${command} start"
 stop_cmd="${command} stop"
 
-softether_bridge_start()
-{
-	${start_cmd}
-}
-
-softether_bridge_stop()
+softether_bridge_precmd()
 {
-	${stop_cmd}
+	if [ ! -d "${datadir}" ]; then
+	    mkdir -p ${datadir}
+	fi
 }
 
 run_rc_command "$1"
diff -ruN softether/files/softether_client.in softether_new/files/softether_client.in
--- softether/files/softether_client.in	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/files/softether_client.in	2014-09-09 11:28:23.000000000 +0200
@@ -20,17 +20,17 @@
 
 command="%%PREFIX%%/libexec/softether/vpnclient"
 
+datadir="/var/db/softether"
+
+start_precmd="${name}_precmd"
 start_cmd="${command} start"
 stop_cmd="${command} stop"
 
-softether_client_start()
-{
-	${start_cmd}
-}
-
-softether_client_stop()
+softether_client_precmd()
 {
-	${stop_cmd}
+	if [ ! -d "${datadir}" ]; then
+	    mkdir -p ${datadir}
+	fi
 }
 
 run_rc_command "$1"
diff -ruN softether/files/softether_server.in softether_new/files/softether_server.in
--- softether/files/softether_server.in	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/files/softether_server.in	2014-09-09 12:33:41.000000000 +0200
@@ -20,17 +20,17 @@
 
 command="%%PREFIX%%/libexec/softether/vpnserver"
 
+datadir="/var/db/softether"
+
+start_precmd="${name}_precmd"
 start_cmd="${command} start"
 stop_cmd="${command} stop"
 
-softether_server_start()
-{
-	${start_cmd}
-}
-
-softether_server_stop()
+softether_server_precmd()
 {
-	${stop_cmd}
+	if [ ! -d "${datadir}" ]; then
+	    mkdir -p ${datadir}
+	fi
 }
 
 run_rc_command "$1"
diff -ruN softether/files/vpncmd.in softether_new/files/vpncmd.in
--- softether/files/vpncmd.in	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/files/vpncmd.in	2014-09-09 11:29:27.000000000 +0200
@@ -3,4 +3,4 @@
 # wrapper script for vpncmd, the configuration binary for
 # SoftEther vpn
 #
-%%PREFIX%%/libexec/softether/vpncmd $@*
+%%PREFIX%%/libexec/softether/vpncmd ${1+"$@"}
diff -ruN softether/pkg-message softether_new/pkg-message
--- softether/pkg-message	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/pkg-message	2014-09-09 15:41:17.000000000 +0200
@@ -13,4 +13,7 @@
 done either by using a Windows client to connect to the running
 services or by vpncmd from command line.
 
+When removing SoftEther VPN without the desire to reinstall, please
+ensure to remove the directory /var/db/softether as well.
+
 **************************************************************************
diff -ruN softether/pkg-plist softether_new/pkg-plist
--- softether/pkg-plist	2014-08-08 10:31:34.000000000 +0200
+++ softether_new/pkg-plist	2014-09-09 15:27:29.000000000 +0200
@@ -1,5 +1,4 @@
 libexec/softether/hamcore.se2
-libexec/softether/lang.config
 libexec/softether/vpnbridge
 libexec/softether/vpnclient
 libexec/softether/vpncmd