CVS commit: pkgsrc/net/nmap

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Fri Mar 19 08:50:57 UTC 2021

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

Log Message:
nmap: Make liblinear an option, on by default.

liblinear is used for 'machine learning IPv6 OS detection'. It depends on
a number of packages, some of which may not build on some OS versions.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/net/nmap/Makefile
cvs rdiff -u -r1.21 -r1.22 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.144 pkgsrc/net/nmap/Makefile:1.145
--- pkgsrc/net/nmap/Makefile:1.144      Fri Mar 13 08:55:37 2020
+++ pkgsrc/net/nmap/Makefile    Fri Mar 19 08:50:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2020/03/13 08:55:37 tnn Exp $
+# $NetBSD: Makefile,v 1.145 2021/03/19 08:50:57 sborrill Exp $
 
 PKGREVISION= 2
 .include "Makefile.common"
@@ -12,7 +12,6 @@ USE_LANGUAGES=                c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
-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}
@@ -64,7 +63,6 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/bin/uninstall_*
 
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../math/liblinear/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/libssh2/buildlink3.mk"

Index: pkgsrc/net/nmap/options.mk
diff -u pkgsrc/net/nmap/options.mk:1.21 pkgsrc/net/nmap/options.mk:1.22
--- pkgsrc/net/nmap/options.mk:1.21     Fri Mar 13 08:55:37 2020
+++ pkgsrc/net/nmap/options.mk  Fri Mar 19 08:50:57 2021
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.21 2020/03/13 08:55:37 tnn Exp $
+# $NetBSD: options.mk,v 1.22 2021/03/19 08:50:57 sborrill Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.nmap
 
-PKG_SUPPORTED_OPTIONS= lua
+PKG_SUPPORTED_OPTIONS= lua liblinear
+
+PKG_SUGGESTED_OPTIONS= liblinear
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,3 +18,11 @@ PLIST.lua=           yes
 .else
 CONFIGURE_ARGS+=       --without-liblua
 .endif
+
+.if !empty(PKG_OPTIONS:Mliblinear)
+# liblinear is used for IPv6 OS detection machine learning techniques
+.include "../../math/liblinear/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-liblinear=${BUILDLINK_PREFIX.liblinear}
+.else
+CONFIGURE_ARGS+=       --without-liblinear
+.endif