Update to 1.4

PR:		ports/85846
Submitted by:	maintainer

6 files changed, 50 insertions, 44 deletions

diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 414001c..0bee8a8 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfdump
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/nfdump-devel/distinfo b/net-mgmt/nfdump-devel/distinfo
index 0bb5c99..e5a914e 100644
--- a/net-mgmt/nfdump-devel/distinfo
+++ b/net-mgmt/nfdump-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (nfdump-1.3.tar.gz) = cabb61ede2d221a5b4736082c9b2b2f9
-SIZE (nfdump-1.3.tar.gz) = 101350
+MD5 (nfdump-1.4.tar.gz) = f86527c65d4c0fa7a60d14dc34d32a6f
+SIZE (nfdump-1.4.tar.gz) = 147000
diff --git a/net-mgmt/nfdump-devel/files/patch-Makefile.in b/net-mgmt/nfdump-devel/files/patch-Makefile.in
index 263ffad..9ad6def 100644
--- a/net-mgmt/nfdump-devel/files/patch-Makefile.in
+++ b/net-mgmt/nfdump-devel/files/patch-Makefile.in
@@ -1,23 +1,26 @@
---- Makefile.in.orig	Thu Apr 21 08:59:14 2005
-+++ Makefile.in	Fri Jul 29 18:59:39 2005
-@@ -82,20 +82,16 @@
- 	$(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS)
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -89,20 +89,16 @@
+ 	$(CC) $(CFLAGS) -o $@ $(FT2NF_OBJ) $(FT_LDFLAGS) $(FT_LIBS)
  
  install: $(OBJECTS)
--	test -d $(prefix) || install -d -o root -g bin -m 755 $(prefix)
--	test -d $(prefix)/bin || install -d -o root -g bin -m 755 $(prefix)/bin
+-	test -d $(PREFIX) || install -d -o root -g bin -m 755 $(PREFIX)
+-	test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
 -	test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
 -	test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
--	$(INSTALL) -o root -g bin -m 755 nfcapd $(prefix)/bin
--	$(INSTALL) -o root -g bin -m 755 nfdump $(prefix)/bin 
--	$(INSTALL) -o root -g bin -m 755 nfprofile $(prefix)/bin
--	$(INSTALL) -o root -g bin -m 755 nfreplay $(prefix)/bin
--	test -f $(prefix)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfcapd $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfdump $(prefix)/bin 
-+	$(BSD_INSTALL_PROGRAM) nfprofile $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfreplay $(prefix)/bin
-+	$(BSD_INSTALL_SCRIPT) nfclean.pl $(prefix)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfcapd $(PREFIX)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfdump $(PREFIX)/bin 
+-	$(INSTALL) -o root -g bin -m 755 nfprofile $(PREFIX)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfreplay $(PREFIX)/bin
+-	test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfcapd $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfdump $(PREFIX)/bin 
++	$(BSD_INSTALL_PROGRAM) nfprofile $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfreplay $(PREFIX)/bin
++	$(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
  
 -	$(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
 -	$(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
@@ -27,6 +30,6 @@
 +	$(BSD_INSTALL_MAN) nfdump.1 $(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) nfprofile.1 $(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) nfreplay.1 $(MANDIR)/man1
- 
- uninstall:
- 	/bin/rm -f  $(prefix)/bin/nfcapd
+ 	if test -f ft2nfdump; then \
+ 		$(INSTALL) -o root -g bin -m 755 ft2nfdump $(PREFIX)/bin;   \
+ 		$(INSTALL) -o root -g bin -m 644 ft2nfdump.1 $(MANDIR)/man1;    \
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 414001c..0bee8a8 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nfdump
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-mgmt/nfdump/distinfo b/net-mgmt/nfdump/distinfo
index 0bb5c99..e5a914e 100644
--- a/net-mgmt/nfdump/distinfo
+++ b/net-mgmt/nfdump/distinfo
@@ -1,2 +1,2 @@
-MD5 (nfdump-1.3.tar.gz) = cabb61ede2d221a5b4736082c9b2b2f9
-SIZE (nfdump-1.3.tar.gz) = 101350
+MD5 (nfdump-1.4.tar.gz) = f86527c65d4c0fa7a60d14dc34d32a6f
+SIZE (nfdump-1.4.tar.gz) = 147000
diff --git a/net-mgmt/nfdump/files/patch-Makefile.in b/net-mgmt/nfdump/files/patch-Makefile.in
index 263ffad..9ad6def 100644
--- a/net-mgmt/nfdump/files/patch-Makefile.in
+++ b/net-mgmt/nfdump/files/patch-Makefile.in
@@ -1,23 +1,26 @@
---- Makefile.in.orig	Thu Apr 21 08:59:14 2005
-+++ Makefile.in	Fri Jul 29 18:59:39 2005
-@@ -82,20 +82,16 @@
- 	$(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS)
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -89,20 +89,16 @@
+ 	$(CC) $(CFLAGS) -o $@ $(FT2NF_OBJ) $(FT_LDFLAGS) $(FT_LIBS)
  
  install: $(OBJECTS)
--	test -d $(prefix) || install -d -o root -g bin -m 755 $(prefix)
--	test -d $(prefix)/bin || install -d -o root -g bin -m 755 $(prefix)/bin
+-	test -d $(PREFIX) || install -d -o root -g bin -m 755 $(PREFIX)
+-	test -d $(PREFIX)/bin || install -d -o root -g bin -m 755 $(PREFIX)/bin
 -	test -d $(MANDIR) || install -d -o root -g bin -m 755 $(MANDIR)
 -	test -d $(MANDIR)/man1 || install -d -o root -g bin -m 755 $(MANDIR)/man1
--	$(INSTALL) -o root -g bin -m 755 nfcapd $(prefix)/bin
--	$(INSTALL) -o root -g bin -m 755 nfdump $(prefix)/bin 
--	$(INSTALL) -o root -g bin -m 755 nfprofile $(prefix)/bin
--	$(INSTALL) -o root -g bin -m 755 nfreplay $(prefix)/bin
--	test -f $(prefix)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfcapd $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfdump $(prefix)/bin 
-+	$(BSD_INSTALL_PROGRAM) nfprofile $(prefix)/bin
-+	$(BSD_INSTALL_PROGRAM) nfreplay $(prefix)/bin
-+	$(BSD_INSTALL_SCRIPT) nfclean.pl $(prefix)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfcapd $(PREFIX)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfdump $(PREFIX)/bin 
+-	$(INSTALL) -o root -g bin -m 755 nfprofile $(PREFIX)/bin
+-	$(INSTALL) -o root -g bin -m 755 nfreplay $(PREFIX)/bin
+-	test -f $(PREFIX)/bin/nfclean.pl || $(INSTALL) -o root -g bin -m 755 nfclean.pl $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfcapd $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfdump $(PREFIX)/bin 
++	$(BSD_INSTALL_PROGRAM) nfprofile $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) nfreplay $(PREFIX)/bin
++	$(BSD_INSTALL_SCRIPT) nfclean.pl $(PREFIX)/bin
  
 -	$(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1
 -	$(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1
@@ -27,6 +30,6 @@
 +	$(BSD_INSTALL_MAN) nfdump.1 $(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) nfprofile.1 $(MANDIR)/man1
 +	$(BSD_INSTALL_MAN) nfreplay.1 $(MANDIR)/man1
- 
- uninstall:
- 	/bin/rm -f  $(prefix)/bin/nfcapd
+ 	if test -f ft2nfdump; then \
+ 		$(INSTALL) -o root -g bin -m 755 ft2nfdump $(PREFIX)/bin;   \
+ 		$(INSTALL) -o root -g bin -m 644 ft2nfdump.1 $(MANDIR)/man1;    \