8 files changed, 26 insertions, 24 deletions

diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 481ea414d7e2..19b4e9847ef4 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -6,41 +6,39 @@
 #
 
 PORTNAME=	iplog
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
+		http://misc.ojnk.net/~odin/stuff/
 MASTER_SITE_SUBDIR=	ojnk
 
-PATCH_SITES=	http://ojnk.sourceforge.net/stuff/ \
-		ftp://ftp.karlsbakk.net/pub/ojnk/iplog/
-PATCH_DIST_STRIP=-p1
-
 MAINTAINER=	ust@cert.siemens.de
 
-GNU_CONFIGURE=	yes
-MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX}"
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 MAN5=	iplog.conf.5
 MAN8=	iplog.8
 
 .include <bsd.port.pre.mk>
+post-patch:
+.for file in example-iplog.conf iplog.8 iplog.conf.5 src/iplog.h
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.endfor
 
 post-install:
-	@strip ${PREFIX}/sbin/iplog
+	${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc
 .if !exists(${PREFIX}/etc/iplog.conf)
-	@${CP} ${WRKSRC}/example-iplog.conf ${PREFIX}/etc/iplog.conf
+	${INSTALL_DATA} ${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
+	@${ECHO_MSG}
+	@${ECHO_MSG} "============================================================================"
+	@${ECHO_MSG} "Hint:	iplog changed its configuration file from ${PREFIX}/etc/iplog.rules"
+	@${ECHO_MSG} "	to ${PREFIX}/etc/iplog.conf"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "See ${PREFIX}/etc/example-iplog.conf for an example"
+	@${ECHO_MSG} "============================================================================"
+	@${ECHO_MSG}
 .endif
-	@${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 5fda1ba65f4b..60dd02d3134f 100644
--- a/net/iplog/distinfo
+++ b/net/iplog/distinfo
@@ -1 +1 @@
-MD5 (iplog-2.2.0.tar.gz) = ca906ef470c4313fe622d0a545a16cfe
+MD5 (iplog-2.2.1.tar.gz) = 5411e3a556b0635361a2aa94a6e9faae
diff --git a/net/iplog/files/patch-aa b/net/iplog/files/patch-aa
index 97ea606ece18..822dc0ae3ba3 100644
--- a/net/iplog/files/patch-aa
+++ b/net/iplog/files/patch-aa
@@ -5,7 +5,7 @@
  **
  ** Example iplog configuration file.
 -** Edit me and copy me to /etc/iplog.conf
-+** Edit me and copy me to /usr/local/etc/iplog.conf
++** Edit me and copy me to %%PREFIX%%/etc/iplog.conf
  **
  ** See iplog.conf(5) for details on syntax and a full description
  ** of available options.
diff --git a/net/iplog/files/patch-ab b/net/iplog/files/patch-ab
index f0a5658f8838..2c96819c99a0 100644
--- a/net/iplog/files/patch-ab
+++ b/net/iplog/files/patch-ab
@@ -5,7 +5,7 @@
  .SH FILES
  .TP
 -.B /etc/iplog.conf
-+.B /usr/local/etc/iplog.conf
++.B %%PREFIX%%/etc/iplog.conf
  The
  .B iplog
  configuration file.
diff --git a/net/iplog/files/patch-ac b/net/iplog/files/patch-ac
index 6e310f574f89..aac0eae25683 100644
--- a/net/iplog/files/patch-ac
+++ b/net/iplog/files/patch-ac
@@ -5,7 +5,7 @@
  
  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.
++.B %%PREFIX%%/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
index 168dfc356be1..a7344a65b5f4 100644
--- a/net/iplog/files/patch-ad
+++ b/net/iplog/files/patch-ad
@@ -5,7 +5,7 @@
  */
  
 -#define CONFFILE	"/etc/iplog.conf"
-+#define CONFFILE	"/usr/local/etc/iplog.conf"
++#define CONFFILE	"%%PREFIX%%/etc/iplog.conf"
  
  /*
  ** Making these smaller will probably do bad things.
diff --git a/net/iplog/pkg-descr b/net/iplog/pkg-descr
index d36704a2b4eb..467fdfc1cc9f 100644
--- a/net/iplog/pkg-descr
+++ b/net/iplog/pkg-descr
@@ -3,3 +3,5 @@ TCP, UDP and ICMP traffic, though adding support for other protocols
 should be relatively easy. iplog contains a built-in packet filter,
 allowing for logging or excluding packets that fit a given set of
 criteria.
+
+WWW: http://ojnk.sourceforge.net/
diff --git a/net/iplog/pkg-plist b/net/iplog/pkg-plist
index 2d15d94e3d71..6c24cb03e9d6 100644
--- a/net/iplog/pkg-plist
+++ b/net/iplog/pkg-plist
@@ -1,2 +1,4 @@
 sbin/iplog
+@unexec if cmp -s %D/etc/iplog.conf %D/etc/example-iplog.conf; then rm -f %D/etc/iplog.conf; fi
 etc/example-iplog.conf
+@exec test -f %B/iplog.conf || cp %B/%f %B/iplog.conf