14 files changed, 172 insertions, 106 deletions

diff --git a/sysutils/logtool-devel/Makefile b/sysutils/logtool-devel/Makefile
index e1cb16f971ba..d3f3a3505d1f 100644
--- a/sysutils/logtool-devel/Makefile
+++ b/sysutils/logtool-devel/Makefile
@@ -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
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/configure
-
-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
+DOCS=		CREDITS Changes README TODO doc/logtool.txt
+
+do-build:
+	cd ${WRKSRC}/src && ${GMAKE} INCLUDES="${CPPFLAGS}"
+
+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 --git a/sysutils/logtool-devel/distinfo b/sysutils/logtool-devel/distinfo
index 7f08ed78499a..a6ba46b65a0b 100644
--- a/sysutils/logtool-devel/distinfo
+++ b/sysutils/logtool-devel/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.7.tar.gz) = 89257ee8b4f735e72d1d3585b9331b6c
+MD5 (logtool-1.2.2.tar.gz) = f223c16e311eeda412d7b33806dad4af
diff --git a/sysutils/logtool-devel/files/patch-ab b/sysutils/logtool-devel/files/patch-ab
index 7788159c0f29..251d4cee729d 100644
--- a/sysutils/logtool-devel/files/patch-ab
+++ b/sysutils/logtool-devel/files/patch-ab
@@ -1,5 +1,5 @@
 --- logtool/includes.h.orig	Wed Jan 10 04:18:00 2001
-+++ logtool/includes.h	Wed Jan 10 04:20:00 2001
++++ src/includes.h	Wed Jan 10 04:20:00 2001
 @@ -22,6 +22,7 @@
  #include<stdio.h>
  #include<stdlib.h>
diff --git a/sysutils/logtool-devel/files/patch-configure b/sysutils/logtool-devel/files/patch-configure
new file mode 100644
index 000000000000..d3f80b8c09d7
--- /dev/null
+++ b/sysutils/logtool-devel/files/patch-configure
@@ -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 --git a/sysutils/logtool-devel/pkg-descr b/sysutils/logtool-devel/pkg-descr
index 3fdbd39d49f3..eefdb39f7bdb 100644
--- a/sysutils/logtool-devel/pkg-descr
+++ b/sysutils/logtool-devel/pkg-descr
@@ -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 @@ of the following formats for your viewing pleasure:
   - 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 --git a/sysutils/logtool-devel/pkg-message b/sysutils/logtool-devel/pkg-message
new file mode 100644
index 000000000000..fa963277f72b
--- /dev/null
+++ b/sysutils/logtool-devel/pkg-message
@@ -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 --git a/sysutils/logtool-devel/pkg-plist b/sysutils/logtool-devel/pkg-plist
index 26bd1f54de67..9b6fc7fd1dbe 100644
--- a/sysutils/logtool-devel/pkg-plist
+++ b/sysutils/logtool-devel/pkg-plist
@@ -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%%
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index e1cb16f971ba..d3f3a3505d1f 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -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
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/configure
-
-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
+DOCS=		CREDITS Changes README TODO doc/logtool.txt
+
+do-build:
+	cd ${WRKSRC}/src && ${GMAKE} INCLUDES="${CPPFLAGS}"
+
+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 --git a/sysutils/logtool/distinfo b/sysutils/logtool/distinfo
index 7f08ed78499a..a6ba46b65a0b 100644
--- a/sysutils/logtool/distinfo
+++ b/sysutils/logtool/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.7.tar.gz) = 89257ee8b4f735e72d1d3585b9331b6c
+MD5 (logtool-1.2.2.tar.gz) = f223c16e311eeda412d7b33806dad4af
diff --git a/sysutils/logtool/files/patch-ab b/sysutils/logtool/files/patch-ab
index 7788159c0f29..251d4cee729d 100644
--- a/sysutils/logtool/files/patch-ab
+++ b/sysutils/logtool/files/patch-ab
@@ -1,5 +1,5 @@
 --- logtool/includes.h.orig	Wed Jan 10 04:18:00 2001
-+++ logtool/includes.h	Wed Jan 10 04:20:00 2001
++++ src/includes.h	Wed Jan 10 04:20:00 2001
 @@ -22,6 +22,7 @@
  #include<stdio.h>
  #include<stdlib.h>
diff --git a/sysutils/logtool/files/patch-configure b/sysutils/logtool/files/patch-configure
new file mode 100644
index 000000000000..d3f80b8c09d7
--- /dev/null
+++ b/sysutils/logtool/files/patch-configure
@@ -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 --git a/sysutils/logtool/pkg-descr b/sysutils/logtool/pkg-descr
index 3fdbd39d49f3..eefdb39f7bdb 100644
--- a/sysutils/logtool/pkg-descr
+++ b/sysutils/logtool/pkg-descr
@@ -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 @@ of the following formats for your viewing pleasure:
   - 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 --git a/sysutils/logtool/pkg-message b/sysutils/logtool/pkg-message
new file mode 100644
index 000000000000..fa963277f72b
--- /dev/null
+++ b/sysutils/logtool/pkg-message
@@ -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 --git a/sysutils/logtool/pkg-plist b/sysutils/logtool/pkg-plist
index 26bd1f54de67..9b6fc7fd1dbe 100644
--- a/sysutils/logtool/pkg-plist
+++ b/sysutils/logtool/pkg-plist
@@ -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%%