Bug 186266 - [update] misc/logsurfer+: update to 1.8, rename, staging
Summary: [update] misc/logsurfer+: update to 1.8, rename, staging
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-30 09:40 UTC by Guido Falsi
Modified: 2014-03-07 08:40 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (3.99 KB, patch)
2014-01-30 09:40 UTC, Guido Falsi
no flags Details | Diff
file.diff (4.22 KB, patch)
2014-01-30 09:40 UTC, Guido Falsi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Guido Falsi freebsd_committer freebsd_triage 2014-01-30 09:40:00 UTC
- 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.

Fix: 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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-01-30 09:40:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->zi

Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186266 

Date: Thu, 6 Mar 2014 06:59:12 -0500
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2014-03-07 08:28:25 UTC
Responsible Changed
From-To: zi->madpilot

I'll take it.
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2014-03-07 08:30:39 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-03-07 08:30:41 UTC
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@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 @@ 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
-@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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"