View | Details | Raw Unified | Return to bug 221522 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +11 lines)
Lines 3-11 Link Here
3
3
4
PORTNAME=	nmap
4
PORTNAME=	nmap
5
DISTVERSION=	7.60
5
DISTVERSION=	7.60
6
PORTREVISION=	0
6
PORTREVISION=	1
7
CATEGORIES=	security ipv6
7
CATEGORIES=	security ipv6
8
MASTER_SITES=	http://nmap.org/dist/ \
8
MASTER_SITES=	https://nmap.org/dist/ \
9
		LOCAL/ohauer
9
		LOCAL/ohauer
10
10
11
MAINTAINER?=	ohauer@FreeBSD.org
11
MAINTAINER?=	ohauer@FreeBSD.org
Lines 20-32 Link Here
20
20
21
.if !defined(MASTERDIR)
21
.if !defined(MASTERDIR)
22
22
23
LIB_DEPENDS=	libpcre.so:devel/pcre
23
LIB_DEPENDS=	libpcre.so:devel/pcre \
24
		libpcap.so:net/libpcap
24
25
25
USES=		tar:bzip2 gmake cpe
26
USES=		tar:bzip2 gmake cpe
26
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
27
28
28
OPTIONS_SUB=	yes
29
OPTIONS_SUB=	yes
29
OPTIONS_DEFINE=	DOCS SSL
30
OPTIONS_DEFINE=	DOCS LIBSSH2 SSL
30
OPTIONS_DEFAULT=SSL
31
OPTIONS_DEFAULT=SSL
31
32
32
SSL_USES=		ssl
33
SSL_USES=		ssl
Lines 34-39 Link Here
34
SSL_CONFIGURE_OFF=	--without-openssl
35
SSL_CONFIGURE_OFF=	--without-openssl
35
SSL_CFLAGS=		-I${OPENSSLINC}
36
SSL_CFLAGS=		-I${OPENSSLINC}
36
SSL_VARS=		STRIP_FILES=ncat
37
SSL_VARS=		STRIP_FILES=ncat
38
LIBSSH2_CONFIGURE_ON=	--with-libssh2=${LOCALBASE}
39
LIBSSH2_CONFIGURE_OFF=	--without-libssh2
40
LIBSSH2_DESC=		SSH2 protocol support
41
LIBSSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
37
42
38
DOCS=	CHANGELOG HACKING
43
DOCS=	CHANGELOG HACKING
39
STRIP_FILES+=	nmap nping
44
STRIP_FILES+=	nmap nping
Lines 41-46 Link Here
41
CONFIGURE_ARGS+=--without-localdirs \
46
CONFIGURE_ARGS+=--without-localdirs \
42
		--without-zenmap \
47
		--without-zenmap \
43
		--without-ndiff \
48
		--without-ndiff \
49
		--with-libdnet=included \
50
		--with-libpcap=${LOCALBASE} \
44
		--with-libpcre=${LOCALBASE} \
51
		--with-libpcre=${LOCALBASE} \
45
		--with-liblua=included \
52
		--with-liblua=included \
46
		--without-nmap-update
53
		--without-nmap-update
(-)files/patch-configure (+9 lines)
Lines 18-20 Link Here
18
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19
 $as_echo_n "checking for $ac_word... " >&6; }
19
 $as_echo_n "checking for $ac_word... " >&6; }
20
 if ${ac_cv_prog_CC+:} false; then :
20
 if ${ac_cv_prog_CC+:} false; then :
21
@@ -6801,7 +6801,7 @@ if test "${with_libssh2+set}" = set; the
22
     CPPFLAGS="-I$with_libssh2/include $CPPFLAGS"
23
     LDFLAGS="-L$with_libssh2/lib $LDFLAGS"
24
 
25
-    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "-lm
26
+    ac_fn_c_check_header_compile "$LINENO" "libssh2.h" "ac_cv_header_libssh2_h" "$ac_includes_default
27
 "
28
 if test "x$ac_cv_header_libssh2_h" = xyes; then :
29
 

Return to bug 221522