diff options
author | kevlo <kevlo@FreeBSD.org> | 2005-01-26 04:02:38 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2005-01-26 04:02:38 +0000 |
commit | c18d7e5656a4e6eb517fc9bd061b25a196291376 (patch) | |
tree | caaa97960109d3f932eda2c5b7c9b8cbbb4adf2b /net-mgmt | |
parent | aa4af019759f49743954fd2fd75b04181bad3ca2 (diff) | |
download | FreeBSD-ports-c18d7e5656a4e6eb517fc9bd061b25a196291376.zip FreeBSD-ports-c18d7e5656a4e6eb517fc9bd061b25a196291376.tar.gz |
Update to 1.2
PR: ports/76664
Submitted by: MAINTAINER
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/nfdump-devel/Makefile | 2 | ||||
-rw-r--r-- | net-mgmt/nfdump-devel/distinfo | 4 | ||||
-rw-r--r-- | net-mgmt/nfdump-devel/files/patch-Makefile.in | 57 | ||||
-rw-r--r-- | net-mgmt/nfdump/Makefile | 2 | ||||
-rw-r--r-- | net-mgmt/nfdump/distinfo | 4 | ||||
-rw-r--r-- | net-mgmt/nfdump/files/patch-Makefile.in | 57 |
6 files changed, 50 insertions, 76 deletions
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile index b019b0b..f355840 100644 --- a/net-mgmt/nfdump-devel/Makefile +++ b/net-mgmt/nfdump-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nfdump -PORTVERSION= 1.1 +PORTVERSION= 1.2 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 4a33651..ebdca7c 100644 --- a/net-mgmt/nfdump-devel/distinfo +++ b/net-mgmt/nfdump-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (nfdump-1.1.tar.gz) = b9085f91d64985e856e43200d2869a87 -SIZE (nfdump-1.1.tar.gz) = 92044 +MD5 (nfdump-1.2.tar.gz) = 397bde6d48c41d3818f83d1893c59f69 +SIZE (nfdump-1.2.tar.gz) = 99445 diff --git a/net-mgmt/nfdump-devel/files/patch-Makefile.in b/net-mgmt/nfdump-devel/files/patch-Makefile.in index 99117d5..ffd9d2c 100644 --- a/net-mgmt/nfdump-devel/files/patch-Makefile.in +++ b/net-mgmt/nfdump-devel/files/patch-Makefile.in @@ -1,48 +1,35 @@ $FreeBSD$ ---- Makefile.in.orig Wed Sep 22 09:23:10 2004 -+++ Makefile.in Wed Sep 29 16:31:23 2004 +--- Makefile.in.orig ++++ Makefile.in @@ -47,7 +47,7 @@ LFLAGS = -i LDFLAGS = @LIBS@ - PREFIX = @prefix@ + prefix = @prefix@ -MANDIR = @mandir@ -+MANDIR = @prefix@ - FSRC = grammar.c scanner.c nftree.c netflow_v5.c netflow_v7.c nfstat.c util.c ++MANDIR = @prefix@/man + FSRC = grammar.c scanner.c nftree.c netflow_v5.c launch.c nfstat.c util.c FOBJ = $(FSRC:.c=.o) ASRC = $(FSRC) nfdump.c nftree_check.c nfreplay.c -@@ -82,20 +82,20 @@ +@@ -82,15 +82,15 @@ $(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS) install: $(OBJECTS) -- test -d $(PREFIX) || install -d -o root -g root -m 755 $(PREFIX) -- test -d $(PREFIX)/bin || install -d -o root -g root -m 755 $(PREFIX)/bin -- test -d $(MANDIR)/man || install -d -o root -g root -m 755 $(MANDIR)/man -- test -d $(MANDIR)/man/man1 || install -d -o root -g root -m 755 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 755 nfcapd $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfdump $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfprofile $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfreplay $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfclean.pl $(PREFIX)/bin -+ test -d $(PREFIX) || install -d -o root -g wheel -m 755 $(PREFIX) -+ test -d $(PREFIX)/bin || install -d -o root -g wheel -m 755 $(PREFIX)/bin -+ test -d $(MANDIR)/man || install -d -o root -g wheel -m 755 $(MANDIR)/man -+ test -d $(MANDIR)/man/man1 || install -d -o root -g wheel -m 755 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 755 nfcapd $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfdump $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfprofile $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfreplay $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfclean.pl $(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 ++ test -d $(prefix) || install -d -o root -g wheel -m 755 $(prefix) ++ test -d $(prefix)/bin || install -d -o root -g wheel -m 755 $(prefix)/bin ++ test -d $(MANDIR) || install -d -o root -g wheel -m 755 $(MANDIR) ++ test -d $(MANDIR)/man1 || install -d -o root -g wheel -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 ++ $(INSTALL) -o root -g bin -m 755 nfclean.pl $(prefix)/bin -- $(INSTALL) -o root -g root -m 644 nfcapd.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfdump.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfprofile.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfreplay.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfcapd.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfdump.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfprofile.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfreplay.1 $(MANDIR)/man/man1 - - uninstall: - /bin/rm -f $(PREFIX)/bin/nfcapd + $(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1 + $(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1 diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile index b019b0b..f355840 100644 --- a/net-mgmt/nfdump/Makefile +++ b/net-mgmt/nfdump/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nfdump -PORTVERSION= 1.1 +PORTVERSION= 1.2 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 4a33651..ebdca7c 100644 --- a/net-mgmt/nfdump/distinfo +++ b/net-mgmt/nfdump/distinfo @@ -1,2 +1,2 @@ -MD5 (nfdump-1.1.tar.gz) = b9085f91d64985e856e43200d2869a87 -SIZE (nfdump-1.1.tar.gz) = 92044 +MD5 (nfdump-1.2.tar.gz) = 397bde6d48c41d3818f83d1893c59f69 +SIZE (nfdump-1.2.tar.gz) = 99445 diff --git a/net-mgmt/nfdump/files/patch-Makefile.in b/net-mgmt/nfdump/files/patch-Makefile.in index 99117d5..ffd9d2c 100644 --- a/net-mgmt/nfdump/files/patch-Makefile.in +++ b/net-mgmt/nfdump/files/patch-Makefile.in @@ -1,48 +1,35 @@ $FreeBSD$ ---- Makefile.in.orig Wed Sep 22 09:23:10 2004 -+++ Makefile.in Wed Sep 29 16:31:23 2004 +--- Makefile.in.orig ++++ Makefile.in @@ -47,7 +47,7 @@ LFLAGS = -i LDFLAGS = @LIBS@ - PREFIX = @prefix@ + prefix = @prefix@ -MANDIR = @mandir@ -+MANDIR = @prefix@ - FSRC = grammar.c scanner.c nftree.c netflow_v5.c netflow_v7.c nfstat.c util.c ++MANDIR = @prefix@/man + FSRC = grammar.c scanner.c nftree.c netflow_v5.c launch.c nfstat.c util.c FOBJ = $(FSRC:.c=.o) ASRC = $(FSRC) nfdump.c nftree_check.c nfreplay.c -@@ -82,20 +82,20 @@ +@@ -82,15 +82,15 @@ $(CC) $(CFLAGS) $(INCS) -o $@ nfreplay.o $(FOBJ) $(LDFLAGS) install: $(OBJECTS) -- test -d $(PREFIX) || install -d -o root -g root -m 755 $(PREFIX) -- test -d $(PREFIX)/bin || install -d -o root -g root -m 755 $(PREFIX)/bin -- test -d $(MANDIR)/man || install -d -o root -g root -m 755 $(MANDIR)/man -- test -d $(MANDIR)/man/man1 || install -d -o root -g root -m 755 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 755 nfcapd $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfdump $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfprofile $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfreplay $(PREFIX)/bin -- $(INSTALL) -o root -g root -m 755 nfclean.pl $(PREFIX)/bin -+ test -d $(PREFIX) || install -d -o root -g wheel -m 755 $(PREFIX) -+ test -d $(PREFIX)/bin || install -d -o root -g wheel -m 755 $(PREFIX)/bin -+ test -d $(MANDIR)/man || install -d -o root -g wheel -m 755 $(MANDIR)/man -+ test -d $(MANDIR)/man/man1 || install -d -o root -g wheel -m 755 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 755 nfcapd $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfdump $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfprofile $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfreplay $(PREFIX)/bin -+ $(INSTALL) -o root -g wheel -m 755 nfclean.pl $(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 ++ test -d $(prefix) || install -d -o root -g wheel -m 755 $(prefix) ++ test -d $(prefix)/bin || install -d -o root -g wheel -m 755 $(prefix)/bin ++ test -d $(MANDIR) || install -d -o root -g wheel -m 755 $(MANDIR) ++ test -d $(MANDIR)/man1 || install -d -o root -g wheel -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 ++ $(INSTALL) -o root -g bin -m 755 nfclean.pl $(prefix)/bin -- $(INSTALL) -o root -g root -m 644 nfcapd.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfdump.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfprofile.1 $(MANDIR)/man/man1 -- $(INSTALL) -o root -g root -m 644 nfreplay.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfcapd.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfdump.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfprofile.1 $(MANDIR)/man/man1 -+ $(INSTALL) -o root -g wheel -m 644 nfreplay.1 $(MANDIR)/man/man1 - - uninstall: - /bin/rm -f $(PREFIX)/bin/nfcapd + $(INSTALL) -o root -g bin -m 644 nfcapd.1 $(MANDIR)/man1 + $(INSTALL) -o root -g bin -m 644 nfdump.1 $(MANDIR)/man1 |