- Update to 1.8

- Rename port
- Convert to staging
- Add rc script

PR:		ports/186266
Submitted by:	me
Aproved by:	zi@ (maintainer)

10 files changed, 84 insertions, 58 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 6f43875655be..5f1e782b4f4d 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -259,7 +259,7 @@
     SUBDIR += lingoteach
     SUBDIR += linm
     SUBDIR += localedata
-    SUBDIR += logsurfer+
+    SUBDIR += logsurfer
     SUBDIR += loop
     SUBDIR += lr
     SUBDIR += lv
diff --git a/misc/logsurfer+/Makefile b/misc/logsurfer+/Makefile
deleted file mode 100644
index f353de4ef68e..000000000000
--- a/misc/logsurfer+/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: shanee@augusta.de
-# $FreeBSD$
-
-PORTNAME=	logsurfer+
-PORTVERSION=	1.7
-CATEGORIES=	misc
-MASTER_SITES=	http://kerryt.orconhosting.net.nz/ \
-		http://www.crypt.gen.nz/logsurfer/ \
-		http://mirrors.rit.edu/zi/
-
-MAINTAINER=	zi@FreeBSD.org
-COMMENT=	Process logfiles and conditionally perform certain actions
-
-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-etcdir=${ETCDIR}
-
-MAN1=		logsurfer.1
-MAN4=		logsurfer.conf.4
-
-NO_STAGE=	yes
-post-install:
-	@${MKDIR} ${ETCDIR}
-.for conf in ${EXAMPLE_FILES}
-	${INSTALL_DATA} ${WRKSRC}/config-examples/${conf} ${ETCDIR}/${conf}.sample
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${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
deleted file mode 100644
index c104606be1c0..000000000000
--- a/misc/logsurfer+/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (logsurfer+-1.7.tar.gz) = b0cce7311f6413a1a903a2d4925051ee68a882a7eb093f41f1b7d7bd7bd442a0
-SIZE (logsurfer+-1.7.tar.gz) = 198289
diff --git a/misc/logsurfer+/files/pkg-message.in b/misc/logsurfer+/files/pkg-message.in
deleted file mode 100644
index c6aa8e702935..000000000000
--- a/misc/logsurfer+/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-*******************************************************************
-Sample configurations are located in %%ETCDIR%%/
-
-Select an appropriate file and copy it to %%ETCDIR%%/logsurfer.conf
-*******************************************************************
diff --git a/misc/logsurfer+/pkg-plist b/misc/logsurfer+/pkg-plist
deleted file mode 100644
index fcb6bbe26fea..000000000000
--- a/misc/logsurfer+/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/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
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
new file mode 100644
index 000000000000..9040c36c2ab3
--- /dev/null
+++ b/misc/logsurfer/Makefile
@@ -0,0 +1,30 @@
+# Created by: shanee@augusta.de
+# $FreeBSD$
+
+PORTNAME=	logsurfer
+PORTVERSION=	1.8
+CATEGORIES=	misc
+MASTER_SITES=	http://www.crypt.gen.nz/logsurfer/ \
+		http://mirrors.rit.edu/zi/
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	Process logfiles and conditionally perform certain actions
+
+LICENSE=	BSD
+
+GNU_CONFIGURE=	YES
+CONFIGURE_ARGS+=--with-etcdir=${ETCDIR}
+USES=		desthack
+USE_RC_SUBR=	logsurfer
+
+.include <bsd.port.options.mk>
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in ChangeLog README
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/misc/logsurfer/distinfo b/misc/logsurfer/distinfo
new file mode 100644
index 000000000000..9453cb7cb215
--- /dev/null
+++ b/misc/logsurfer/distinfo
@@ -0,0 +1,2 @@
+SHA256 (logsurfer-1.8.tar.gz) = 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af
+SIZE (logsurfer-1.8.tar.gz) = 197507
diff --git a/misc/logsurfer/files/logsurfer.in b/misc/logsurfer/files/logsurfer.in
new file mode 100644
index 000000000000..08e19493d81c
--- /dev/null
+++ b/misc/logsurfer/files/logsurfer.in
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: logsurfer
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to enable logsurfer:
+#
+# logsurfer_enable (bool):	Set it to "YES" to enable logsurfer
+#				Default to "NO"
+#
+# logsurfer_config (string):	Configuration file,
+#				Default /usr/local/etc/logsurfer/logsurfer.conf
+#
+# logsurfer_user, logsurfer_group (string): User logsurfer will run as
+#				Default logsurfer
+#
+# logsurfer_logfile (string):	Log file logsurfer will monitor
+#				Default /var/log/messages
+#
+# logsurfer_pid (string):	Location of pid file
+#				Default /var/run/logsurfer.pid
+#
+
+. /etc/rc.subr
+
+name=logsurfer
+rcvar=logsurfer_enable
+
+load_rc_config ${name}
+
+: ${logsurfer_enable:=NO}
+: ${logsurfer_config:=%%ETCDIR%%/logsurfer.conf}
+: ${logsurfer_user:=logsurfer}
+: ${logsurfer_group:=logsurfer}
+: ${logsurfer_logfile:=/var/log/messages}
+
+pidfile=${logsurfer_pidfile:="/var/run/logsurfer.pid"}
+command=%%PREFIX%%/bin/logsurfer
+command_args="-D -p ${pidfile} -c ${logsurfer_config} -F -s -e ${logsurfer_logfile}"
+required_files=${logsurfer_config} ${logsurfer_logfile}
+
+run_rc_command "$1"
diff --git a/misc/logsurfer+/pkg-descr b/misc/logsurfer/pkg-descr
index 41a4ff0a4c6a..41a4ff0a4c6a 100644
--- a/misc/logsurfer+/pkg-descr
+++ b/misc/logsurfer/pkg-descr
diff --git a/misc/logsurfer/pkg-plist b/misc/logsurfer/pkg-plist
new file mode 100644
index 000000000000..c65a4317086a
--- /dev/null
+++ b/misc/logsurfer/pkg-plist
@@ -0,0 +1,6 @@
+bin/logsurfer
+man/man1/logsurfer.1.gz
+man/man4/logsurfer.conf.4.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%