svn commit: r347342 - in head: . misc misc/logsurfer misc/logsurfer+ misc/logsurfer/files

Fri Mar 7 08:30:34 UTC 2014

Author: madpilot
Date: Fri Mar  7 08:30:32 2014
New Revision: 347342
URL: http://svnweb.freebsd.org/changeset/ports/347342
QAT: https://qat.redports.org/buildarchive/r347342/

Log:
  - Update to 1.8
  - Rename port
  - Convert to staging
  - Add rc script
  
  PR:		ports/186266
  Submitted by:	me
  Aproved by:	zi@ (maintainer)

Added:
  head/misc/logsurfer/
     - copied from r347341, head/misc/logsurfer+/
  head/misc/logsurfer/files/logsurfer.in   (contents, props changed)
Deleted:
  head/misc/logsurfer+/
  head/misc/logsurfer/files/pkg-message.in
Modified:
  head/MOVED
  head/misc/Makefile
  head/misc/logsurfer/Makefile
  head/misc/logsurfer/distinfo
  head/misc/logsurfer/pkg-plist

Modified: head/MOVED
==============================================================================

--- head/MOVED	Fri Mar  7 07:41:35 2014	(r347341)
+++ head/MOVED	Fri Mar  7 08:30:32 2014	(r347342)
@@ -5603,3 +5603,4 @@ audio/bmp-scrobbler|multimedia/audacious
 shells/wapsh||2014-03-06|Broken and abandonware
 shells/zoidberg||2014-03-06|Broken and abandonware
 x11-toolkits/py31-tkinter|x11-toolkits/py-tkinter|2014-03-06|Has expired: Depends on expiring lang/python31
+misc/logsurfer+|misc/logsurfer|2014-03-07|Renamed upstream

Modified: head/misc/Makefile
==============================================================================
--- head/misc/Makefile	Fri Mar  7 07:41:35 2014	(r347341)
+++ head/misc/Makefile	Fri Mar  7 08:30:32 2014	(r347342)
@@ -259,7 +259,7 @@
     SUBDIR += lingoteach
     SUBDIR += linm
     SUBDIR += localedata
-    SUBDIR += logsurfer+
+    SUBDIR += logsurfer
     SUBDIR += loop
     SUBDIR += lr
     SUBDIR += lv

Modified: head/misc/logsurfer/Makefile
==============================================================================
--- head/misc/logsurfer+/Makefile	Fri Mar  7 07:41:35 2014	(r347341)
+++ head/misc/logsurfer/Makefile	Fri Mar  7 08:30:32 2014	(r347342)
@@ -1,11 +1,10 @@
 # Created by: shanee at augusta.de
 # $FreeBSD$
 
-PORTNAME=	logsurfer+
-PORTVERSION=	1.7
+PORTNAME=	logsurfer
+PORTVERSION=	1.8
 CATEGORIES=	misc
-MASTER_SITES=	http://kerryt.orconhosting.net.nz/ \
-		http://www.crypt.gen.nz/logsurfer/ \
+MASTER_SITES=	http://www.crypt.gen.nz/logsurfer/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	zi at FreeBSD.org
@@ -13,28 +12,19 @@ COMMENT=	Process logfiles and conditiona
 
 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}
+USES=		desthack
+USE_RC_SUBR=	logsurfer
 
-MAN1=		logsurfer.1
-MAN4=		logsurfer.conf.4
+.include <bsd.port.options.mk>
 
-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}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Modified: head/misc/logsurfer/distinfo
==============================================================================
--- head/misc/logsurfer+/distinfo	Fri Mar  7 07:41:35 2014	(r347341)
+++ head/misc/logsurfer/distinfo	Fri Mar  7 08:30:32 2014	(r347342)
@@ -1,2 +1,2 @@
-SHA256 (logsurfer+-1.7.tar.gz) = b0cce7311f6413a1a903a2d4925051ee68a882a7eb093f41f1b7d7bd7bd442a0
-SIZE (logsurfer+-1.7.tar.gz) = 198289
+SHA256 (logsurfer-1.8.tar.gz) = 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af
+SIZE (logsurfer-1.8.tar.gz) = 197507

Added: head/misc/logsurfer/files/logsurfer.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/logsurfer/files/logsurfer.in	Fri Mar  7 08:30:32 2014	(r347342)
@@ -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"

Modified: head/misc/logsurfer/pkg-plist
==============================================================================
--- head/misc/logsurfer+/pkg-plist	Fri Mar  7 07:41:35 2014	(r347341)
+++ head/misc/logsurfer/pkg-plist	Fri Mar  7 08:30:32 2014	(r347342)
@@ -1,10 +1,6 @@
 bin/logsurfer
+man/man1/logsurfer.1.gz
+man/man4/logsurfer.conf.4.gz
 %%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
- at dirrmtry %%ETCDIR%%
- at 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
