Index: Makefile =================================================================== --- Makefile (revision 466083) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= nmap DISTVERSION= 7.70 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= https://nmap.org/dist/ \ LOCAL/ohauer @@ -20,22 +20,21 @@ .if !defined(MASTERDIR) -LIB_DEPENDS= libpcre.so:devel/pcre +LIB_DEPENDS= libpcre.so:devel/pcre \ + libpcap.so.1:net/libpcap USES= tar:bzip2 gmake cpe GNU_CONFIGURE= yes OPTIONS_SUB= yes -OPTIONS_DEFINE= DOCS PCAP SSH2 SSL -OPTIONS_DEFAULT=PCAP SSH2 SSL +OPTIONS_DEFINE= DOCS SSH2 SSL +OPTIONS_DEFAULT=SSH2 SSL -PCAP_DESC= Build with libpcap from nmap SSH2_DESC= SSH2 protocol support - -PCAP_CONFIGURE_ON= --with-libpcap=included -SSH2_CONFIGURE_ON= --with-libssh2=included +SSH2_CONFIGURE_ON= --with-libssh2=${LOCALBASE} SSH2_CONFIGURE_OFF= --without-libssh2 SSH2_IMPLIES= SSL +SSH2_LIB_DEPENDS= libssh2.so:security/libssh2 SSL_USES= ssl SSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE} SSL_CONFIGURE_OFF= --without-openssl @@ -48,6 +47,7 @@ CONFIGURE_ARGS+=--without-localdirs \ --without-zenmap \ --without-ndiff \ + --with-libpcap=${LOCALBASE} \ --with-libpcre=${LOCALBASE} \ --with-liblua=included \ --without-nmap-update Index: files/patch-libdnet-stripped_configure =================================================================== --- files/patch-libdnet-stripped_configure (revision 466083) +++ files/patch-libdnet-stripped_configure (working copy) @@ -1,6 +1,6 @@ ---- libdnet-stripped/configure.orig 2017-02-13 19:46:23 UTC +--- libdnet-stripped/configure.orig 2017-08-02 18:48:27 UTC +++ libdnet-stripped/configure -@@ -733,6 +733,9 @@ ac_includes_default="\ +@@ -764,6 +764,9 @@ ac_includes_default="\ #ifdef HAVE_STDINT_H # include #endif @@ -10,8 +10,8 @@ #ifdef HAVE_UNISTD_H # include #endif" -@@ -11716,11 +11719,8 @@ $as_echo_n "checking for Berkeley Packet - if test "${ac_cv_dnet_bsd_bpf+set}" = set; then : +@@ -11828,11 +11831,8 @@ $as_echo_n "checking for Berkeley Packet + if ${ac_cv_dnet_bsd_bpf+:} false; then : $as_echo_n "(cached) " >&6 else - if test -c /dev/bpf0 ; then