CVS commit: pkgsrc/net/nmap

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar 13 08:55:37 UTC 2020

Modified Files:
        pkgsrc/net/nmap: Makefile Makefile.common options.mk

Log Message:
nmap: assorted fixes

- use pkgsrc libssh2 rather than bundled
- Check portability skip for bundled libssh2
- ipv6 is no longer optional, so remove it
- bump rev


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/net/nmap/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nmap/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/nmap/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nmap/Makefile
diff -u pkgsrc/net/nmap/Makefile:1.143 pkgsrc/net/nmap/Makefile:1.144
--- pkgsrc/net/nmap/Makefile:1.143      Sat Jan 25 10:45:10 2020
+++ pkgsrc/net/nmap/Makefile    Fri Mar 13 08:55:37 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.143 2020/01/25 10:45:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.144 2020/03/13 08:55:37 tnn Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "Makefile.common"
 
 COMMENT=       Network/port scanner with OS detection
@@ -16,6 +16,7 @@ CONFIGURE_ARGS+=      --with-liblinear=${BUIL
 CONFIGURE_ARGS+=       --with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=       --with-libpcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=       --with-libssh2=${BUILDLINK_PREFIX.libssh2}
 CONFIGURE_ARGS+=       --without-ndiff # provided by net/ndiff
 CONFIGURE_ARGS+=       --without-subversion
 CONFIGURE_ARGS+=       --without-zenmap # provided by net/zenmap
@@ -66,4 +67,5 @@ post-install:
 .include "../../math/liblinear/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../security/libssh2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/nmap/Makefile.common
diff -u pkgsrc/net/nmap/Makefile.common:1.2 pkgsrc/net/nmap/Makefile.common:1.3
--- pkgsrc/net/nmap/Makefile.common:1.2 Wed Aug 28 13:55:44 2019
+++ pkgsrc/net/nmap/Makefile.common     Fri Mar 13 08:55:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2019/08/28 13:55:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2020/03/13 08:55:37 tnn Exp $
 # used by net/ndiff/Makefile
 # used by net/nmap/Makefile
 # used by net/zenmap/Makefile
@@ -13,3 +13,5 @@ HOMEPAGE=     https://nmap.org/
 LICENSE=       gnu-gpl-v2
 
 CONFLICTS=     nmap<=7.70
+
+CHECK_PORTABILITY_SKIP+=       libssh2/Makefile.in

Index: pkgsrc/net/nmap/options.mk
diff -u pkgsrc/net/nmap/options.mk:1.20 pkgsrc/net/nmap/options.mk:1.21
--- pkgsrc/net/nmap/options.mk:1.20     Sat Apr 14 13:04:33 2018
+++ pkgsrc/net/nmap/options.mk  Fri Mar 13 08:55:37 2020
@@ -1,20 +1,13 @@
-# $NetBSD: options.mk,v 1.20 2018/04/14 13:04:33 adam Exp $
+# $NetBSD: options.mk,v 1.21 2020/03/13 08:55:37 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nmap
 
-PKG_SUPPORTED_OPTIONS= inet6 lua
-PKG_SUGGESTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS= lua
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   lua
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=       --enable-ipv6
-.else
-CONFIGURE_ARGS+=       --disable-ipv6
-.endif
-
 .if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_ACCEPTED= 53      # needs lua_isyieldable, introduced in Lua 5.3
 .include "../../lang/lua/buildlink3.mk"