diff options
| author | tnn <tnn@pkgsrc.org> | 2020-03-13 08:55:37 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-03-13 08:55:37 +0000 |
| commit | d62b77e017c8d4ff4ba5c3c184f61867ac4e94ae (patch) | |
| tree | d9ddd597c898760c655b9ff4240166f9f1118b2f /net/nmap | |
| parent | 108786392913f134689196d84c38ff206ebee502 (diff) | |
| download | pkgsrc-d62b77e017c8d4ff4ba5c3c184f61867ac4e94ae.tar.gz | |
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
Diffstat (limited to 'net/nmap')
| -rw-r--r-- | net/nmap/Makefile | 6 | ||||
| -rw-r--r-- | net/nmap/Makefile.common | 4 | ||||
| -rw-r--r-- | net/nmap/options.mk | 11 |
3 files changed, 9 insertions, 12 deletions
diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 01c62397151..e7429c16a5e 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -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=${BUILDLINK_PREFIX.liblinear} 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" diff --git a/net/nmap/Makefile.common b/net/nmap/Makefile.common index 618610c690f..33fe6578036 100644 --- a/net/nmap/Makefile.common +++ b/net/nmap/Makefile.common @@ -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 diff --git a/net/nmap/options.mk b/net/nmap/options.mk index 4bd7713d358..ff159294a36 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -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" |