Attachment #183776 for bug #220097




# $FreeBSD: head/net-mgmt/ipaudit/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $

PORTNAME=	ipaudit
PORTVERSION=	1.1
CATEGORIES=	net-mgmt sysutils
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	ipaudit/ipaudit

MAINTAINER=	amutu@amutu.com
COMMENT=	IP traffic summarizer

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		tar:tgz
SUB_FILES=	pkg-message

OPTIONS_DEFINE=	DOCS
GNU_CONFIGURE=	yes

post-install:
.for f in ipaudit ipstrings total
	${INSTALL_PROGRAM} ${WRKSRC}/src/${f} ${STAGEDIR}${PREFIX}/bin
.endfor
.for f in ipaudit.1 ipstrings.1 total.1
	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1
.endfor
	${INSTALL_DATA} ${WRKSRC}/src/ipaudit.conf.sample ${STAGEDIR}${PREFIX}/etc

do-install-DOCS-on:

Lines 1-2 Link Here

(-)b/distinfo (-2 / +3 lines)
1	SHA256 (ipaudit-0.95.tgz) = 82c47fba296e93ee50b0a033e0689d4c3fbc08ebd6e1026dcd7f069a05d0e872	1	TIMESTAMP = 1497756455
2	SIZE (ipaudit-0.95.tgz) = 52412	2	SHA256 (ipaudit-1.1.tar.gz) = ef97c9ff232f4e57624643b6b0e99b1951b55bc12d50f9b8b5e10ed267836458
		3	SIZE (ipaudit-1.1.tar.gz) = 170253




--- Makefile.orig	Wed Oct 18 01:38:27 2000
+++ Makefile	Tue Jul 15 18:20:49 2003
@@ -8,10 +8,10 @@
 BIN=ipaudit ipstrings total pdate
 
 MAKE=make
-CIDIR=-I/usr/include/pcap
+#CIDIR=-I/usr/include/pcap
 
 all:
-	$(MAKE) -C src all
+	cd src && $(MAKE) all
 
 clean:
 	$(MAKE) -C src clean




--- src/Makefile.orig	Mon Jan  8 05:56:59 2001
+++ src/Makefile	Tue Jul 15 18:19:58 2003
@@ -1,36 +1,36 @@
-CIDIR=-I/usr/include/pcap
+#CIDIR=-I/usr/include/pcap
 
 #LIB=../../libpcap-0.5/libpcap.a
 LIB=-lpcap
 
-all: ipaudit total ipstrings beta-dir
+all: ipaudit total ipstrings
 
 ipaudit: ipaudit.o hash.o
-	$(CC) -o ipaudit ipaudit.o hash.o $(LIB)
+	$(CC) $(CFLAGS) -o ipaudit ipaudit.o hash.o $(LIB)
 
 total: total.o hash.o
-	$(CC) -o total total.o hash.o -lm
+	$(CC) $(CFLAGS) -o total total.o hash.o -lm
 
 ipstrings: ipstrings.o
-	$(CC) -o ipstrings ipstrings.o $(LIB)
+	$(CC) $(CFLAGS) -o ipstrings ipstrings.o $(LIB)
 
 ipaudit.o: ipaudit.c hash.h
-	$(CC) -c ipaudit.c $(CIDIR) $(DFLAGS)
+	$(CC) $(CFLAGS) -c ipaudit.c $(CIDIR) $(DFLAGS)
 
 hash.o: hash.c hash.h
-	$(CC) -c hash.c
+	$(CC) $(CFLAGS) -c hash.c
 
 total.o: total.c hash.c hash.h
-	$(CC) -c total.c
+	$(CC) $(CFLAGS) -c total.c
 
 ipstrings.o: ipstrings.c
-	$(CC) -c ipstrings.c $(CIDIR) $(DFLAGS)
+	$(CC) $(CFLAGS) -c ipstrings.c $(CIDIR) $(DFLAGS)
 
 iprange: iprange.c
 	$(CC) -g -o iprange iprange.c
 
-beta-dir:
-	$(MAKE) -C beta
+#beta-dir:
+#	$(MAKE) -C beta
 
 clean:
 	rm -f *.o

Removed Link Here

(-)a/files/patch-src__hash.h (-11 lines)
1	--- src/hash.h.orig Tue Jul 15 16:53:16 2003
2	+++ src/hash.h Tue Jul 15 16:53:49 2003
3	@@ -1,6 +1,8 @@
4	#ifndef _HASH_H
5	#define _HASH_H
6
7	+#include <sys/types.h>
8	+
9	/*
10	------------------------------------------------------------------------
11	Type Definitions

Added Link Here

(-)b/files/patch-src_ipaudit.conf.sample (+11 lines)
1	--- src/ipaudit.conf.sample.orig 2017-06-18 04:09:55 UTC
2	+++ src/ipaudit.conf.sample
3	@@ -0,0 +1,8 @@
4	+#
5	+# test configuration file for ipaudit
6	+#
7	+# interface lo eth0
8	+interface lo eth0
9	+writetime on
10	+icmptype on
11	+# saveport 1:6,21,23,111,6667,65301

Lines 1-8 Link Here

(-)b/pkg-plist (-4 / +5 lines)
1	bin/ipaudit	1	bin/makelocal
2	bin/ipstrings
3	bin/total	2	bin/total
4	etc/ipaudit.conf.sample	3	etc/ipaudit.conf.sample
5	man/man1/ipaudit.1.gz
6	man/man1/ipstrings.1.gz
7	man/man1/total.1.gz	4	man/man1/total.1.gz
		5	man/man8/ipaudit.8.gz
		6	man/man8/ipstrings.8.gz
		7	sbin/ipaudit
		8	sbin/ipstrings
8	%%PORTDOCS%%%%DOCSDIR%%/README	9	%%PORTDOCS%%%%DOCSDIR%%/README

Return to bug 220097

Lines 2-29 Link Here

(-)b/Makefile (-11 / +6 lines)
2	# $FreeBSD: head/net-mgmt/ipaudit/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $	2	# $FreeBSD: head/net-mgmt/ipaudit/Makefile 405891 2016-01-12 16:20:31Z amdmi3 $
3		3
4	PORTNAME= ipaudit	4	PORTNAME= ipaudit
5	PORTVERSION= 0.95	5	PORTVERSION= 1.1
6	CATEGORIES= net-mgmt sysutils	6	CATEGORIES= net-mgmt sysutils
7	MASTER_SITES= http://ipaudit.sourceforge.net/download/	7	MASTER_SITES= SF
		8	MASTER_SITE_SUBDIR= ipaudit/ipaudit
8		9
9	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= amutu@amutu.com
10	COMMENT= IP traffic summarizer	11	COMMENT= IP traffic summarizer
11		12
12	LICENSE= GPLv2+	13	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
15	USES= tar:tgz
16	SUB_FILES= pkg-message	16	SUB_FILES= pkg-message
17		17
18	OPTIONS_DEFINE= DOCS	18	OPTIONS_DEFINE= DOCS
		19	GNU_CONFIGURE= yes
19		20
20	do-install:	21	post-install:
21	.for f in ipaudit ipstrings total
22	${INSTALL_PROGRAM} ${WRKSRC}/src/${f} ${STAGEDIR}${PREFIX}/bin
23	.endfor
24	.for f in ipaudit.1 ipstrings.1 total.1
25	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1
26	.endfor
27	${INSTALL_DATA} ${WRKSRC}/src/ipaudit.conf.sample ${STAGEDIR}${PREFIX}/etc	22	${INSTALL_DATA} ${WRKSRC}/src/ipaudit.conf.sample ${STAGEDIR}${PREFIX}/etc
28		23
29	do-install-DOCS-on:	24	do-install-DOCS-on:

Removed Link Here

(-)a/files/patch-Makefile (-15 lines)
1	--- Makefile.orig Wed Oct 18 01:38:27 2000
2	+++ Makefile Tue Jul 15 18:20:49 2003
3	@@ -8,10 +8,10 @@
4	BIN=ipaudit ipstrings total pdate
5
6	MAKE=make
7	-CIDIR=-I/usr/include/pcap
8	+#CIDIR=-I/usr/include/pcap
9
10	all:
11	- $(MAKE) -C src all
12	+ cd src && $(MAKE) all
13
14	clean:
15	$(MAKE) -C src clean

Removed Link Here

(-)a/files/patch-src__Makefile (-50 lines)
1	--- src/Makefile.orig Mon Jan 8 05:56:59 2001
2	+++ src/Makefile Tue Jul 15 18:19:58 2003
3	@@ -1,36 +1,36 @@
4	-CIDIR=-I/usr/include/pcap
5	+#CIDIR=-I/usr/include/pcap
6
7	#LIB=../../libpcap-0.5/libpcap.a
8	LIB=-lpcap
9
10	-all: ipaudit total ipstrings beta-dir
11	+all: ipaudit total ipstrings
12
13	ipaudit: ipaudit.o hash.o
14	- $(CC) -o ipaudit ipaudit.o hash.o $(LIB)
15	+ $(CC) $(CFLAGS) -o ipaudit ipaudit.o hash.o $(LIB)
16
17	total: total.o hash.o
18	- $(CC) -o total total.o hash.o -lm
19	+ $(CC) $(CFLAGS) -o total total.o hash.o -lm
20
21	ipstrings: ipstrings.o
22	- $(CC) -o ipstrings ipstrings.o $(LIB)
23	+ $(CC) $(CFLAGS) -o ipstrings ipstrings.o $(LIB)
24
25	ipaudit.o: ipaudit.c hash.h
26	- $(CC) -c ipaudit.c $(CIDIR) $(DFLAGS)
27	+ $(CC) $(CFLAGS) -c ipaudit.c $(CIDIR) $(DFLAGS)
28
29	hash.o: hash.c hash.h
30	- $(CC) -c hash.c
31	+ $(CC) $(CFLAGS) -c hash.c
32
33	total.o: total.c hash.c hash.h
34	- $(CC) -c total.c
35	+ $(CC) $(CFLAGS) -c total.c
36
37	ipstrings.o: ipstrings.c
38	- $(CC) -c ipstrings.c $(CIDIR) $(DFLAGS)
39	+ $(CC) $(CFLAGS) -c ipstrings.c $(CIDIR) $(DFLAGS)
40
41	iprange: iprange.c
42	$(CC) -g -o iprange iprange.c
43
44	-beta-dir:
45	- $(MAKE) -C beta
46	+#beta-dir:
47	+# $(MAKE) -C beta
48
49	clean:
50	rm -f *.o