Date: Wed, 28 Dec 2016 11:40:00 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r429740 - in branches/2016Q4/net/ntraceroute: . files Message-ID: <201612281140.uBSBe0ls065992@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Dec 28 11:40:00 2016 New Revision: 429740 URL: https://svnweb.freebsd.org/changeset/ports/429740 Log: MFH: r429739 Really fix on 11+. PR: 212283 Submitted by: ae Sponsored by: Absolight Modified: branches/2016Q4/net/ntraceroute/Makefile branches/2016Q4/net/ntraceroute/files/patch-traceroute.c Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net/ntraceroute/Makefile ============================================================================== --- branches/2016Q4/net/ntraceroute/Makefile Wed Dec 28 11:38:12 2016 (r429739) +++ branches/2016Q4/net/ntraceroute/Makefile Wed Dec 28 11:40:00 2016 (r429740) @@ -3,7 +3,7 @@ PORTNAME= ntraceroute PORTVERSION= 6.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= NETBSD/traceroute-nanog \ http://mirrors.rit.edu/zi/ @@ -22,11 +22,17 @@ EXTRACT_AFTER_ARGS= . PLIST_FILES= sbin/${PORTNAME} +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 1100030 +BUILD_FLAGS= -DBYTESWAP_IP_FLAGS -DBYTESWAP_IP_LEN +.endif + do-build: - ${CC} -o ${WRKSRC}/${PORTNAME} -lm \ + ${CC} ${BUILD_FLAGS} -o ${WRKSRC}/${PORTNAME} -lm \ ${WRKSRC}/${DISTFILES} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: branches/2016Q4/net/ntraceroute/files/patch-traceroute.c ============================================================================== --- branches/2016Q4/net/ntraceroute/files/patch-traceroute.c Wed Dec 28 11:38:12 2016 (r429739) +++ branches/2016Q4/net/ntraceroute/files/patch-traceroute.c Wed Dec 28 11:40:00 2016 (r429740) @@ -1,17 +1,5 @@ --- traceroute.c.orig 2016-09-02 21:07:07 UTC +++ traceroute.c -@@ -2,6 +2,11 @@ - /* - * STILL BROKEN: traceroute -g on linux (LSRR) - */ -+#include <string.h> -+#if __FreeBSD_version >= 1100030 -+#define BYTESWAP_IP_FLAGS -+#define BYTESWAP_IP_LEN -+#endif - #define TRACE_TOS 1 - #define SPRAY - #define FIXT @@ -798,7 +803,7 @@ struct opacket { struct icmp icmp_probe; } ip_payload;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612281140.uBSBe0ls065992>