diff --git a/net-misc/openssh/openssh-7.0p1.recipe b/net-misc/openssh/openssh-7.0p1.recipe
deleted file mode 100644
index ee41e1dc3..000000000
--- a/net-misc/openssh/openssh-7.0p1.recipe
+++ /dev/null
@@ -1,132 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2015 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="2"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="fd5932493a19f4c81153d812ee4e042b49bbd3b759ab3d9344abecc2bc1485e5"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="sshd_keymaker.sh"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:slogin = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:login
-	cmd:passwd
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
-	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
-	defaultPath+=":/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.1p1.recipe b/net-misc/openssh/openssh-7.1p1.recipe
deleted file mode 100644
index b675d8932..000000000
--- a/net-misc/openssh/openssh-7.1p1.recipe
+++ /dev/null
@@ -1,161 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2015 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="5"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="
-	sshd_keymaker.sh
-	fix_openssh_config_paths.sh
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:slogin = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:grep
-	cmd:login
-	cmd:passwd
-	cmd:sed
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
-	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
-	defaultPath+=":/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-	cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir
-
-	local USER_SETTINGS_DIR="`finddir B_USER_SETTINGS_DIRECTORY`"
-	sed -i \
-		-e "s| ~/\.ssh/| $USER_SETTINGS_DIR/ssh/|" \
-		$sysconfDir/ssh/ssh_config
-
-	local SYSTEM_SETTINGS_DIR="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
-	local VAR_DIR="`finddir B_SYSTEM_VAR_DIRECTORY`"
-	local LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`"
-	sed -i \
-		-e "s|$sysconfDir/ssh/|$SYSTEM_SETTINGS_DIR/ssh/|" \
-		-e "s|$prefix/var/run/|$VAR_DIR/run/|" \
-		-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
-		$sysconfDir/ssh/sshd_config
-
-	mkdir -p $dataDir/openssh
-	cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
-	cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.1p2.recipe b/net-misc/openssh/openssh-7.1p2.recipe
deleted file mode 100644
index f15ab84d8..000000000
--- a/net-misc/openssh/openssh-7.1p2.recipe
+++ /dev/null
@@ -1,161 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2016 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="2"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="dd75f024dcf21e06a0d6421d582690bf987a1f6323e32ad6619392f3bfde6bbd"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="
-	sshd_keymaker.sh
-	fix_openssh_config_paths.sh
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:slogin = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:grep
-	cmd:login
-	cmd:passwd
-	cmd:sed
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
-	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
-	defaultPath+=":/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-	cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir
-
-	local USER_SETTINGS_DIR="`finddir B_USER_SETTINGS_DIRECTORY`"
-	sed -i \
-		-e "s| ~/\.ssh/| $USER_SETTINGS_DIR/ssh/|" \
-		$sysconfDir/ssh/ssh_config
-
-	local SYSTEM_SETTINGS_DIR="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
-	local VAR_DIR="`finddir B_SYSTEM_VAR_DIRECTORY`"
-	local LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`"
-	sed -i \
-		-e "s|$sysconfDir/ssh/|$SYSTEM_SETTINGS_DIR/ssh/|" \
-		-e "s|$prefix/var/run/|$VAR_DIR/run/|" \
-		-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
-		$sysconfDir/ssh/sshd_config
-
-	mkdir -p $dataDir/openssh
-	cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
-	cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.2p2.recipe b/net-misc/openssh/openssh-7.2p2.recipe
deleted file mode 100644
index f95a78740..000000000
--- a/net-misc/openssh/openssh-7.2p2.recipe
+++ /dev/null
@@ -1,162 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2016 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="2"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="
-	sshd_keymaker.sh
-	fix_openssh_config_paths.sh
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:grep
-	cmd:login
-	cmd:passwd
-	cmd:sed
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/common/non-packaged/bin:/boot/common/bin:/bin"
-	defaultPath+=":/boot/common/apps:/boot/common/preferences:/boot/system/apps"
-	defaultPath+=":/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit \
-		--without-zlib-version-check \
-		--without-stackprotect
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-	cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir
-
-	local USER_SETTINGS_DIR="`finddir B_USER_SETTINGS_DIRECTORY`"
-	sed -i \
-		-e "s| ~/\.ssh/| $USER_SETTINGS_DIR/ssh/|" \
-		$sysconfDir/ssh/ssh_config
-
-	local SYSTEM_SETTINGS_DIR="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
-	local VAR_DIR="`finddir B_SYSTEM_VAR_DIRECTORY`"
-	local LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`"
-	sed -i \
-		-e "s|$sysconfDir/ssh/|$SYSTEM_SETTINGS_DIR/ssh/|" \
-		-e "s|$prefix/var/run/|$VAR_DIR/run/|" \
-		-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
-		$sysconfDir/ssh/sshd_config
-
-	mkdir -p $dataDir/openssh
-	cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
-	cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.4p1.recipe b/net-misc/openssh/openssh-7.4p1.recipe
deleted file mode 100644
index ebf8af56c..000000000
--- a/net-misc/openssh/openssh-7.4p1.recipe
+++ /dev/null
@@ -1,161 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2016 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="2"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="
-	sshd_keymaker.sh
-	fix_openssh_config_paths.sh
-	"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:grep
-	cmd:login
-	cmd:passwd
-	cmd:sed
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/system/non-packaged/bin:/boot/system/bin:/bin"
-	defaultPath+=":/boot/system/apps:/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit \
-		--without-zlib-version-check \
-		--without-stackprotect
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-	cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir
-
-	local USER_SETTINGS_DIR="`finddir B_USER_SETTINGS_DIRECTORY`"
-	sed -i \
-		-e "s| ~/\.ssh/| $USER_SETTINGS_DIR/ssh/|" \
-		$sysconfDir/ssh/ssh_config
-
-	local SYSTEM_SETTINGS_DIR="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
-	local VAR_DIR="`finddir B_SYSTEM_VAR_DIRECTORY`"
-	local LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`"
-	sed -i \
-		-e "s|$sysconfDir/ssh/|$SYSTEM_SETTINGS_DIR/ssh/|" \
-		-e "s|$prefix/var/run/|$VAR_DIR/run/|" \
-		-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
-		$sysconfDir/ssh/sshd_config
-
-	mkdir -p $dataDir/openssh
-	cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
-	cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.5p1.recipe b/net-misc/openssh/openssh-7.5p1.recipe
deleted file mode 100644
index 3aa9b7c18..000000000
--- a/net-misc/openssh/openssh-7.5p1.recipe
+++ /dev/null
@@ -1,161 +0,0 @@
-SUMMARY="Secure Shell client and server (remote login program)"
-DESCRIPTION="OpenSSH is a free version of the SSH connectivity tools that \
-technical users of the Internet rely on. Users of telnet, rlogin, and ftp may \
-not realize that their password is transmitted across the Internet \
-unencrypted, but it is.
-
-OpenSSH encrypts all traffic (including passwords) to effectively eliminate \
-eavesdropping, connection hijacking, and other attacks. Additionally, OpenSSH \
-provides secure tunneling capabilities and several authentication methods, and \
-supports all SSH protocol versions.
-
-The OpenSSH suite replaces rlogin and telnet with the ssh program, rcp with \
-scp, and ftp with sftp. Also included is sshd (the server side of the \
-package), and the other utilities like ssh-add, ssh-agent, ssh-keysign, \
-ssh-keyscan, ssh-keygen and sftp-server."
-HOMEPAGE="http://www.openssh.com/"
-COPYRIGHT="2005-2017 Tatu Ylonen et al."
-LICENSE="OpenSSH"
-REVISION="2"
-SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0"
-PATCHES="sshd_config.patch
-	pathnames.patch
-	bzero.patch"
-ADDITIONAL_FILES="
-	sshd_keymaker.sh
-	fix_openssh_config_paths.sh
-	"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/ssh directory keep-old
-	settings/ssh/ssh_config keep-old
-	settings/ssh/sshd_config keep-old
-	"
-USER_SETTINGS_FILES="
-	settings/ssh directory
-	settings/ssh/ssh_config template data/openssh/ssh_config.default
-	settings/ssh/sshd_config template data/openssh/sshd_config.default
-	"
-POST_INSTALL_SCRIPTS="
-	$relativePostInstallDir/sshd_keymaker.sh
-	$relativePostInstallDir/fix_openssh_config_paths.sh
-	"
-sshdUserHomeDir="/packages/$portVersionedName-$REVISION/.self/$relativeDataDir/openssh/empty"
-PACKAGE_USERS="
-	sshd real-name \"sshd user\" home \"$sshdUserHomeDir\" shell \"/bin/true\"
-	"
-PACKAGE_GROUPS="sshd"
-
-PROVIDES="
-	openssh = $portVersion compat >= 5
-	cmd:scp = $portVersion compat >= 5
-	cmd:sftp = $portVersion compat >= 5
-	cmd:sftp_server = $portVersion compat >= 5
-	cmd:ssh = $portVersion compat >= 5
-	cmd:ssh_add = $portVersion compat >= 5
-	cmd:ssh_agent = $portVersion compat >= 5
-	cmd:ssh_keygen = $portVersion compat >= 5
-	cmd:ssh_keyscan = $portVersion compat >= 5
-	cmd:ssh_keysign = $portVersion compat >= 5
-	cmd:ssh_pkcs11_helper = $portVersion compat >= 5
-	cmd:sshd = $portVersion compat >= 5
-	"
-REQUIRES="
-	haiku
-	cmd:grep
-	cmd:login
-	cmd:passwd
-	cmd:sed
-	lib:libcrypto
-	lib:libedit
-	lib:libncurses
-	lib:libssl
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libedit
-	devel:libncurses
-	devel:libssl
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config
-	"
-
-PATCH()
-{
-	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
-}
-
-BUILD()
-{
-	mkdir -p m4
-	aclocal --install -I m4
-	libtoolize --force --copy
-	aclocal -I m4
-	autoconf
-	defaultPath=".:/boot/home/config/non-packaged/bin:/boot/home/config/bin"
-	defaultPath+=":/boot/system/non-packaged/bin:/boot/system/bin:/bin"
-	defaultPath+=":/boot/system/apps:/boot/system/preferences"
-
-	# Note: override sysconfdir and libexecdir since ssh doesn't create
-	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
-	runConfigure ./configure \
-		--sysconfdir=$sysconfDir/ssh \
-		--libexecdir=$libExecDir/openssh \
-		--with-privsep-path=$dataDir/openssh/empty \
-		--with-pid-dir=$prefix/var/run \
-		--with-default-path="$defaultPath" \
-		--with-md5-passwords \
-		--disable-utmpx \
-		--with-libedit \
-		--without-zlib-version-check \
-		--without-stackprotect
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install-nokeys
-	mkdir -p $postInstallDir
-	cp -f $portDir/additional-files/sshd_keymaker.sh $postInstallDir
-	cp -f $portDir/additional-files/fix_openssh_config_paths.sh $postInstallDir
-
-	local USER_SETTINGS_DIR="`finddir B_USER_SETTINGS_DIRECTORY`"
-	sed -i \
-		-e "s| ~/\.ssh/| $USER_SETTINGS_DIR/ssh/|" \
-		$sysconfDir/ssh/ssh_config
-
-	local SYSTEM_SETTINGS_DIR="`finddir B_SYSTEM_SETTINGS_DIRECTORY`"
-	local VAR_DIR="`finddir B_SYSTEM_VAR_DIRECTORY`"
-	local LIB_DIR="`finddir B_SYSTEM_LIB_DIRECTORY`"
-	sed -i \
-		-e "s|$sysconfDir/ssh/|$SYSTEM_SETTINGS_DIR/ssh/|" \
-		-e "s|$prefix/var/run/|$VAR_DIR/run/|" \
-		-e "s|$libExecDir/openssh/|$LIB_DIR/openssh/|" \
-		$sysconfDir/ssh/sshd_config
-
-	mkdir -p $dataDir/openssh
-	cp $sysconfDir/ssh/ssh_config $dataDir/openssh/ssh_config.default
-	cp $sysconfDir/ssh/sshd_config $dataDir/openssh/sshd_config.default
-}
-
-TEST()
-{
-	make tests
-}
diff --git a/net-misc/openssh/openssh-7.6p1.recipe b/net-misc/openssh/openssh-7.9p1.recipe
similarity index 96%
rename from net-misc/openssh/openssh-7.6p1.recipe
rename to net-misc/openssh/openssh-7.9p1.recipe
index 390b7c093..b1e4f8787 100644
--- a/net-misc/openssh/openssh-7.6p1.recipe
+++ b/net-misc/openssh/openssh-7.9p1.recipe
@@ -18,16 +18,17 @@ COPYRIGHT="2005-2017 Tatu Ylonen et al."
 LICENSE="OpenSSH"
 REVISION="1"
 SOURCE_URI="http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$portVersion.tar.gz"
-CHECKSUM_SHA256="a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723"
+CHECKSUM_SHA256="6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad"
 PATCHES="sshd_config.patch
 	pathnames.patch
-	bzero.patch"
+	bzero.patch
+	define_bsd_source.patch"
 ADDITIONAL_FILES="
 	sshd_keymaker.sh
 	fix_openssh_config_paths.sh
 	"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 GLOBAL_WRITABLE_FILES="
 	settings/ssh directory keep-old
diff --git a/net-misc/openssh/patches/define_bsd_source.patch b/net-misc/openssh/patches/define_bsd_source.patch
new file mode 100644
index 000000000..25f277dcc
--- /dev/null
+++ b/net-misc/openssh/patches/define_bsd_source.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index b7258bd..d50a413 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -688,6 +688,7 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
+ 	LIBS="$LIBS -lbsd "
+ 	AC_CHECK_LIB([network], [socket])
+ 	AC_DEFINE([HAVE_U_INT64_T])
++	CFLAGS="$CFLAGS -D_BSD_SOURCE"
+ 	MANTYPE=man
+ 	;;
+ *-*-hpux*)