Index: branches/2020Q1/security/nmap/Makefile
===================================================================
--- branches/2020Q1/security/nmap/Makefile	(revision 522212)
+++ branches/2020Q1/security/nmap/Makefile	(revision 522213)
@@ -1,74 +1,83 @@
 # Created by: David O'Brien (obrien@NUXI.com)
 # $FreeBSD$
 
 PORTNAME=	nmap
 DISTVERSION=	7.80
 PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	https://nmap.org/dist/ \
 		LOCAL/ohauer
 
 MAINTAINER?=	ohauer@FreeBSD.org
 COMMENT?=	Port scanning utility for large networks
 
 # nmap-6.47 => svn.nmap.org/nmap-releases/nmap-6.47 (r33605)
 # https://nmap.org/book/man-legal.html
 # Install the nmap modified license because of
 # http://insecure.org/news/download-com-fiasco.html
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !defined(MASTERDIR)
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		tar:bzip2 gmake cpe
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	DOCS PCAP SSH2 SSL
 OPTIONS_DEFAULT=PCAP 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_OFF=	--without-libssh2
 SSH2_IMPLIES=		SSL
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_CONFIGURE_OFF=	--without-openssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 SSL_VARS=		STRIP_FILES+=ncat
 
 DOCS=	CHANGELOG HACKING
 STRIP_FILES+=	nmap nping
 
 CONFIGURE_ARGS+=--without-localdirs \
 		--without-zenmap \
 		--without-ndiff \
 		--with-libpcre=${LOCALBASE} \
 		--with-liblua=included \
 		--without-nmap-update
 
 # XXX limit results if we do a grep in the sources!
 post-extract:
 	@${RM} -r ${WRKSRC}/mswin32
 
+.if exists(/usr/lib/libibverbs.a)
+# Link with libibverbs is needed by static libpcap
+post-patch-PCAP-on:
+	@${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \
+		${WRKSRC}/configure \
+		${WRKSRC}/nping/configure \
+		${WRKSRC}/ncat/configure
+.endif
+
 post-configure:
 	@${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile
 
 pre-install:
 	${FIND} ${WRKSRC} -type f \( -name \*.orig -o -name \*.bak \) -delete
 
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S|^|${STAGEDIR}${PREFIX}/bin/|}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .endif
 
 .include <bsd.port.mk>
Index: branches/2020Q1/security/nmap/files/patch-nping_configure
===================================================================
--- branches/2020Q1/security/nmap/files/patch-nping_configure	(revision 522212)
+++ branches/2020Q1/security/nmap/files/patch-nping_configure	(nonexistent)
@@ -1,11 +0,0 @@
---- nping/configure.orig	2019-01-31 23:28:21 UTC
-+++ nping/configure
-@@ -5356,7 +5356,7 @@ if test $have_libpcap != yes; then
-     LDFLAGS="-L$libpcapdir $LDFLAGS"
-     CPPFLAGS="$CPPFLAGS -I$libpcapdir"
-   fi
--  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
-+  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs'
-   PCAP_DEPENDS='$(LIBPCAPDIR)/libpcap.a'
-   PCAP_BUILD="build-pcap"
-   PCAP_CLEAN="clean-pcap"

Property changes on: branches/2020Q1/security/nmap/files/patch-nping_configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q1/security/nmap/files/patch-ncat_configure
===================================================================
--- branches/2020Q1/security/nmap/files/patch-ncat_configure	(revision 522212)
+++ branches/2020Q1/security/nmap/files/patch-ncat_configure	(nonexistent)
@@ -1,11 +0,0 @@
---- ncat/configure.orig	2019-12-08 01:42:55 UTC
-+++ ncat/configure
-@@ -4934,7 +4934,7 @@ fi
-   LIBS="$LIBS_OLD"
- fi
- 
--PCAP_LIBS="-lpcap"
-+PCAP_LIBS="-lpcap -libverbs"
- if test $have_libpcap = yes; then
-   PCAP_DEPENDS=""
-   PCAP_BUILD=""

Property changes on: branches/2020Q1/security/nmap/files/patch-ncat_configure
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q1/security/nmap/files/patch-configure
===================================================================
--- branches/2020Q1/security/nmap/files/patch-configure	(revision 522212)
+++ branches/2020Q1/security/nmap/files/patch-configure	(revision 522213)
@@ -1,29 +1,20 @@
 --- configure.orig	2019-05-24 18:28:49 UTC
 +++ configure
 @@ -2542,7 +2542,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  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.
 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
 +set dummy ${ac_tool_prefix}$CXX; ac_word=$2
  { $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 :
 @@ -3375,7 +3375,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $
  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.
 -set dummy ${ac_tool_prefix}gcc; ac_word=$2
 +set dummy ${ac_tool_prefix}$CXX; ac_word=$2
  { $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 :
-@@ -6365,7 +6365,7 @@ if test $have_libpcap != yes; then
-   else
-     CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir"
-   fi
--  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a'
-+  LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs'
-   PCAP_BUILD="build-pcap"
-   PCAP_CLEAN="clean-pcap"
-   PCAP_DIST_CLEAN="distclean-pcap"
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 522212)
+++ branches/2020Q1	(revision 522213)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r522159