diff options
| author | wg <wg@FreeBSD.org> | 2013-06-14 07:46:30 +0800 |
|---|---|---|
| committer | wg <wg@FreeBSD.org> | 2013-06-14 07:46:30 +0800 |
| commit | 4f718d7a0fae9ee3321a6be749be0d5bb9f5c127 (patch) | |
| tree | bb3021f5a7a12ff38ebc510f37e7bbc3c00236d7 /net | |
| parent | 44adfa3acede2b23752455ff6cca5996e632bb59 (diff) | |
| download | freebsd-ports-gnome-4f718d7a0fae9ee3321a6be749be0d5bb9f5c127.tar.gz freebsd-ports-gnome-4f718d7a0fae9ee3321a6be749be0d5bb9f5c127.tar.zst freebsd-ports-gnome-4f718d7a0fae9ee3321a6be749be0d5bb9f5c127.zip | |
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)
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipgrab/Makefile | 19 | ||||
| -rw-r--r-- | net/ipgrab/files/patch-src_icmpv6.c | 13 |
2 files changed, 22 insertions, 10 deletions
diff --git a/net/ipgrab/Makefile b/net/ipgrab/Makefile index a601ab701a18..634e51449f92 100644 --- a/net/ipgrab/Makefile +++ b/net/ipgrab/Makefile @@ -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> diff --git a/net/ipgrab/files/patch-src_icmpv6.c b/net/ipgrab/files/patch-src_icmpv6.c new file mode 100644 index 000000000000..2712881b2884 --- /dev/null +++ b/net/ipgrab/files/patch-src_icmpv6.c @@ -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) |