Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 28 Dec 2016 11:38:12 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429739 - in head/net/ntraceroute: . files
Message-ID:  <201612281138.uBSBcCQT065769@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mat
Date: Wed Dec 28 11:38:12 2016
New Revision: 429739
URL: https://svnweb.freebsd.org/changeset/ports/429739

Log:
  Really fix on 11+.
  
  PR:		212283
  Submitted by:	ae
  Sponsored by:	Absolight

Modified:
  head/net/ntraceroute/Makefile   (contents, props changed)
  head/net/ntraceroute/files/patch-traceroute.c   (contents, props changed)

Modified: head/net/ntraceroute/Makefile
==============================================================================
--- head/net/ntraceroute/Makefile	Wed Dec 28 11:25:02 2016	(r429738)
+++ head/net/ntraceroute/Makefile	Wed Dec 28 11:38:12 2016	(r429739)
@@ -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: head/net/ntraceroute/files/patch-traceroute.c
==============================================================================
--- head/net/ntraceroute/files/patch-traceroute.c	Wed Dec 28 11:25:02 2016	(r429738)
+++ head/net/ntraceroute/files/patch-traceroute.c	Wed Dec 28 11:38:12 2016	(r429739)
@@ -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?201612281138.uBSBcCQT065769>