net/ipgrab: fix build with clang

- Fix build with clang
- NOPORTDOCS -> PORT_OPTIONS:MDOCS
- Unmute install commands
- Trim Makefile header

Approved by:	culot / jpaetzel (mentors, implicit)
This commit is contained in:
William Grzybowski 2013-06-13 23:46:30 +00:00
parent cd8196b0c2
commit 78e69df3ee
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=320854
2 changed files with 22 additions and 10 deletions

View file

@ -1,9 +1,5 @@
# New ports collection makefile for: ipgrab
# Date created: 23. January 2004
# Whom: Aaron Zauner <az_mail@gmx.at>
#
# Created by: Aaron Zauner <az_mail@gmx.at>
# $FreeBSD$
#
PORTNAME= ipgrab
PORTVERSION= 0.9.10
@ -16,6 +12,7 @@ COMMENT= IPgrab is a verbose packet sniffer for UNIX hosts
BUILD_DEPENDS= ${LOCALBASE}/include/pcap.h:${PORTSDIR}/net/libpcap
GNU_CONFIGURE= yes
USE_CSTD= gnu89
INFO= ipgrab
MAN8= ipgrab.8
DOCS= README AUTHORS COPYING ChangeLog \
@ -26,13 +23,15 @@ PLIST_FILES= bin/ipgrab
PORTDOCS= README AUTHORS COPYING ChangeLog DEVELOPER-HOWTO \
INSTALL NEWS TODO
.include <bsd.port.options.mk>
do-install:
@${INSTALL_MAN} ${MAN8:S,^,${WRKSRC}/doc/,} ${MANPREFIX}/man/man8/
@${INSTALL_DATA} ${WRKSRC}/doc/ipgrab.info ${PREFIX}/info/
@${INSTALL_PROGRAM} ${WRKSRC}/src/ipgrab ${PREFIX}/bin/
.if !defined(NOPORTDOCS)
${INSTALL_MAN} ${MAN8:S,^,${WRKSRC}/doc/,} ${MANPREFIX}/man/man8/
${INSTALL_DATA} ${WRKSRC}/doc/ipgrab.info ${PREFIX}/info/
${INSTALL_PROGRAM} ${WRKSRC}/src/ipgrab ${PREFIX}/bin/
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
.endif
.include <bsd.port.mk>

View file

@ -0,0 +1,13 @@
diff --git src/icmpv6.c src/icmpv6.c
index 90a41cc..9b123ce 100644
--- src/icmpv6.c
+++ src/icmpv6.c
@@ -205,7 +205,7 @@ void dump_icmpv6(packet_t *pkt)
case ICMPV6_TYPE_NEIGHBORSOLICIT:
/* Skip 4 unused bytes */
if ( skip_packet_bytes (pkt,4) == 0 )
- return 0;
+ return;
/* Next 16 bytes are an IPv6 address */
if (get_packet_bytes((u_int8_t *) &v6addr, pkt, 16) == 0)