Date: Thu, 30 Jan 2014 10:29:57 +0100 (CET) From: Guido Falsi <madpilot@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/186266: [update] misc/logsurfer+: update to 1.8, rename, staging Message-ID: <3fFGVs46b1zCH@micro.madpilot.net> Resent-Message-ID: <201401300940.s0U9e0mo073407@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186266
>Category: ports
>Synopsis: [update] misc/logsurfer+: update to 1.8, rename, staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 30 09:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 10.0-RELEASE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
- Update to 1.8
- Rename port
- Convert to staging
- Add rc script
NOTE: example files aren't in the distribution anymore, so I just
removed support for those.
Also, the rc script is working but the the defaults are more like
examples, user needs to be created or changed and the configuration
file needs to be created.
>How-To-Repeat:
>Fix:
Index: MOVED
===================================================================
--- MOVED (revision 341822)
+++ MOVED (working copy)
@@ -5417,3 +5417,4 @@
textproc/nl-ispell|textproc/nl-ispell|2014-01-29|Removed, consider using aspell instead
textproc/sk-ispell|textproc/sk-ispell|2014-01-29|Removed, consider using aspell instead
ukrainian/ispell|ukrainian/aspell|2014-01-29|Removed, consider using aspell instead
+misc/logsurfer+|misc/logsurfer|2014-01-30|Renamed upstream
Index: misc/Makefile
===================================================================
--- misc/Makefile (revision 341822)
+++ misc/Makefile (working copy)
@@ -256,7 +256,7 @@
SUBDIR += lingoteach
SUBDIR += linm
SUBDIR += localedata
- SUBDIR += logsurfer+
+ SUBDIR += logsurfer
SUBDIR += loop
SUBDIR += lr
SUBDIR += lv
Index: misc/logsurfer/Makefile
===================================================================
--- misc/logsurfer/Makefile (revision 341822)
+++ misc/logsurfer/Makefile (working copy)
@@ -1,11 +1,10 @@
# Created by: shanee@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@FreeBSD.org
@@ -13,28 +12,19 @@
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>
Index: misc/logsurfer/distinfo
===================================================================
--- misc/logsurfer/distinfo (revision 341822)
+++ misc/logsurfer/distinfo (working copy)
@@ -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
Index: misc/logsurfer/files/logsurfer.in
===================================================================
--- misc/logsurfer/files/logsurfer.in (revision 0)
+++ misc/logsurfer/files/logsurfer.in (working copy)
@@ -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"
Property changes on: misc/logsurfer/files/logsurfer.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: misc/logsurfer/pkg-plist
===================================================================
--- misc/logsurfer/pkg-plist (revision 341822)
+++ misc/logsurfer/pkg-plist (working copy)
@@ -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
-@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
Index: misc/logsurfer+/Makefile
===================================================================
--- misc/logsurfer+/Makefile (revision 341822)
+++ misc/logsurfer+/Makefile (working copy)
@@ -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>
Index: misc/logsurfer+/distinfo
===================================================================
--- misc/logsurfer+/distinfo (revision 341822)
+++ misc/logsurfer+/distinfo (working copy)
@@ -1,2 +0,0 @@
-SHA256 (logsurfer+-1.7.tar.gz) = b0cce7311f6413a1a903a2d4925051ee68a882a7eb093f41f1b7d7bd7bd442a0
-SIZE (logsurfer+-1.7.tar.gz) = 198289
Index: misc/logsurfer+/files/pkg-message.in
===================================================================
--- misc/logsurfer+/files/pkg-message.in (revision 341822)
+++ misc/logsurfer+/files/pkg-message.in (working copy)
@@ -1,5 +0,0 @@
-*******************************************************************
-Sample configurations are located in %%ETCDIR%%/
-
-Select an appropriate file and copy it to %%ETCDIR%%/logsurfer.conf
-*******************************************************************
Index: misc/logsurfer+/pkg-descr
===================================================================
--- misc/logsurfer+/pkg-descr (revision 341822)
+++ misc/logsurfer+/pkg-descr (working copy)
@@ -1,14 +0,0 @@
-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.
-
-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/
Index: misc/logsurfer+/pkg-plist
===================================================================
--- misc/logsurfer+/pkg-plist (revision 341822)
+++ misc/logsurfer+/pkg-plist (working copy)
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3fFGVs46b1zCH>