pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

softether: open-source multi-protocol vpn



Module Name:	pkgsrc-wip
Committed By:	William Welliver <william%welliver.org@localhost>
Pushed By:	hww3
Date:		Thu May 23 20:54:42 2019 -0400
Changeset:	eb9a38b55001007d1c8fabd0cb360179759f7443

Added Files:
	softether/DESCR
	softether/INSTALL
	softether/Makefile
	softether/PLIST
	softether/distinfo
	softether/patches/patch-src_makefiles_freebsd__32bit.mak
	softether/patches/patch-src_makefiles_freebsd__64bit.mak
	softether/patches/patch-src_makefiles_linux__32bit.mak
	softether/patches/patch-src_makefiles_linux__64bit.mak
	softether/patches/patch-src_makefiles_macos__32bit.mak
	softether/patches/patch-src_makefiles_macos__64bit.mak
	softether/patches/patch-src_makefiles_openbsd__32bit.mak
	softether/patches/patch-src_makefiles_openbsd__64bit.mak
	softether/patches/patch-src_makefiles_solaris__32bit.mak
	softether/patches/patch-src_makefiles_solaris__64bit.mak

Log Message:
softether: open-source multi-protocol vpn

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb9a38b55001007d1c8fabd0cb360179759f7443

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 softether/DESCR                                    |  1 +
 softether/INSTALL                                  | 16 +++++
 softether/Makefile                                 | 47 ++++++++++++
 softether/PLIST                                    | 17 +++++
 softether/distinfo                                 | 16 +++++
 .../patches/patch-src_makefiles_freebsd__32bit.mak | 74 +++++++++++++++++++
 .../patches/patch-src_makefiles_freebsd__64bit.mak | 74 +++++++++++++++++++
 .../patches/patch-src_makefiles_linux__32bit.mak   | 74 +++++++++++++++++++
 .../patches/patch-src_makefiles_linux__64bit.mak   | 74 +++++++++++++++++++
 .../patches/patch-src_makefiles_macos__32bit.mak   | 78 ++++++++++++++++++++
 .../patches/patch-src_makefiles_macos__64bit.mak   | 78 ++++++++++++++++++++
 .../patches/patch-src_makefiles_openbsd__32bit.mak | 83 ++++++++++++++++++++++
 .../patches/patch-src_makefiles_openbsd__64bit.mak | 78 ++++++++++++++++++++
 .../patches/patch-src_makefiles_solaris__32bit.mak | 74 +++++++++++++++++++
 .../patches/patch-src_makefiles_solaris__64bit.mak | 78 ++++++++++++++++++++
 15 files changed, 862 insertions(+)

diffs:
diff --git a/softether/DESCR b/softether/DESCR
new file mode 100644
index 0000000000..fd90476f98
--- /dev/null
+++ b/softether/DESCR
@@ -0,0 +1 @@
+SoftEther VPN is an open-source multi-protocol VPN server and client.
diff --git a/softether/INSTALL b/softether/INSTALL
new file mode 100644
index 0000000000..8b636f7acf
--- /dev/null
+++ b/softether/INSTALL
@@ -0,0 +1,16 @@
+case ${STAGE} in
+POST-INSTALL)
+        cat <<EOF
+===========================================================================
+NOTE: The behavior of the programs in this package is to create log files
+and configuration files in the same directory as the program. You should
+Monitor these directories for size and content, depending on your usage
+of the various programs:
+
+${PREFIX}/libexec/vpnserver
+${PREFIX}/libexec/vpnclient
+${PREFIX}/libexec/vpnbridge
+${PREFIX}/libexec/vpncmd
+EOF
+;;
+esac
diff --git a/softether/Makefile b/softether/Makefile
new file mode 100644
index 0000000000..0e7a10eee6
--- /dev/null
+++ b/softether/Makefile
@@ -0,0 +1,47 @@
+# $NetBSD$
+
+NAME=	softether
+VERSION=4.29-9680
+PKGNAME=	${NAME}-${VERSION}
+GITHUB_PROJECT=	SoftEtherVPN_Stable
+DISTNAME=	softether-src-${GITHUB_RELEASE}
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SoftEtherVPN/}
+GITHUB_RELEASE=	v4.29-9680-rtm
+DIST_SUBDIR=	${GITHUB_PROJECT}
+
+MAINTAINER=	william%welliver.org@localhost
+HOMEPAGE=	https://github.com/SoftEtherVPN/SoftEtherVPN_Stable/
+COMMENT=	Powerful and easy-to-use multi-protocol VPN software
+LICENSE=	apache-2.0
+
+WRKSRC=		${WRKDIR}/v${VERSION}
+HAS_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+
+USE_TOOLS+=	gmake
+
+BUILD_TARGET=	build
+
+BUILD_MAKE_FLAGS+= LDFLAGS="-L${PREFIX}/lib"
+BUILD_MAKE_FLAGS+= CFLAGS="-I${PREFIX}/include"
+BUILD_MAKE_FLAGS+= PREFIX="${PREFIX}"
+
+INSTALL_MAKE_FLAGS+= PREFIX="${PREFIX}"
+INSTALL_MAKE_FLAGS+= _INSTALL_PREFIX="${DESTDIR}"
+INSTALLATION_DIRS+= bin share/doc/${NAME}
+
+DOC_FILES=   README.TXT LICENSE.TXT AUTHORS.TXT WARNING.TXT
+
+post-install:
+.for x in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${x} \
+	${DESTDIR}${PREFIX}/share/doc/${NAME}/${x}
+.endfor
+
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../net/libpcap/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/softether/PLIST b/softether/PLIST
new file mode 100644
index 0000000000..02ce9b90f0
--- /dev/null
+++ b/softether/PLIST
@@ -0,0 +1,17 @@
+@comment $NetBSD$
+bin/vpnbridge
+bin/vpnclient
+bin/vpncmd
+bin/vpnserver
+libexec/vpnbridge/hamcore.se2
+libexec/vpnbridge/vpnbridge
+libexec/vpnclient/hamcore.se2
+libexec/vpnclient/vpnclient
+libexec/vpncmd/hamcore.se2
+libexec/vpncmd/vpncmd
+libexec/vpnserver/hamcore.se2
+libexec/vpnserver/vpnserver
+share/doc/softether/AUTHORS.TXT
+share/doc/softether/LICENSE.TXT
+share/doc/softether/README.TXT
+share/doc/softether/WARNING.TXT
diff --git a/softether/distinfo b/softether/distinfo
new file mode 100644
index 0000000000..c130a7c509
--- /dev/null
+++ b/softether/distinfo
@@ -0,0 +1,16 @@
+$NetBSD$
+
+SHA1 (SoftEtherVPN_Stable/softether-src-v4.29-9680-rtm.tar.gz) = f6752d04f3f991d2a0dbb6db18b125191af1b5ba
+RMD160 (SoftEtherVPN_Stable/softether-src-v4.29-9680-rtm.tar.gz) = e466143fc17cb943f847e63ee9d80e70b7645bb7
+SHA512 (SoftEtherVPN_Stable/softether-src-v4.29-9680-rtm.tar.gz) = 0a6fe5d18e64a18febd8b16741025a60e4c294ecb7fdef2bb9e4a61edac1f772fb6e3faa2d1498354d24726429ca0a8e2de9ee8ad923a31828b01d08ec41e898
+Size (SoftEtherVPN_Stable/softether-src-v4.29-9680-rtm.tar.gz) = 33759397 bytes
+SHA1 (patch-src_makefiles_freebsd__32bit.mak) = b6102c09091cd15faa8f528dc009d981ae203346
+SHA1 (patch-src_makefiles_freebsd__64bit.mak) = 7f4f31bff9a9b1eb8c299beeeaa06a2fdf8fbffc
+SHA1 (patch-src_makefiles_linux__32bit.mak) = e712f23f6124f34b08de41f360f8cd74f24df0c7
+SHA1 (patch-src_makefiles_linux__64bit.mak) = 351cf840cff1c94123032e3e855b25d1632d2bad
+SHA1 (patch-src_makefiles_macos__32bit.mak) = 6f9f9ef730057d968ad441fcc9855192aec40027
+SHA1 (patch-src_makefiles_macos__64bit.mak) = cf427e09dfb05c37e3b730814fe673cb2be3eb84
+SHA1 (patch-src_makefiles_openbsd__32bit.mak) = 29e64604653cd183e2d815f30567143441244242
+SHA1 (patch-src_makefiles_openbsd__64bit.mak) = f506d8be8fc22894ef289465f553bd8f11496f35
+SHA1 (patch-src_makefiles_solaris__32bit.mak) = ef9b75f1101c9a03f37fed3bc1655e0f861c2e04
+SHA1 (patch-src_makefiles_solaris__64bit.mak) = 0587f2bfbf30042cd1f3bcc5464899d7dbc47381
diff --git a/softether/patches/patch-src_makefiles_freebsd__32bit.mak b/softether/patches/patch-src_makefiles_freebsd__32bit.mak
new file mode 100644
index 0000000000..e85a04702d
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_freebsd__32bit.mak
@@ -0,0 +1,74 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/freebsd_32bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/freebsd_32bit.mak
+@@ -62,19 +62,24 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_freebsd__64bit.mak b/softether/patches/patch-src_makefiles_freebsd__64bit.mak
new file mode 100644
index 0000000000..35aa0d2020
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_freebsd__64bit.mak
@@ -0,0 +1,74 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/freebsd_64bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/freebsd_64bit.mak
+@@ -62,19 +62,24 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DBRIDGE_BPF -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -I/usr/include -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -L/usr/local/lib -L/usr/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_linux__32bit.mak b/softether/patches/patch-src_makefiles_linux__32bit.mak
new file mode 100644
index 0000000000..0ab1eb90a8
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_linux__32bit.mak
@@ -0,0 +1,74 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/linux_32bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/linux_32bit.mak
+@@ -62,19 +62,24 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDDLAGS) -g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDDLAGS) -O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_linux__64bit.mak b/softether/patches/patch-src_makefiles_linux__64bit.mak
new file mode 100644
index 0000000000..cd3bb3ef11
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_linux__64bit.mak
@@ -0,0 +1,74 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/linux_64bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/linux_64bit.mak
+@@ -62,19 +62,24 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_macos__32bit.mak b/softether/patches/patch-src_makefiles_macos__32bit.mak
new file mode 100644
index 0000000000..a34c962197
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_macos__32bit.mak
@@ -0,0 +1,78 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/macos_32bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/macos_32bit.mak
+@@ -62,19 +62,28 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++ifeq ($(PREFIX),)
++PREFIX=/usr
++endif
++
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +442,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +451,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +460,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +469,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_macos__64bit.mak b/softether/patches/patch-src_makefiles_macos__64bit.mak
new file mode 100644
index 0000000000..1e67103d25
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_macos__64bit.mak
@@ -0,0 +1,78 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/macos_64bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/macos_64bit.mak
+@@ -62,19 +62,28 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_MACOS -DBRIDGE_PCAP -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz -lpcap
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++ifeq ($(PREFIX),)
++PREFIX=/usr
++endif
++
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +442,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +451,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +460,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +469,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_openbsd__32bit.mak b/softether/patches/patch-src_makefiles_openbsd__32bit.mak
new file mode 100644
index 0000000000..815d749f14
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_openbsd__32bit.mak
@@ -0,0 +1,83 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/openbsd_32bit.mak.orig	2019-05-24 00:18:28.000000000 +0000
++++ src/makefiles/openbsd_32bit.mak
+@@ -1,3 +1,4 @@
++
+ # SoftEther VPN Source Code
+ # 
+ # Copyright (c) 2012-2019 SoftEther VPN Project at University of Tsukuba, Japan.
+@@ -62,19 +63,28 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char
++
++OPTIONS_LINK_DEBUG=$(LDFLAGS)-g -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -O2 -fsigned-char
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -O2 -fsigned-char
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++ifeq ($(PREFIX),)
++PREFIX=/usr/local
++endif
+ 
+-INSTALL_BINDIR=/usr/local/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +443,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +452,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +461,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +470,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_openbsd__64bit.mak b/softether/patches/patch-src_makefiles_openbsd__64bit.mak
new file mode 100644
index 0000000000..100bb00055
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_openbsd__64bit.mak
@@ -0,0 +1,78 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/openbsd_64bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/openbsd_64bit.mak
+@@ -62,19 +62,28 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_BSD -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -I/usr/local/include -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -L/usr/local/lib -lm -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/local/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++ifeq ($(PREFIX),)
++PREFIX=/usr/local
++endif
++
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +442,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +451,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +460,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +469,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_solaris__32bit.mak b/softether/patches/patch-src_makefiles_solaris__32bit.mak
new file mode 100644
index 0000000000..e32ffe9f9d
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_solaris__32bit.mak
@@ -0,0 +1,74 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/solaris_32bit.mak.orig	2019-02-28 11:05:23.000000000 +0000
++++ src/makefiles/solaris_32bit.mak
+@@ -62,19 +62,24 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_SOLARIS -DNO_VLAN -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +438,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +447,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +456,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +465,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 
diff --git a/softether/patches/patch-src_makefiles_solaris__64bit.mak b/softether/patches/patch-src_makefiles_solaris__64bit.mak
new file mode 100644
index 0000000000..5f453efa2b
--- /dev/null
+++ b/softether/patches/patch-src_makefiles_solaris__64bit.mak
@@ -0,0 +1,78 @@
+$NetBSD$
+Permit compile and link flags to be passed as well as install directory
+--- src/makefiles/solaris_64bit.mak.orig	2019-05-24 00:25:01.000000000 +0000
++++ src/makefiles/solaris_64bit.mak
+@@ -62,19 +62,28 @@
+ 
+ #CC=gcc
+ 
+-OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
++OPTIONS_COMPILE_DEBUG=$(CFLAGS) -D_DEBUG -DDEBUG -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char -m64
+ 
+-OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_DEBUG=$(LDFLAGS) -g -fsigned-char -m64 -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
++OPTIONS_COMPILE_RELEASE=$(CFLAGS) -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_SOLARIS -DNO_VLAN -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64
+ 
+-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -m64 -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
++OPTIONS_LINK_RELEASE=$(LDFLAGS) -O2 -fsigned-char -m64 -lm -lrt -lnsl -lsocket -ldl -lpthread -lssl -lcrypto -liconv -lreadline -lncurses -lz
+ 
+-INSTALL_BINDIR=/usr/bin/
+-INSTALL_VPNSERVER_DIR=/usr/vpnserver/
+-INSTALL_VPNBRIDGE_DIR=/usr/vpnbridge/
+-INSTALL_VPNCLIENT_DIR=/usr/vpnclient/
+-INSTALL_VPNCMD_DIR=/usr/vpncmd/
++ifeq ($(PREFIX),)
++PREFIX=/usr
++endif
++
++BINDIR=$(PREFIX)/bin/
++INSTALL_BINDIR=$(_INSTALL_PREFIX)/$(BINDIR)
++VPNSERVER_DIR=$(PREFIX)/libexec/vpnserver/
++INSTALL_VPNSERVER_DIR=$(_INSTALL_PREFIX)/$(VPNSERVER_DIR)
++VPNBRIDGE_DIR=$(PREFIX)/libexec/vpnbridge/
++INSTALL_VPNBRIDGE_DIR=$(_INSTALL_PREFIX)/$(VPNBRIDGE_DIR)
++VPNCLIENT_DIR=$(PREFIX)/libexec/vpnclient/
++INSTALL_VPNCLIENT_DIR=$(_INSTALL_PREFIX)/$(VPNCLIENT_DIR)
++VPNCMD_DIR=$(PREFIX)/libexec/vpncmd/
++INSTALL_VPNCMD_DIR=$(_INSTALL_PREFIX)/$(VPNCMD_DIR)
+ 
+ ifeq ($(DEBUG),YES)
+ 	OPTIONS_COMPILE=$(OPTIONS_COMPILE_DEBUG)
+@@ -433,7 +442,7 @@ $(INSTALL_BINDIR)vpnserver: bin/vpnserve
+ 	cp bin/vpnserver/hamcore.se2 $(INSTALL_VPNSERVER_DIR)hamcore.se2
+ 	cp bin/vpnserver/vpnserver $(INSTALL_VPNSERVER_DIR)vpnserver
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnserver
+-	echo $(INSTALL_VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
++	echo $(VPNSERVER_DIR)vpnserver '"$$@"' >> $(INSTALL_BINDIR)vpnserver
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnserver
+ 	chmod 755 $(INSTALL_BINDIR)vpnserver
+ 
+@@ -442,7 +451,7 @@ $(INSTALL_BINDIR)vpnbridge: bin/vpnbridg
+ 	cp bin/vpnbridge/hamcore.se2 $(INSTALL_VPNBRIDGE_DIR)hamcore.se2
+ 	cp bin/vpnbridge/vpnbridge $(INSTALL_VPNBRIDGE_DIR)vpnbridge
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnbridge
+-	echo $(INSTALL_VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
++	echo $(VPNBRIDGE_DIR)vpnbridge '"$$@"' >> $(INSTALL_BINDIR)vpnbridge
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnbridge
+ 	chmod 755 $(INSTALL_BINDIR)vpnbridge
+ 
+@@ -451,7 +460,7 @@ $(INSTALL_BINDIR)vpnclient: bin/vpnclien
+ 	cp bin/vpnclient/hamcore.se2 $(INSTALL_VPNCLIENT_DIR)hamcore.se2
+ 	cp bin/vpnclient/vpnclient $(INSTALL_VPNCLIENT_DIR)vpnclient
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpnclient
+-	echo $(INSTALL_VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
++	echo $(VPNCLIENT_DIR)vpnclient '"$$@"' >> $(INSTALL_BINDIR)vpnclient
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpnclient
+ 	chmod 755 $(INSTALL_BINDIR)vpnclient
+ 
+@@ -460,7 +469,7 @@ $(INSTALL_BINDIR)vpncmd: bin/vpncmd/hamc
+ 	cp bin/vpncmd/hamcore.se2 $(INSTALL_VPNCMD_DIR)hamcore.se2
+ 	cp bin/vpncmd/vpncmd $(INSTALL_VPNCMD_DIR)vpncmd
+ 	echo "#!/bin/sh" > $(INSTALL_BINDIR)vpncmd
+-	echo $(INSTALL_VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
++	echo $(VPNCMD_DIR)vpncmd '"$$@"' >> $(INSTALL_BINDIR)vpncmd
+ 	echo 'exit $$?' >> $(INSTALL_BINDIR)vpncmd
+ 	chmod 755 $(INSTALL_BINDIR)vpncmd
+ 


Home | Main Index | Thread Index | Old Index