--- Makefile	(revision 460307)
+++ Makefile	(working copy)
@@ -2,11 +2,9 @@ 
 # $FreeBSD$
 
 PORTNAME=	nmap
-DISTVERSION=	7.40
-PORTREVISION=	1
+DISTVERSION=	7.60
 CATEGORIES=	security ipv6
-MASTER_SITES=	http://nmap.org/dist/ \
-		LOCAL/ohauer
+MASTER_SITES=	https://nmap.org/dist/
 
 MAINTAINER?=	ohauer@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
@@ -20,13 +18,14 @@ 
 
 .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 SSL LIBSSH2
 OPTIONS_DEFAULT=SSL
 
 SSL_USES=		ssl
@@ -34,6 +33,10 @@ 
 SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_VARS=		STRIP_FILES=ncat
+LIBSSH2_CONFIGURE_ON=	--with-libssh2=${LOCALBASE}
+LIBSSH2_CONFIGURE_OFF=	--without-libssh2
+LIBSSH2_DESC=		SSH2 protocol support
+LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
 
 DOCS=	CHANGELOG HACKING
 STRIP_FILES+=	nmap nping
@@ -41,6 +44,8 @@ 
 CONFIGURE_ARGS+=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
+		--with-libdnet=included \
+		--with-libpcap=${LOCALBASE} \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=included \
 		--without-nmap-update
--- distinfo	(revision 460307)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1482248215
-SHA256 (nmap-7.40.tar.bz2) = 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188
-SIZE (nmap-7.40.tar.bz2) = 9043221
+TIMESTAMP = 1502716491
+SHA256 (nmap-7.60.tar.bz2) = a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21
+SIZE (nmap-7.60.tar.bz2) = 10394925
--- files/patch-configure	(revision 460307)
+++ files/patch-configure	(working copy)
@@ -1,6 +1,6 @@ 
---- configure.orig	2016-01-07 05:45:47 UTC
+--- configure.orig	2017-07-31 19:09:47 UTC
 +++ configure
-@@ -2546,7 +2546,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -2583,7 +2583,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
@@ -9,7 +9,7 @@ 
  { $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 :
-@@ -3379,7 +3379,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -3416,7 +3416,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
@@ -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 :
+ 
--- files/patch-libdnet-stripped__configure	(revision 460307)
+++ files/patch-libdnet-stripped__configure	(working copy)
@@ -1,5 +1,15 @@ 
 --- libdnet-stripped/configure.orig	2011-09-28 06:55:47 UTC
 +++ libdnet-stripped/configure
+@@ -733,6 +733,9 @@ ac_includes_default="\
+ #ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
 @@ -14344,11 +14344,8 @@ $as_echo_n "checking for Berkeley Packet
      if test "${ac_cv_dnet_bsd_bpf+set}" = set; then
    $as_echo_n "(cached) " >&6
--- files/patch-ncat_test_test-wildcard.c	(revision 460307)
+++ files/patch-ncat_test_test-wildcard.c	(nonexistent)
@@ -1,11 +0,0 @@ 
---- ncat/test/test-wildcard.c.orig	2016-08-01 09:34:56 UTC
-+++ ncat/test/test-wildcard.c
-@@ -253,7 +253,7 @@ static int set_dNSNames(X509 *cert, cons
-         if (gen_name == NULL)
-             goto stack_err;
-         gen_name->type = GEN_DNS;
--    #if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         gen_name->d.dNSName = M_ASN1_IA5STRING_new();
-     #else
-         gen_name->d.dNSName = ASN1_IA5STRING_new();
--- pkg-plist	(revision 460307)
+++ pkg-plist	(working copy)
@@ -85,6 +85,7 @@ 
 %%DATADIR%%/nselib/data/psexec/nmap_service.c
 %%DATADIR%%/nselib/data/psexec/nmap_service.vcproj
 %%DATADIR%%/nselib/data/psexec/pwdump.lua
+%%DATADIR%%/nselib/data/publickeydb
 %%DATADIR%%/nselib/data/rtsp-urls.txt
 %%DATADIR%%/nselib/data/snmpcommunities.lst
 %%DATADIR%%/nselib/data/ssl-fingerprints
@@ -119,6 +120,7 @@ 
 %%DATADIR%%/nselib/ipOps.lua
 %%DATADIR%%/nselib/ipmi.lua
 %%DATADIR%%/nselib/ipp.lua
+%%DATADIR%%/nselib/irc.lua
 %%DATADIR%%/nselib/iscsi.lua
 %%DATADIR%%/nselib/isns.lua
 %%DATADIR%%/nselib/jdwp.lua
@@ -125,6 +127,8 @@ 
 %%DATADIR%%/nselib/json.lua
 %%DATADIR%%/nselib/ldap.lua
 %%DATADIR%%/nselib/lfs.luadoc
+%%DATADIR%%/nselib/libssh2-utility.lua
+%%DATADIR%%/nselib/libssh2.luadoc
 %%DATADIR%%/nselib/listop.lua
 %%DATADIR%%/nselib/lpeg-utility.lua
 %%DATADIR%%/nselib/lpeg.luadoc
@@ -169,6 +173,7 @@ 
 %%DATADIR%%/nselib/sip.lua
 %%DATADIR%%/nselib/slaxml.lua
 %%DATADIR%%/nselib/smb.lua
+%%DATADIR%%/nselib/smb2.lua
 %%DATADIR%%/nselib/smbauth.lua
 %%DATADIR%%/nselib/smtp.lua
 %%DATADIR%%/nselib/snmp.lua
@@ -241,6 +246,7 @@ 
 %%DATADIR%%/scripts/broadcast-netbios-master-browser.nse
 %%DATADIR%%/scripts/broadcast-networker-discover.nse
 %%DATADIR%%/scripts/broadcast-novell-locate.nse
+%%DATADIR%%/scripts/broadcast-ospf2-discover.nse
 %%DATADIR%%/scripts/broadcast-pc-anywhere.nse
 %%DATADIR%%/scripts/broadcast-pc-duo.nse
 %%DATADIR%%/scripts/broadcast-pim-discovery.nse
@@ -261,6 +267,8 @@ 
 %%DATADIR%%/scripts/cassandra-info.nse
 %%DATADIR%%/scripts/cccam-version.nse
 %%DATADIR%%/scripts/cics-enum.nse
+%%DATADIR%%/scripts/cics-info.nse
+%%DATADIR%%/scripts/cics-user-brute.nse
 %%DATADIR%%/scripts/cics-user-enum.nse
 %%DATADIR%%/scripts/citrix-brute-xml.nse
 %%DATADIR%%/scripts/citrix-enum-apps-xml.nse
@@ -326,6 +334,7 @@ 
 %%DATADIR%%/scripts/ftp-brute.nse
 %%DATADIR%%/scripts/ftp-libopie.nse
 %%DATADIR%%/scripts/ftp-proftpd-backdoor.nse
+%%DATADIR%%/scripts/ftp-syst.nse
 %%DATADIR%%/scripts/ftp-vsftpd-backdoor.nse
 %%DATADIR%%/scripts/ftp-vuln-cve2010-4221.nse
 %%DATADIR%%/scripts/ganglia-info.nse
@@ -364,6 +373,7 @@ 
 %%DATADIR%%/scripts/http-coldfusion-subzero.nse
 %%DATADIR%%/scripts/http-comments-displayer.nse
 %%DATADIR%%/scripts/http-config-backup.nse
+%%DATADIR%%/scripts/http-cookie-flags.nse
 %%DATADIR%%/scripts/http-cors.nse
 %%DATADIR%%/scripts/http-cross-domain-policy.nse
 %%DATADIR%%/scripts/http-csrf.nse
@@ -421,6 +431,7 @@ 
 %%DATADIR%%/scripts/http-robots.txt.nse
 %%DATADIR%%/scripts/http-robtex-reverse-ip.nse
 %%DATADIR%%/scripts/http-robtex-shared-ns.nse
+%%DATADIR%%/scripts/http-security-headers.nse
 %%DATADIR%%/scripts/http-server-header.nse
 %%DATADIR%%/scripts/http-shellshock.nse
 %%DATADIR%%/scripts/http-sitemap-generator.nse
@@ -459,6 +470,10 @@ 
 %%DATADIR%%/scripts/http-vuln-cve2014-8877.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1427.nse
 %%DATADIR%%/scripts/http-vuln-cve2015-1635.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-1001000.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-5638.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-5689.nse
+%%DATADIR%%/scripts/http-vuln-cve2017-8917.nse
 %%DATADIR%%/scripts/http-vuln-misfortune-cookie.nse
 %%DATADIR%%/scripts/http-vuln-wnr1000-creds.nse
 %%DATADIR%%/scripts/http-waf-detect.nse
@@ -471,10 +486,12 @@ 
 %%DATADIR%%/scripts/iax2-brute.nse
 %%DATADIR%%/scripts/iax2-version.nse
 %%DATADIR%%/scripts/icap-info.nse
+%%DATADIR%%/scripts/iec-identify.nse
 %%DATADIR%%/scripts/ike-version.nse
 %%DATADIR%%/scripts/imap-brute.nse
 %%DATADIR%%/scripts/imap-capabilities.nse
 %%DATADIR%%/scripts/imap-ntlm-info.nse
+%%DATADIR%%/scripts/impress-remote-discover.nse
 %%DATADIR%%/scripts/informix-brute.nse
 %%DATADIR%%/scripts/informix-query.nse
 %%DATADIR%%/scripts/informix-tables.nse
@@ -586,6 +603,7 @@ 
 %%DATADIR%%/scripts/omron-info.nse
 %%DATADIR%%/scripts/openlookup-info.nse
 %%DATADIR%%/scripts/openvas-otp-brute.nse
+%%DATADIR%%/scripts/openwebnet-discovery.nse
 %%DATADIR%%/scripts/oracle-brute-stealth.nse
 %%DATADIR%%/scripts/oracle-brute.nse
 %%DATADIR%%/scripts/oracle-enum-users.nse
@@ -602,6 +620,7 @@ 
 %%DATADIR%%/scripts/pop3-capabilities.nse
 %%DATADIR%%/scripts/pop3-ntlm-info.nse
 %%DATADIR%%/scripts/pptp-version.nse
+%%DATADIR%%/scripts/puppet-naivesigning.nse
 %%DATADIR%%/scripts/qconn-exec.nse
 %%DATADIR%%/scripts/qscan.nse
 %%DATADIR%%/scripts/quake1-info.nse
@@ -640,6 +659,7 @@ 
 %%DATADIR%%/scripts/sip-methods.nse
 %%DATADIR%%/scripts/skypev2-version.nse
 %%DATADIR%%/scripts/smb-brute.nse
+%%DATADIR%%/scripts/smb-double-pulsar-backdoor.nse
 %%DATADIR%%/scripts/smb-enum-domains.nse
 %%DATADIR%%/scripts/smb-enum-groups.nse
 %%DATADIR%%/scripts/smb-enum-processes.nse
@@ -651,11 +671,13 @@ 
 %%DATADIR%%/scripts/smb-mbenum.nse
 %%DATADIR%%/scripts/smb-os-discovery.nse
 %%DATADIR%%/scripts/smb-print-text.nse
+%%DATADIR%%/scripts/smb-protocols.nse
 %%DATADIR%%/scripts/smb-psexec.nse
 %%DATADIR%%/scripts/smb-security-mode.nse
 %%DATADIR%%/scripts/smb-server-stats.nse
 %%DATADIR%%/scripts/smb-system-info.nse
 %%DATADIR%%/scripts/smb-vuln-conficker.nse
+%%DATADIR%%/scripts/smb-vuln-cve-2017-7494.nse
 %%DATADIR%%/scripts/smb-vuln-cve2009-3103.nse
 %%DATADIR%%/scripts/smb-vuln-ms06-025.nse
 %%DATADIR%%/scripts/smb-vuln-ms07-029.nse
@@ -662,8 +684,12 @@ 
 %%DATADIR%%/scripts/smb-vuln-ms08-067.nse
 %%DATADIR%%/scripts/smb-vuln-ms10-054.nse
 %%DATADIR%%/scripts/smb-vuln-ms10-061.nse
+%%DATADIR%%/scripts/smb-vuln-ms17-010.nse
 %%DATADIR%%/scripts/smb-vuln-regsvc-dos.nse
-%%DATADIR%%/scripts/smbv2-enabled.nse
+%%DATADIR%%/scripts/smb2-capabilities.nse
+%%DATADIR%%/scripts/smb2-security-mode.nse
+%%DATADIR%%/scripts/smb2-time.nse
+%%DATADIR%%/scripts/smb2-vuln-uptime.nse
 %%DATADIR%%/scripts/smtp-brute.nse
 %%DATADIR%%/scripts/smtp-commands.nse
 %%DATADIR%%/scripts/smtp-enum-users.nse
@@ -689,7 +715,11 @@ 
 %%DATADIR%%/scripts/socks-auth-info.nse
 %%DATADIR%%/scripts/socks-brute.nse
 %%DATADIR%%/scripts/socks-open-proxy.nse
+%%DATADIR%%/scripts/ssh-auth-methods.nse
+%%DATADIR%%/scripts/ssh-brute.nse
 %%DATADIR%%/scripts/ssh-hostkey.nse
+%%DATADIR%%/scripts/ssh-publickey-acceptance.nse
+%%DATADIR%%/scripts/ssh-run.nse
 %%DATADIR%%/scripts/ssh2-enum-algos.nse
 %%DATADIR%%/scripts/sshv1.nse
 %%DATADIR%%/scripts/ssl-ccs-injection.nse
@@ -725,6 +755,7 @@ 
 %%DATADIR%%/scripts/telnet-ntlm-info.nse
 %%DATADIR%%/scripts/tftp-enum.nse
 %%DATADIR%%/scripts/tls-nextprotoneg.nse
+%%DATADIR%%/scripts/tls-ticketbleed.nse
 %%DATADIR%%/scripts/tn3270-screen.nse
 %%DATADIR%%/scripts/tor-consensus-checker.nse
 %%DATADIR%%/scripts/traceroute-geolocation.nse
@@ -737,6 +768,7 @@ 
 %%DATADIR%%/scripts/ventrilo-info.nse
 %%DATADIR%%/scripts/versant-info.nse
 %%DATADIR%%/scripts/vmauthd-brute.nse
+%%DATADIR%%/scripts/vmware-version.nse
 %%DATADIR%%/scripts/vnc-brute.nse
 %%DATADIR%%/scripts/vnc-info.nse
 %%DATADIR%%/scripts/vnc-title.nse