6 files changed, 47 insertions, 36 deletions

diff --git a/misc/logsurfer+/Makefile b/misc/logsurfer+/Makefile
index 3b7e623db012..408af852ad79 100644
--- a/misc/logsurfer+/Makefile
+++ b/misc/logsurfer+/Makefile
@@ -5,34 +5,38 @@
 # $FreeBSD$
 #
 
-PORTNAME=	logsurfer
-PORTVERSION=	1.5b
+PORTNAME=	logsurfer+
+PORTVERSION=	1.7
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/audit/logsurfer/%SUBDIR%/ \
-		ftp://ftp.tuwien.ac.at/infosys/security/dfn/tools/audit/logsurfer/%SUBDIR%/
-EXTRACT_SUFX=	.tar
+MASTER_SITES=	http://kerryt.orconhosting.net.nz/ \
+		http://www.crypt.gen.nz/logsurfer/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Process logfiles and conditionally perform certain actions
 
-DEPRECATED=	Look like an abandonware, no more public distifles
-EXPIRATION_DATE=	2011-08-01
+LICENSE=	BSD
+
+SUB_FILES=	pkg-message
+EXAMPLE_FILES=	context_arg_test.conf echo_test.conf \
+		lines_test.conf syslog_test.conf
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-etc-dir=${PREFIX}/etc
+CONFIGURE_ARGS+=--with-etcdir=${ETCDIR}
 
 MAN1=		logsurfer.1
 MAN4=		logsurfer.conf.4
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/examples/logsurfer
-	${INSTALL_DATA} ${WRKSRC}/config-examples/README \
-		${PREFIX}/share/examples/logsurfer
+	@${MKDIR} ${ETCDIR}
+.for conf in ${EXAMPLE_FILES}
+	${INSTALL_DATA} ${WRKSRC}/config-examples/${conf} ${ETCDIR}/${conf}.sample
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for doc in ChangeLog README
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/misc/logsurfer+/distinfo b/misc/logsurfer+/distinfo
index 9c0c485cd124..c104606be1c0 100644
--- a/misc/logsurfer+/distinfo
+++ b/misc/logsurfer+/distinfo
@@ -1,2 +1,2 @@
-SHA256 (logsurfer-1.5b.tar) = d78328c3179e4500ecc5535712e298cf422acb8cc5c9c657b529f2fbb1b8b596
-SIZE (logsurfer-1.5b.tar) = 703488
+SHA256 (logsurfer+-1.7.tar.gz) = b0cce7311f6413a1a903a2d4925051ee68a882a7eb093f41f1b7d7bd7bd442a0
+SIZE (logsurfer+-1.7.tar.gz) = 198289
diff --git a/misc/logsurfer+/files/patch-ac b/misc/logsurfer+/files/patch-ac
deleted file mode 100644
index 4bcb1e4a400a..000000000000
--- a/misc/logsurfer+/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/logsurfer.c.orig	Mon Apr  8 10:15:53 1996
-+++ src/logsurfer.c	Fri May 28 14:28:06 1999
-@@ -382,6 +382,7 @@
- 		(void) fprintf(stderr, "unable to allocate memory for logline_buffer\n");
- 		exit(99);
- 	}
-+	logline_buffer[0]='\0';
- 
- 	while ( (opt = getopt(argc, argv, "fc:d:l:p:r:s")) != EOF )
- 		switch(opt) {
diff --git a/misc/logsurfer+/files/pkg-message.in b/misc/logsurfer+/files/pkg-message.in
new file mode 100644
index 000000000000..c6aa8e702935
--- /dev/null
+++ b/misc/logsurfer+/files/pkg-message.in
@@ -0,0 +1,5 @@
+*******************************************************************
+Sample configurations are located in %%ETCDIR%%/
+
+Select an appropriate file and copy it to %%ETCDIR%%/logsurfer.conf
+*******************************************************************
diff --git a/misc/logsurfer+/pkg-descr b/misc/logsurfer+/pkg-descr
index 55333f8a7359..41a4ff0a4c6a 100644
--- a/misc/logsurfer+/pkg-descr
+++ b/misc/logsurfer+/pkg-descr
@@ -1,6 +1,14 @@
-Logsurfer is a program that works on single textlines from
-a logfile (or from standard input). It compares each  line
-against  regular  expressions of a set of "rules" and per-
-forms certain actions that are defined for this match.
+Logsurfer is a program for monitoring system logs in real-time, 
+and reporting on the occurrence of events. It is similar to the 
+well-known swatch program on which it is based, but offers a 
+number of advanced features which swatch does not support.
 
-WWW: http://www.cert.dfn.de/eng/logsurf/
+Logsurfer is capable of grouping related log entries 
+together - for instance, when a system boots it usually creates 
+a high number of log messages. In this case, logsurfer can be 
+setup to group boot-time messages together and forward them in 
+a single Email message to the system administrator under the 
+subject line "Host xxx has just booted".
+Swatch just couldn't do this properly.
+
+WWW: http://www.crypt.gen.nz/logsurfer/
diff --git a/misc/logsurfer+/pkg-plist b/misc/logsurfer+/pkg-plist
index 8d527a7b5130..fcb6bbe26fea 100644
--- a/misc/logsurfer+/pkg-plist
+++ b/misc/logsurfer+/pkg-plist
@@ -1,6 +1,10 @@
 bin/logsurfer
-%%PORTDOCS%%share/doc/logsurfer/ChangeLog
-%%PORTDOCS%%share/doc/logsurfer/README
-%%PORTDOCS%%@dirrm share/doc/logsurfer
-share/examples/logsurfer/README
-@dirrm share/examples/logsurfer
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%ETCDIR%%/context_arg_test.conf.sample
+%%ETCDIR%%/echo_test.conf.sample
+%%ETCDIR%%/lines_test.conf.sample
+%%ETCDIR%%/syslog_test.conf.sample
+@dirrmtry %%ETCDIR%%
+@unexec if [ -d %D/%%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/logsurfer+`` to remove any configuration files left."; fi