10 files changed, 78 insertions, 42 deletions

diff --git a/net-mgmt/nitpicker/Makefile b/net-mgmt/nitpicker/Makefile
index 6faf15cda89b..de508ffa5e74 100644
--- a/net-mgmt/nitpicker/Makefile
+++ b/net-mgmt/nitpicker/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	nitpicker
-PORTVERSION=	1.23
+PORTVERSION=	1.2.1
+PORTEPOCH=1
 CATEGORIES=	net
 MASTER_SITES=	http://nitpicker.de/
-DISTNAME= Nitpicker-${PORTVERSION}
 
 MAINTAINER=	mr@freebsd.org
 COMMENT=	IP flow Accounting tools
 
-WRKSRC= ${WRKDIR}/Nitpicker
-
 NO_MAN= YES
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nitpicker/distinfo b/net-mgmt/nitpicker/distinfo
index ff9a90058730..eea8c58475d8 100644
--- a/net-mgmt/nitpicker/distinfo
+++ b/net-mgmt/nitpicker/distinfo
@@ -1 +1 @@
-MD5 (Nitpicker-1.23.tar.gz) = 55996ce0cb4017bdf91e31ed64fb5da6
+MD5 (nitpicker-1.2.1.tar.gz) = 6f98aca85dcaea8ab3d15f2fcf652521
diff --git a/net-mgmt/nitpicker/files/patch-aa b/net-mgmt/nitpicker/files/patch-aa
index 45772b6bfb55..7908156382cc 100644
--- a/net-mgmt/nitpicker/files/patch-aa
+++ b/net-mgmt/nitpicker/files/patch-aa
@@ -1,7 +1,13 @@
---- Makefile.old	Thu May 22 23:59:01 2003
-+++ Makefile	Thu May 22 23:59:04 2003
-@@ -1,3 +1,3 @@
--TARGET: tools nitpicker
-+all: tools nitpicker
+--- src/Makefile.orig	Sat Aug 23 10:37:21 2003
++++ src/Makefile	Sat Aug 23 10:38:52 2003
+@@ -1,8 +1,8 @@
+ TARGET = nitpicker 
  
- tools: dumpit parse_flowfile
+-CC = gcc
++CC = cc
+ INCLUDES = -I../include -I/usr/pkg/include -I..
+ LIBS     = -lpcap
+-CFLAGS   = -pg -Wall -g $(INCLUDES) -pthread 
++CFLAGS   += $(INCLUDES) -pthread 
+ PREFIX   = /usr/local/
+ INCDIR= ${.CURDIR}/../include
diff --git a/net-mgmt/nitpicker/files/patch-ab b/net-mgmt/nitpicker/files/patch-ab
index 31fe3d52f56f..f91dd794e110 100644
--- a/net-mgmt/nitpicker/files/patch-ab
+++ b/net-mgmt/nitpicker/files/patch-ab
@@ -1,10 +1,11 @@
---- tools/parse_flowfile/Makefile.old	Thu May 22 23:59:52 2003
-+++ tools/parse_flowfile/Makefile	Fri May 23 00:00:16 2003
-@@ -4,4 +4,7 @@
- 	@cd src; make all;
- 
-+install:
-+	@cd src; make install
-+
- clean:
- 	@cd src; make clean;
+--- tools/parse_flowfile/src/Makefile.orig	Sat Aug 23 10:41:23 2003
++++ tools/parse_flowfile/src/Makefile	Sat Aug 23 10:42:27 2003
+@@ -3,6 +3,6 @@
+ LIBS     = 
+ INCLUDES = -I../include -I../../../include
+-CFLAGS   = -Wall -g $(INCLUDES)
+-CC = g++
++CFLAGS   += $(INCLUDES)
++CC = c++
+ INCDIR= ${.CURDIR}/../include
+ .PATH: ${INCDIR}
diff --git a/net-mgmt/nitpicker/files/patch-ad b/net-mgmt/nitpicker/files/patch-ad
new file mode 100644
index 000000000000..d2247c99b8b2
--- /dev/null
+++ b/net-mgmt/nitpicker/files/patch-ad
@@ -0,0 +1,13 @@
+--- tools/dumpit/Makefile.orig	Sat Aug 23 19:34:32 2003
++++ tools/dumpit/Makefile	Sat Aug 23 19:35:43 2003
+@@ -1,8 +1,7 @@
+ TARGET = dumpit
+ 
+-CC = gcc
++CC = cc
+ INCLUDES = -I../../include -I/usr/pkg/include
+-CFLAGS   = -Wall -g $(INCLUDES) 
+-PREFIX   = /usr/local
++CFLAGS   += $(INCLUDES) 
+ 
+ #CFLAGS += -DDEBUG	# Debugging
diff --git a/net/nitpicker/Makefile b/net/nitpicker/Makefile
index 6faf15cda89b..de508ffa5e74 100644
--- a/net/nitpicker/Makefile
+++ b/net/nitpicker/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	nitpicker
-PORTVERSION=	1.23
+PORTVERSION=	1.2.1
+PORTEPOCH=1
 CATEGORIES=	net
 MASTER_SITES=	http://nitpicker.de/
-DISTNAME= Nitpicker-${PORTVERSION}
 
 MAINTAINER=	mr@freebsd.org
 COMMENT=	IP flow Accounting tools
 
-WRKSRC= ${WRKDIR}/Nitpicker
-
 NO_MAN= YES
 
 .include <bsd.port.mk>
diff --git a/net/nitpicker/distinfo b/net/nitpicker/distinfo
index ff9a90058730..eea8c58475d8 100644
--- a/net/nitpicker/distinfo
+++ b/net/nitpicker/distinfo
@@ -1 +1 @@
-MD5 (Nitpicker-1.23.tar.gz) = 55996ce0cb4017bdf91e31ed64fb5da6
+MD5 (nitpicker-1.2.1.tar.gz) = 6f98aca85dcaea8ab3d15f2fcf652521
diff --git a/net/nitpicker/files/patch-aa b/net/nitpicker/files/patch-aa
index 45772b6bfb55..7908156382cc 100644
--- a/net/nitpicker/files/patch-aa
+++ b/net/nitpicker/files/patch-aa
@@ -1,7 +1,13 @@
---- Makefile.old	Thu May 22 23:59:01 2003
-+++ Makefile	Thu May 22 23:59:04 2003
-@@ -1,3 +1,3 @@
--TARGET: tools nitpicker
-+all: tools nitpicker
+--- src/Makefile.orig	Sat Aug 23 10:37:21 2003
++++ src/Makefile	Sat Aug 23 10:38:52 2003
+@@ -1,8 +1,8 @@
+ TARGET = nitpicker 
  
- tools: dumpit parse_flowfile
+-CC = gcc
++CC = cc
+ INCLUDES = -I../include -I/usr/pkg/include -I..
+ LIBS     = -lpcap
+-CFLAGS   = -pg -Wall -g $(INCLUDES) -pthread 
++CFLAGS   += $(INCLUDES) -pthread 
+ PREFIX   = /usr/local/
+ INCDIR= ${.CURDIR}/../include
diff --git a/net/nitpicker/files/patch-ab b/net/nitpicker/files/patch-ab
index 31fe3d52f56f..f91dd794e110 100644
--- a/net/nitpicker/files/patch-ab
+++ b/net/nitpicker/files/patch-ab
@@ -1,10 +1,11 @@
---- tools/parse_flowfile/Makefile.old	Thu May 22 23:59:52 2003
-+++ tools/parse_flowfile/Makefile	Fri May 23 00:00:16 2003
-@@ -4,4 +4,7 @@
- 	@cd src; make all;
- 
-+install:
-+	@cd src; make install
-+
- clean:
- 	@cd src; make clean;
+--- tools/parse_flowfile/src/Makefile.orig	Sat Aug 23 10:41:23 2003
++++ tools/parse_flowfile/src/Makefile	Sat Aug 23 10:42:27 2003
+@@ -3,6 +3,6 @@
+ LIBS     = 
+ INCLUDES = -I../include -I../../../include
+-CFLAGS   = -Wall -g $(INCLUDES)
+-CC = g++
++CFLAGS   += $(INCLUDES)
++CC = c++
+ INCDIR= ${.CURDIR}/../include
+ .PATH: ${INCDIR}
diff --git a/net/nitpicker/files/patch-ad b/net/nitpicker/files/patch-ad
new file mode 100644
index 000000000000..d2247c99b8b2
--- /dev/null
+++ b/net/nitpicker/files/patch-ad
@@ -0,0 +1,13 @@
+--- tools/dumpit/Makefile.orig	Sat Aug 23 19:34:32 2003
++++ tools/dumpit/Makefile	Sat Aug 23 19:35:43 2003
+@@ -1,8 +1,7 @@
+ TARGET = dumpit
+ 
+-CC = gcc
++CC = cc
+ INCLUDES = -I../../include -I/usr/pkg/include
+-CFLAGS   = -Wall -g $(INCLUDES) 
+-PREFIX   = /usr/local
++CFLAGS   += $(INCLUDES) 
+ 
+ #CFLAGS += -DDEBUG	# Debugging