SF.net SVN: gar:[22793] csw/mgar/pkg/multitail/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jan 7 09:12:29 CET 2014
Revision: 22793
http://sourceforge.net/p/gar/code/22793
Author: dmichelsen
Date: 2014-01-07 08:12:28 +0000 (Tue, 07 Jan 2014)
Log Message:
-----------
multitail/trunk: Update to 6.0
Modified Paths:
--------------
csw/mgar/pkg/multitail/trunk/Makefile
csw/mgar/pkg/multitail/trunk/checksums
csw/mgar/pkg/multitail/trunk/files/changelog.CSW
csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff
Modified: csw/mgar/pkg/multitail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/multitail/trunk/Makefile 2014-01-07 08:09:03 UTC (rev 22792)
+++ csw/mgar/pkg/multitail/trunk/Makefile 2014-01-07 08:12:28 UTC (rev 22793)
@@ -1,5 +1,5 @@
NAME = multitail
-VERSION = 5.2.9
+VERSION = 6.0
GARTYPE = v2
DESCRIPTION = View one or multiple files like the original tail program
@@ -16,7 +16,7 @@
endef
MASTER_SITES = http://www.vanheusden.com/multitail/
-DISTFILES = $(NAME)-$(VERSION).tgz
+DISTFILES += $(DISTNAME).tgz
LICENSE = license.txt
RUNTIME_DEP_PKGS_CSWmultitail += CSWlibncurses5
@@ -29,8 +29,6 @@
# Adjust path to configuration file and compiler options
PATCHFILES = patch-CSW.diff
-sysconfdir = /etc/opt/csw
-
# Use provided Solaris Makefile
BUILD_ARGS = -f makefile.solaris_sunwspro
Modified: csw/mgar/pkg/multitail/trunk/checksums
===================================================================
--- csw/mgar/pkg/multitail/trunk/checksums 2014-01-07 08:09:03 UTC (rev 22792)
+++ csw/mgar/pkg/multitail/trunk/checksums 2014-01-07 08:12:28 UTC (rev 22793)
@@ -1 +1 @@
-871cb6a9a0d4f599b9cbd9f603da4c51 multitail-5.2.9.tgz
+fb8efc547d389257021885fe5402255c multitail-6.0.tgz
Modified: csw/mgar/pkg/multitail/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2014-01-07 08:09:03 UTC (rev 22792)
+++ csw/mgar/pkg/multitail/trunk/files/changelog.CSW 2014-01-07 08:12:28 UTC (rev 22793)
@@ -1,3 +1,9 @@
+multitail (6.0,REV=2013.01.07)
+
+ * Upgrade to 6.0
+
+ -- Dagobert Michelsen <dam at opencsw.org> Tue, 1 Jan 2014 09:04:02 +0200
+
multitail (5.2.8,REV=2011.08.14)
* Upgrade to 5.2.8.
Modified: csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff
===================================================================
--- csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff 2014-01-07 08:09:03 UTC (rev 22792)
+++ csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff 2014-01-07 08:12:28 UTC (rev 22793)
@@ -1,17 +1,3 @@
-diff -ur multitail-5.2.2.orig/help.c multitail-5.2.2/help.c
---- multitail-5.2.2.orig/help.c 2009-03-07 13:52:50.561809407 +0100
-+++ multitail-5.2.2/help.c 2009-03-07 13:54:21.839770461 +0100
-@@ -104,8 +104,8 @@
- char *help_list_keybindings[] = {
- "This screen lists the keybindings you defined in",
- "the MultiTail configurationfile which is located",
-- "in /etc/multitail.conf. The keybindings only",
-- "work in the main screen.",
-+ "in /etc/opt/csw/multitail.conf. The keybindings",
-+ "only work in the main screen.",
- "In this screen, you can press the followking",
- "keys:",
- " ^UP^ (cursor key UP) scroll up",
diff -ur multitail-5.2.2.orig/makefile.solaris_sunwspro multitail-5.2.2/makefile.solaris_sunwspro
--- multitail-5.2.2.orig/makefile.solaris_sunwspro 2009-03-07 13:52:50.277658365 +0100
+++ multitail-5.2.2/makefile.solaris_sunwspro 2009-03-07 14:07:17.458014674 +0100
@@ -30,48 +16,3 @@
OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o color.o stripstring.o selbox.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o
-diff -ur multitail-5.2.2.orig/manual.html multitail-5.2.2/manual.html
---- multitail-5.2.2.orig/manual.html 2009-03-07 13:52:50.332585127 +0100
-+++ multitail-5.2.2/manual.html 2009-03-07 14:00:28.008940908 +0100
-@@ -140,7 +140,7 @@
- parameter it needs the name of a colorscheme. The colorschemes are read
- from multitail.conf. In multitail.conf you set by entering regular
- expressions what color to use for what "patterns". By default, MultiTail
--looks for multitail.conf in the current directory and in the /etc directory.
-+looks for multitail.conf in the /etc/opt/csw directory.
- With the '-z' parameter you can explicitly define what file it should use.<BR>
- An example:
- <PRE>
-diff -ur multitail-5.2.2.orig/mt.c multitail-5.2.2/mt.c
---- multitail-5.2.2.orig/mt.c 2009-03-07 13:52:49.901909226 +0100
-+++ multitail-5.2.2/mt.c 2009-03-07 13:57:53.016591255 +0100
-@@ -2328,7 +2328,7 @@
- printf("Could not determine size of file '%s' (which is supposed to be ", mail_spool_file);
- printf("your mailfile): mail-check is disabled.\n");
- printf("You can prevent this message by adding the line 'check_mail:0' ");
-- printf("in /etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
-+ printf("in /etc/opt/csw/multitail.conf or in .multitailrc in your home-directory.\n\n");
- printf("Press enter to continue...");
- fflush(NULL);
- getchar();
-diff -ur multitail-5.2.2.orig/multitail.conf multitail-5.2.2/multitail.conf
---- multitail-5.2.2.orig/multitail.conf 2009-03-07 13:52:49.490040359 +0100
-+++ multitail-5.2.2/multitail.conf 2009-03-07 13:56:34.117143611 +0100
-@@ -868,7 +868,7 @@
- # end offset: the position AFTER the last character for which the attributes are
- # valid
- # do NOT use spaces in each line!
--colorscript:cscriptexample:/etc/multitail/colors-example.pl:this is a barely functional example script
-+colorscript:cscriptexample:/opt/csw/share/multitail/colors-example.pl:this is a barely functional example script
- #
- #
- # default colorschemes:
-@@ -1009,7 +1009,7 @@
- convert:asterisk:epochtodate:^([0-9]*).([0-9]*)
- convert:nagios.log:epochtodate:^.([0-9]*).
- convert:qmailtimestr:tai64todate:^(@[^ ]*)
--convert:geoip:script:/etc/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
-+convert:geoip:script:/opt/csw/share/multitail/convert-geoip.pl:([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})
- #
- # shell to invoke
- shell:/bin/sh
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list