6 files changed, 39 insertions, 17 deletions

diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile
index 87c5c7c9470f..328841d00025 100644
--- a/net-mgmt/tcptrack/Makefile
+++ b/net-mgmt/tcptrack/Makefile
@@ -2,25 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=		tcptrack
-PORTVERSION=		1.3.0
+PORTVERSION=		1.4.2
 CATEGORIES=		net-mgmt
-MASTER_SITES=		http://www.rhythm.cx/~steve/devel/tcptrack/%SUBDIR%/
-MASTER_SITE_SUBDIR=	release/${PORTVERSION}/source
+MASTER_SITES=		http://pkgs.fedoraproject.org/repo/pkgs/tcptrack/tcptrack-1.4.2.tar.gz/dacf71a6b5310caf1203a2171b598610/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	squat@squat.no
 COMMENT=	Packet sniffer which displays TCP information like top(1)
 
 GNU_CONFIGURE=	yes
-
-NO_STAGE=	yes
-PLIST_FILES=	bin/tcptrack
-MAN1=		tcptrack.1
-PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
-
-.if !defined(NOPORTDOCS)
-post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
+USE_GCC=	yes
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/tcptrack/distinfo b/net-mgmt/tcptrack/distinfo
index 693b69afc4cd..15c3132a087e 100644
--- a/net-mgmt/tcptrack/distinfo
+++ b/net-mgmt/tcptrack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcptrack-1.3.0.tar.gz) = a46a5ba3132ebc9a7a98929dcf860cdff7966ba6f144f47ec8399c1c60c2ef2b
-SIZE (tcptrack-1.3.0.tar.gz) = 116725
+SHA256 (tcptrack-1.4.2.tar.gz) = 6607b1e1c778c49d3e8795e119065cf66eb2db28b3255dbc56b1612527107049
+SIZE (tcptrack-1.4.2.tar.gz) = 120569
diff --git a/net-mgmt/tcptrack/files/patch-IPv6Address.cc b/net-mgmt/tcptrack/files/patch-IPv6Address.cc
new file mode 100644
index 000000000000..49f87845dff4
--- /dev/null
+++ b/net-mgmt/tcptrack/files/patch-IPv6Address.cc
@@ -0,0 +1,11 @@
+--- src/IPv6Address.cc.orig	2010-09-28 03:35:16.000000000 +0200
++++ src/IPv6Address.cc	2014-07-18 10:19:48.000000000 +0200
+@@ -7,6 +7,8 @@
+ #include "IPv6Address.h"
+ #include "util.h"
+ 
++#define s6_addr16 __u6_addr.__u6_addr16
++
+ uint16_t IPv6Address::GetShort( int index ) const
+ {
+ 	assert(index >= 0);
diff --git a/net-mgmt/tcptrack/files/patch-headers.h b/net-mgmt/tcptrack/files/patch-headers.h
new file mode 100644
index 000000000000..f27275183eaf
--- /dev/null
+++ b/net-mgmt/tcptrack/files/patch-headers.h
@@ -0,0 +1,10 @@
+--- src/headers.h-orig	2014-07-18 09:58:12.000000000 +0200
++++ src/headers.h	2014-07-18 09:58:31.000000000 +0200
+@@ -120,7 +120,6 @@
+     #define TH_URG 0x20
+     #define TH_ECE 0x40
+     #define TH_CWR 0x80
+-    #define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG|TH_ECE|TH_CWR)
+     u_short th_win; /* window */
+     u_short th_sum; /* checksum */
+     u_short th_urp; /* urgent pointer */
diff --git a/net-mgmt/tcptrack/files/patch-util.cc b/net-mgmt/tcptrack/files/patch-util.cc
new file mode 100644
index 000000000000..e00bc3561db6
--- /dev/null
+++ b/net-mgmt/tcptrack/files/patch-util.cc
@@ -0,0 +1,10 @@
+--- src/util.cc-orig	2014-07-18 09:55:37.000000000 +0200
++++ src/util.cc	2014-07-18 09:56:11.000000000 +0200
+@@ -22,6 +22,7 @@
+ #include "util.h"
+ #include <stdio.h>
+ #include <cstring>
++#include <string>
+ #include "headers.h"
+ #ifdef HAVE_HASH_MAP
+ # include <hash_map>
diff --git a/net-mgmt/tcptrack/pkg-plist b/net-mgmt/tcptrack/pkg-plist
new file mode 100644
index 000000000000..e7e7a35c0841
--- /dev/null
+++ b/net-mgmt/tcptrack/pkg-plist
@@ -0,0 +1,2 @@
+bin/tcptrack
+man/man1/tcptrack.1.gz