Date: 28 Apr 2003 14:14:58 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51498: [PATCH] Update sysutils/logtool to 1.2.2 Message-ID: <20030428141458.9415.qmail@outpost.globcon.net> Resent-Message-ID: <200304281420.h3SEK6M7084135@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51498 >Category: ports >Synopsis: [PATCH] Update sysutils/logtool to 1.2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 28 07:20:06 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan 2 03:13:48 MSK >Description: - Update to 1.2.2 - Convert to USE_GETOPT_LONG - Make the port respect CFLAGS - Update URLs in MASTER_SITES and pkg-descr - Clarify COMMENT and reword pkg-descr - Install additional documentation - Add pkg-message - Take maintainership Added files: - pkg-message - files/patch-configure - files/patch-src::includes.h Removed files: - files/patch-ab >How-To-Repeat: >Fix: --- logtool-1.2.2.patch begins here --- diff -ruN --exclude=CVS logtool/Makefile logtool-1.2.2/Makefile --- logtool/Makefile Tue Mar 4 06:49:02 2003 +++ logtool-1.2.2/Makefile Mon Apr 28 17:46:58 2003 @@ -7,37 +7,40 @@ # PORTNAME= logtool -PORTVERSION= 1.0.7 +PORTVERSION= 1.2.2 CATEGORIES= sysutils -MASTER_SITES= http://xjack.org/logtool/logtool/ +MASTER_SITES= http://xjack.org/logtool/download/ -MAINTAINER= ports@FreeBSD.org -COMMENT= Parse syslog logfile into a palatable format +MAINTAINER= sergei@kolobov.com +COMMENT= Parse ASCII logfiles into ANSI, CSV, HTML formats -LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt +USE_GMAKE= yes +USE_GETOPT_LONG= yes -USE_REINPLACE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/logtool +GNU_CONFIGURE= yes +CONFIGURE_ENV= CFLAGS="${CFLAGS}" +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/${PORTNAME} -ALL_TARGET= build +PKGMESSAGE= ${WRKDIR}/pkg-message MAN1= logtool.1 +DOCS= CREDITS Changes README TODO doc/logtool.txt -post-patch: - @${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/configure +do-build: + cd ${WRKSRC}/src && ${GMAKE} INCLUDES="${CPPFLAGS}" -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/logtool.1 ${PREFIX}/man/man1 - @${CP} ${WRKSRC}/conf/logtool.conf ${PREFIX}/etc/logtool/logtool.conf.dist - @${CP} ${WRKSRC}/conf/exclude ${PREFIX}/etc/logtool/exclude.dist - @${CP} ${WRKSRC}/conf/green ${PREFIX}/etc/logtool/green.dist - @${CP} ${WRKSRC}/conf/include ${PREFIX}/etc/logtool/include.dist - @${CP} ${WRKSRC}/conf/yellow ${PREFIX}/etc/logtool/yellow.dist +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/src/logtool ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/doc/logtool.1 ${MANPREFIX}/man/man1 + @${MKDIR} ${EXAMPLESDIR} ${EXAMPLESDIR}/scripts + ${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} + @${RM} ${EXAMPLESDIR}/logtool.conf.in + ${INSTALL_DATA} ${WRKSRC}/scripts/* ${EXAMPLESDIR}/scripts .if !defined(NOPORTDOCS) - @${ECHO_MSG} "===> Installing logtool docs in ${PREFIX}/share/doc/logtool" @${MKDIR} ${DOCSDIR} - @${CP} -Rvf ${WRKSRC}/scripts ${WRKSRC}/doc/logtool.txt ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif + @${SED} -e 's!PREFIX!${PREFIX}!' ${.CURDIR}/pkg-message > ${PKGMESSAGE} + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN --exclude=CVS logtool/distinfo logtool-1.2.2/distinfo --- logtool/distinfo Tue Mar 4 06:49:02 2003 +++ logtool-1.2.2/distinfo Mon Apr 28 15:51:32 2003 @@ -1 +1 @@ -MD5 (logtool-1.0.7.tar.gz) = 89257ee8b4f735e72d1d3585b9331b6c +MD5 (logtool-1.2.2.tar.gz) = f223c16e311eeda412d7b33806dad4af diff -ruN --exclude=CVS logtool/files/patch-ab logtool-1.2.2/files/patch-ab --- logtool/files/patch-ab Fri Jan 12 21:47:04 2001 +++ logtool-1.2.2/files/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,10 +0,0 @@ ---- logtool/includes.h.orig Wed Jan 10 04:18:00 2001 -+++ logtool/includes.h Wed Jan 10 04:20:00 2001 -@@ -22,6 +22,7 @@ - #include<stdio.h> - #include<stdlib.h> - #include<string.h> -+#include<unistd.h> - #include<regex.h> - #include<errno.h> - diff -ruN --exclude=CVS logtool/files/patch-configure logtool-1.2.2/files/patch-configure --- logtool/files/patch-configure Thu Jan 1 03:00:00 1970 +++ logtool-1.2.2/files/patch-configure Mon Apr 28 16:05:55 2003 @@ -0,0 +1,11 @@ +--- configure.orig Mon Apr 28 16:00:06 2003 ++++ configure Mon Apr 28 16:00:17 2003 +@@ -745,7 +745,7 @@ + fi + + if test -n "$GCC"; then +- CFLAGS="-O3 -W -Wall" ++# CFLAGS="-O3 -W -Wall" + fi + + diff -ruN --exclude=CVS logtool/files/patch-src::includes.h logtool-1.2.2/files/patch-src::includes.h --- logtool/files/patch-src::includes.h Thu Jan 1 03:00:00 1970 +++ logtool-1.2.2/files/patch-src::includes.h Mon Apr 28 18:01:14 2003 @@ -0,0 +1,10 @@ +--- src/includes.h.orig Mon Mar 24 09:11:08 2003 ++++ src/includes.h Mon Apr 28 17:45:52 2003 +@@ -27,6 +27,7 @@ + #include<stdio.h> + #include<stdlib.h> + #include<string.h> ++#include<unistd.h> + #include<regex.h> + #include<errno.h> + #include<time.h> diff -ruN --exclude=CVS logtool/pkg-descr logtool-1.2.2/pkg-descr --- logtool/pkg-descr Tue Jun 12 10:55:09 2001 +++ logtool-1.2.2/pkg-descr Mon Apr 28 15:55:45 2003 @@ -1,8 +1,7 @@ -Logtool is a command line program that will parse syslog (and syslog- -like) logfiles into a more palatable format. It will take anything -resembling a standard syslog file (this includes syslog-ng, and -probably most of the other variants out there), and crunch it into one -of the following formats for your viewing pleasure: +Logtool is a command line program that will parse ASCII logfiles into a more +palatable format. It will take anything resembling a standard syslog file +(this includes syslog-ng, multilog, and probably most of the other variantse), +and crunch it into one of the following formats for your viewing pleasure: - ANSI (colorized for easy "at a glance" viewing) - ASCII (for e-mail'ed reports, and term's that don't support color) @@ -10,8 +9,10 @@ - HTML (for generating web pages) - RAW (for no good reason) -It can be configured to parse the data any one of several ways, -including stripping the host, and/or program fields, and modifying the -time display format of the log entry's. +It can be configured to parse the data any one of several ways, including +suppressing duplicate messages, stripping the host, and/or program fields, +and modifying the time display format (supports TAI64 timestamps produced +by DJB's multilog) of the log entries. -WWW: http://www.xjack.org/logtool/ +Author: A.L.Lambert +WWW: http://xjack.org/logtool/ diff -ruN --exclude=CVS logtool/pkg-message logtool-1.2.2/pkg-message --- logtool/pkg-message Thu Jan 1 03:00:00 1970 +++ logtool-1.2.2/pkg-message Mon Apr 28 17:04:36 2003 @@ -0,0 +1,9 @@ +########################################################################### +# +# Sample configuration files are installed in +# +# PREFIX/share/examples/logtool +# +# Please copy them to PREFIX/etc/logtool and edit to suit your needs. +# +########################################################################### diff -ruN --exclude=CVS logtool/pkg-plist logtool-1.2.2/pkg-plist --- logtool/pkg-plist Tue Mar 4 06:49:02 2003 +++ logtool-1.2.2/pkg-plist Mon Apr 28 16:51:19 2003 @@ -1,21 +1,30 @@ bin/logtool -bin/logtail -etc/logtool/logtool.conf -etc/logtool/green -etc/logtool/yellow -etc/logtool/include -etc/logtool/exclude -etc/logtool/logtool.conf.dist -etc/logtool/exclude.dist -etc/logtool/green.dist -etc/logtool/include.dist -etc/logtool/yellow.dist -%%PORTDOCS%%share/doc/logtool/scripts/monitor.logs.sh -%%PORTDOCS%%share/doc/logtool/scripts/README -%%PORTDOCS%%share/doc/logtool/scripts/cronjob.emailreport.sh -%%PORTDOCS%%share/doc/logtool/scripts/cronjob.genwebpage.sh -%%PORTDOCS%%share/doc/logtool/scripts/logtool_logcheck.sh -%%PORTDOCS%%share/doc/logtool/logtool.txt -@dirrm etc/logtool -%%PORTDOCS%%@dirrm share/doc/logtool/scripts -%%PORTDOCS%%@dirrm share/doc/logtool +%%PORTDOCS%%%%DOCSDIR%%/CREDITS +%%PORTDOCS%%%%DOCSDIR%%/Changes +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/logtool.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%EXAMPLESDIR%%/scripts/README +%%EXAMPLESDIR%%/scripts/cronjob.emailreport.sh +%%EXAMPLESDIR%%/scripts/cronjob.genwebpage.sh +%%EXAMPLESDIR%%/scripts/logtool_logcheck.sh +%%EXAMPLESDIR%%/scripts/monitor.logs.sh +@dirrm %%EXAMPLESDIR%%/scripts +%%EXAMPLESDIR%%/blue +%%EXAMPLESDIR%%/brightblue +%%EXAMPLESDIR%%/brightcyan +%%EXAMPLESDIR%%/brightgreen +%%EXAMPLESDIR%%/brightmagenta +%%EXAMPLESDIR%%/brightred +%%EXAMPLESDIR%%/brightwhite +%%EXAMPLESDIR%%/brightyellow +%%EXAMPLESDIR%%/cyan +%%EXAMPLESDIR%%/exclude +%%EXAMPLESDIR%%/green +%%EXAMPLESDIR%%/include +%%EXAMPLESDIR%%/logtool.conf +%%EXAMPLESDIR%%/magenta +%%EXAMPLESDIR%%/white +%%EXAMPLESDIR%%/yellow +@dirrm %%EXAMPLESDIR%% --- logtool-1.2.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030428141458.9415.qmail>