Update to version 2.2.0.

PR:		19690
Submitted by:	maintainer

7 files changed, 74 insertions, 8 deletions

diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 587c7043f079..481ea414d7e2 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	iplog
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
@@ -22,16 +22,25 @@ GNU_CONFIGURE=	yes
 MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX}"
 USE_GMAKE=	yes
 
-MAN5=	iplog.rules.5
+MAN5=	iplog.conf.5
 MAN8=	iplog.8
 
 .include <bsd.port.pre.mk>
 
 post-install:
-	strip ${PREFIX}/sbin/iplog
-.if !exists(${PREFIX}/etc/iplog.rules)
-	${CP} ${WRKSRC}/example-iplog.rules ${PREFIX}/etc/iplog.rules
+	@strip ${PREFIX}/sbin/iplog
+.if !exists(${PREFIX}/etc/iplog.conf)
+	@${CP} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc/iplog.conf
+.else
+	@echo
+	@echo "============================================================================"
+	@echo "Hint:	iplog changed its configuration file from ${PREFIX}/etc/iplog.rules"
+	@echo "	to ${PREFIX}/etc/iplog.conf"
+	@echo
+	@echo "See ${PREFIX}/etc/example-iplog.conf for an example"
+	@echo "============================================================================"
+	@echo
 .endif
-	${CP} ${WRKSRC}/example-iplog.rules ${PREFIX}/etc/iplog.rules.sample
+	@${CP} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc/example-iplog.conf
 
 .include <bsd.port.post.mk>
diff --git a/net/iplog/distinfo b/net/iplog/distinfo
index 34765da081f2..5fda1ba65f4b 100644
--- a/net/iplog/distinfo
+++ b/net/iplog/distinfo
@@ -1 +1 @@
-MD5 (iplog-2.1.1.tar.gz) = 4ef5db56ed6b7ef0955ef658d44dcf88
+MD5 (iplog-2.2.0.tar.gz) = ca906ef470c4313fe622d0a545a16cfe
diff --git a/net/iplog/files/patch-aa b/net/iplog/files/patch-aa
new file mode 100644
index 000000000000..97ea606ece18
--- /dev/null
+++ b/net/iplog/files/patch-aa
@@ -0,0 +1,24 @@
+--- example-iplog.conf.orig	Mon Jul  3 20:32:42 2000
++++ example-iplog.conf	Tue Jul  4 08:45:51 2000
+@@ -2,7 +2,7 @@
+ ** $Id: patch-aa,v 1.2 2000/07/04 06:46:42 ust Exp $
+ **
+ ** Example iplog configuration file.
+-** Edit me and copy me to /etc/iplog.conf
++** Edit me and copy me to /usr/local/etc/iplog.conf
+ **
+ ** See iplog.conf(5) for details on syntax and a full description
+ ** of available options.
+@@ -33,10 +33,10 @@
+ set ignore_dns
+ 
+ # Listen on eth0 and eth1
+-interface eth0,eth1
++# interface xl0,xl1
+ 
+ # Operate in promiscuous mode and watch the 192.168.0.x network
+-promisc 192.168.0.0/24
++# promisc 192.168.0.0/24
+ 
+ /*
+ ** Ignore DNS traffic from nameservers.
diff --git a/net/iplog/files/patch-ab b/net/iplog/files/patch-ab
new file mode 100644
index 000000000000..f0a5658f8838
--- /dev/null
+++ b/net/iplog/files/patch-ab
@@ -0,0 +1,11 @@
+--- iplog.8.orig	Fri Jun 30 22:31:43 2000
++++ iplog.8	Tue Jul  4 08:05:29 2000
+@@ -355,7 +355,7 @@
+ 
+ .SH FILES
+ .TP
+-.B /etc/iplog.conf
++.B /usr/local/etc/iplog.conf
+ The
+ .B iplog
+ configuration file.
diff --git a/net/iplog/files/patch-ac b/net/iplog/files/patch-ac
new file mode 100644
index 000000000000..6e310f574f89
--- /dev/null
+++ b/net/iplog/files/patch-ac
@@ -0,0 +1,11 @@
+--- iplog.conf.5.orig	Mon Jul  3 20:32:42 2000
++++ iplog.conf.5	Tue Jul  4 08:05:47 2000
+@@ -19,7 +19,7 @@
+ .SH DESCRIPTION
+ 
+ Upon execution and upon being restarted, iplog reads a list of configuration rules from its configuration file.  The default location of this file is
+-.B /etc/iplog.conf.
++.B /usr/local/etc/iplog.conf.
+ 
+ .SH NOTATION
+ Throughout this document, required parameters will be denoted by enclosing the parameter in angle brackets <like this>.
diff --git a/net/iplog/files/patch-ad b/net/iplog/files/patch-ad
new file mode 100644
index 000000000000..168dfc356be1
--- /dev/null
+++ b/net/iplog/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/iplog.h.orig	Mon Jul  3 16:49:23 2000
++++ src/iplog.h	Tue Jul  4 08:18:35 2000
+@@ -28,7 +28,7 @@
+ ** Path of the iplog configuration file.
+ */
+ 
+-#define CONFFILE	"/etc/iplog.conf"
++#define CONFFILE	"/usr/local/etc/iplog.conf"
+ 
+ /*
+ ** Making these smaller will probably do bad things.
diff --git a/net/iplog/pkg-plist b/net/iplog/pkg-plist
index 74267a28da42..2d15d94e3d71 100644
--- a/net/iplog/pkg-plist
+++ b/net/iplog/pkg-plist
@@ -1,2 +1,2 @@
 sbin/iplog
-etc/iplog.rules.sample
+etc/example-iplog.conf