--- Makefile	(revision 460450)
+++ Makefile	(working copy)
@@ -3,9 +3,9 @@ 
 
 PORTNAME=	nmap
 DISTVERSION=	7.60
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security ipv6
-MASTER_SITES=	http://nmap.org/dist/ \
+MASTER_SITES=	https://nmap.org/dist/ \
 		LOCAL/ohauer
 
 MAINTAINER?=	ohauer@FreeBSD.org
@@ -20,15 +20,20 @@ 
 
 .if !defined(MASTERDIR)
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
+LIB_DEPENDS=	libpcre.so:devel/pcre \
+		libpcap.so:net/libpcap
 
 USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	DOCS SSL
+OPTIONS_DEFINE=	DOCS LIBSSH2 SSL
 OPTIONS_DEFAULT=SSL
 
+LIBSSH2_DESC=		SSH2 protocol support
+LIBSSH2_CONFIGURE_ON=	--with-libssh2=${LOCALBASE}
+LIBSSH2_CONFIGURE_OFF=	--without-libssh2
+LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-openssl
@@ -41,6 +46,8 @@ 
 CONFIGURE_ARGS+=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
+		--with-libdnet=included \
+		--with-libpcap=${LOCALBASE} \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=included \
 		--without-nmap-update
--- files/patch-configure	(revision 460450)
+++ files/patch-configure	(working copy)
@@ -18,3 +18,12 @@ 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_prog_CC+:} false; then :
+@@ -6801,7 +6801,7 @@ if test "${with_libssh2+set}" = set; the
+     CPPFLAGS="-I$with_libssh2/include $CPPFLAGS"
+     LDFLAGS="-L$with_libssh2/lib $LDFLAGS"
+ 
+-    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "-lm
++    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "$ac_includes_default
+ "
+ if test "x$ac_cv_header_libssh2_h" = xyes; then :
+