- Update to 1.2.0

Release topics:
- 802.1q VLAN support
- Fixes for compiling on gcc 4.1+

PR:		ports107034
Submitted by:	Tor Halvard Furulund <squat@squat.no> (maintainer)

4 files changed, 6 insertions, 58 deletions

diff --git a/net-mgmt/tcptrack/Makefile b/net-mgmt/tcptrack/Makefile
index a36ba85b914b..c3d642ef7027 100644
--- a/net-mgmt/tcptrack/Makefile
+++ b/net-mgmt/tcptrack/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=		tcptrack
-PORTVERSION=		1.1.5
+PORTVERSION=		1.2.0
 CATEGORIES=		net-mgmt
-MASTER_SITES=		http://www.rhythm.cx/~steve/devel/tcptrack/
-MASTER_SITE_SUBDIR=	release/${PORTVERSION}/source/
+MASTER_SITES=		http://www.rhythm.cx/~steve/devel/tcptrack/%SUBDIR%/
+MASTER_SITE_SUBDIR=	release/${PORTVERSION}/source
 
 MAINTAINER=	squat@squat.no
 COMMENT=	Packet sniffer which displays TCP information like top(1)
diff --git a/net-mgmt/tcptrack/distinfo b/net-mgmt/tcptrack/distinfo
index a4c775ea2793..53e38c6a5d6f 100644
--- a/net-mgmt/tcptrack/distinfo
+++ b/net-mgmt/tcptrack/distinfo
@@ -1,3 +1,3 @@
-MD5 (tcptrack-1.1.5.tar.gz) = ae360bede47cbfd75cae4eeaac90e8ed
-SHA256 (tcptrack-1.1.5.tar.gz) = 7eb0bac5f6af12cad3d74ba89a957f5df62d1689345deb4ac4ca6b6fa8b82fcd
-SIZE (tcptrack-1.1.5.tar.gz) = 113384
+MD5 (tcptrack-1.2.0.tar.gz) = cb7ae4a9d573933732c84ebbe6f0ccda
+SHA256 (tcptrack-1.2.0.tar.gz) = f86c1006d8a43ae4dd6232d900c43471cde20faf232cbbe8f07dbeb2c570bb62
+SIZE (tcptrack-1.2.0.tar.gz) = 114077
diff --git a/net-mgmt/tcptrack/files/patch-src-IPv4Address.h b/net-mgmt/tcptrack/files/patch-src-IPv4Address.h
deleted file mode 100644
index 0fec03d06b1a..000000000000
--- a/net-mgmt/tcptrack/files/patch-src-IPv4Address.h
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u src/IPv4Address.h.orig src/IPv4Address.h
---- src/IPv4Address.h.orig	Sat Dec 16 00:42:10 2006
-+++ src/IPv4Address.h	Sat Dec 16 00:42:51 2006
-@@ -13,7 +13,7 @@
- 	IPv4Address(IPv4Address &na) { a=na.toStruct(); }
- 	bool operator==( const IPv4Address & ) const;
- 	bool operator!=( const IPv4Address & ) const;
--	char * IPv4Address::ptr() const;
-+	char * ptr() const;
- 	friend ostream & operator<<( ostream &, const IPv4Address &);
- 	struct in_addr toStruct() const;
- private:
diff --git a/net-mgmt/tcptrack/files/patch-src-TCPPacket.h b/net-mgmt/tcptrack/files/patch-src-TCPPacket.h
deleted file mode 100644
index 427397f9abd6..000000000000
--- a/net-mgmt/tcptrack/files/patch-src-TCPPacket.h
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -u src/TCPPacket.h.orig src/TCPPacket.h
---- src/TCPPacket.h.orig	Sat Dec 16 00:56:26 2006
-+++ src/TCPPacket.h	Sat Dec 16 00:59:55 2006
-@@ -29,24 +29,24 @@
- class TCPPacket
- {
- public:
--	TCPPacket::TCPPacket( const u_char *data, unsigned int data_len );
--	TCPPacket::TCPPacket( TCPPacket & orig );
--	seq_t TCPPacket::getSeq() const;
--	seq_t TCPPacket::getAck() const;
-+	TCPPacket( const u_char *data, unsigned int data_len );
-+	TCPPacket( TCPPacket & orig );
-+	seq_t getSeq() const;
-+	seq_t getAck() const;
- 	bool isFlagSet(unsigned int);
- 	unsigned short headerLen() const { return header_len; };
-
- 	portnum_t srcPort() const;
- 	portnum_t dstPort() const;
-
--	bool TCPPacket::fin() const;
--	bool TCPPacket::syn() const;
--	bool TCPPacket::rst() const;
--	bool TCPPacket::psh() const;
--	bool TCPPacket::ack() const;
--	bool TCPPacket::urg() const;
--	bool TCPPacket::ece() const;
--	bool TCPPacket::cwr() const;
-+	bool fin() const;
-+	bool syn() const;
-+	bool rst() const;
-+	bool psh() const;
-+	bool ack() const;
-+	bool urg() const;
-+	bool ece() const;
-+	bool cwr() const;
-
- 	friend ostream & operator<<( ostream &, const TCPPacket &);
- private: