10 files changed, 36 insertions, 110 deletions

diff --git a/sysutils/logtool-devel/Makefile b/sysutils/logtool-devel/Makefile
index f2f41f6f29c8..e1cb16f971ba 100644
--- a/sysutils/logtool-devel/Makefile
+++ b/sysutils/logtool-devel/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.xjack.org/logtool/logtool/
+MASTER_SITES=	http://xjack.org/logtool/logtool/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse syslog logfile into a palatable format
@@ -36,8 +36,8 @@ post-install:
 	@${CP} ${WRKSRC}/conf/yellow ${PREFIX}/etc/logtool/yellow.dist
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing logtool docs in ${PREFIX}/share/doc/logtool"
-	@${MKDIR} ${PREFIX}/share/doc/logtool && ${CHMOD} a+rx ${PREFIX}/share/doc/logtool
-	@${CP} -R ${WRKSRC}/doc/examples ${WRKSRC}/doc/logtool.txt ${PREFIX}/share/doc/logtool
+	@${MKDIR} ${DOCSDIR}
+	@${CP} -Rvf ${WRKSRC}/scripts ${WRKSRC}/doc/logtool.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/logtool-devel/distinfo b/sysutils/logtool-devel/distinfo
index a6bf21f49a79..7f08ed78499a 100644
--- a/sysutils/logtool-devel/distinfo
+++ b/sysutils/logtool-devel/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.6.tar.gz) = fc19cba56a9a9a1d7bf3c7210fb5282e
+MD5 (logtool-1.0.7.tar.gz) = 89257ee8b4f735e72d1d3585b9331b6c
diff --git a/sysutils/logtool-devel/files/patch-configure b/sysutils/logtool-devel/files/patch-configure
deleted file mode 100644
index 4b0f8184ce3b..000000000000
--- a/sysutils/logtool-devel/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Tue Jun 12 14:46:04 2001
-+++ configure	Tue Jun 12 14:46:09 2001
-@@ -744,11 +744,6 @@
-   fi
- fi
- 
--if test -n "$GCC"; then
--	CFLAGS="-O3 -Wall"
--fi
--
--
- 
- if test "`echo "$sysconfdir" | grep "prefix"`" ; then
- sysconfdir=`echo $sysconfdir/logtool | sed s/'${prefix}'/""/g`
diff --git a/sysutils/logtool-devel/files/patch-logtool::Makefile.in b/sysutils/logtool-devel/files/patch-logtool::Makefile.in
deleted file mode 100644
index 0f0dbffba0c4..000000000000
--- a/sysutils/logtool-devel/files/patch-logtool::Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- logtool/Makefile.in.orig	Sun Feb 11 23:50:38 2001
-+++ logtool/Makefile.in	Sun Feb 11 23:54:02 2001
-@@ -16,6 +16,7 @@
- CC = @CC@
- INSTALL = @installprog@
- CFLAGS= @CFLAGS@ @DEFS@ @LIBS@
-+LIBS=	-L/usr/local/lib -lgnugetopt
- 
- ### The stuff below is (I hope) no longer needed now that we us autoconf/configure and friends
- # Solaris users should probably use the following instead (thanks Christoph Krempe <ck@ub.fu-berlin.de>)
-@@ -30,7 +31,7 @@
- 
- ### The main build stuff
- logtool: logtool.o $(OBJS)
--	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) 
-+	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) ${LIBS}
- 	@echo "strip $(PROG)"	
- 	@strip $(PROG)
- 
diff --git a/sysutils/logtool-devel/pkg-plist b/sysutils/logtool-devel/pkg-plist
index cbeb840d8745..26bd1f54de67 100644
--- a/sysutils/logtool-devel/pkg-plist
+++ b/sysutils/logtool-devel/pkg-plist
@@ -1,25 +1,21 @@
 bin/logtool
 bin/logtail
-@unexec if cmp -s %D/etc/logtool/exclude %D/etc/logtool/exclude.dist; then rm -f %D/etc/logtool/exclude; fi
+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
-@exec [ -f %B/exclude ] || cp %B/%f %B/exclude
-@unexec if cmp -s %D/etc/logtool/green %D/etc/logtool/green.dist; then rm -f %D/etc/logtool/green; fi
 etc/logtool/green.dist
-@exec [ -f %B/green ] || cp %B/%f %B/green
-@unexec if cmp -s %D/etc/logtool/include %D/etc/logtool/include.dist; then rm -f %D/etc/logtool/include; fi
 etc/logtool/include.dist
-@exec [ -f %B/include ] || cp %B/%f %B/include
-@unexec if cmp -s %D/etc/logtool/logtool.conf %D/etc/logtool/logtool.conf.dist; then rm -f %D/etc/logtool/logtool.conf; fi
-etc/logtool/logtool.conf.dist
-@exec [ -f %B/logtool.conf ] || cp %B/%f %B/logtool.conf
-@unexec if cmp -s %D/etc/logtool/yellow %D/etc/logtool/yellow.dist; then rm -f %D/etc/logtool/yellow; fi
 etc/logtool/yellow.dist
-@exec [ -f %B/yellow ] || cp %B/%f %B/yellow
-@unexec rmdir %D/etc/logtool 2>/dev/null || true
-%%PORTDOCS%%share/doc/logtool/examples/README
-%%PORTDOCS%%share/doc/logtool/examples/cronjob.genwebpage.sh
-%%PORTDOCS%%share/doc/logtool/examples/cronjob.emailreport.sh
-%%PORTDOCS%%share/doc/logtool/examples/monitor.logs.sh
+%%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
-%%PORTDOCS%%@dirrm share/doc/logtool/examples
+@dirrm etc/logtool
+%%PORTDOCS%%@dirrm share/doc/logtool/scripts
 %%PORTDOCS%%@dirrm share/doc/logtool
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index f2f41f6f29c8..e1cb16f971ba 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.xjack.org/logtool/logtool/
+MASTER_SITES=	http://xjack.org/logtool/logtool/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse syslog logfile into a palatable format
@@ -36,8 +36,8 @@ post-install:
 	@${CP} ${WRKSRC}/conf/yellow ${PREFIX}/etc/logtool/yellow.dist
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing logtool docs in ${PREFIX}/share/doc/logtool"
-	@${MKDIR} ${PREFIX}/share/doc/logtool && ${CHMOD} a+rx ${PREFIX}/share/doc/logtool
-	@${CP} -R ${WRKSRC}/doc/examples ${WRKSRC}/doc/logtool.txt ${PREFIX}/share/doc/logtool
+	@${MKDIR} ${DOCSDIR}
+	@${CP} -Rvf ${WRKSRC}/scripts ${WRKSRC}/doc/logtool.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/logtool/distinfo b/sysutils/logtool/distinfo
index a6bf21f49a79..7f08ed78499a 100644
--- a/sysutils/logtool/distinfo
+++ b/sysutils/logtool/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.6.tar.gz) = fc19cba56a9a9a1d7bf3c7210fb5282e
+MD5 (logtool-1.0.7.tar.gz) = 89257ee8b4f735e72d1d3585b9331b6c
diff --git a/sysutils/logtool/files/patch-configure b/sysutils/logtool/files/patch-configure
deleted file mode 100644
index 4b0f8184ce3b..000000000000
--- a/sysutils/logtool/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Tue Jun 12 14:46:04 2001
-+++ configure	Tue Jun 12 14:46:09 2001
-@@ -744,11 +744,6 @@
-   fi
- fi
- 
--if test -n "$GCC"; then
--	CFLAGS="-O3 -Wall"
--fi
--
--
- 
- if test "`echo "$sysconfdir" | grep "prefix"`" ; then
- sysconfdir=`echo $sysconfdir/logtool | sed s/'${prefix}'/""/g`
diff --git a/sysutils/logtool/files/patch-logtool::Makefile.in b/sysutils/logtool/files/patch-logtool::Makefile.in
deleted file mode 100644
index 0f0dbffba0c4..000000000000
--- a/sysutils/logtool/files/patch-logtool::Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- logtool/Makefile.in.orig	Sun Feb 11 23:50:38 2001
-+++ logtool/Makefile.in	Sun Feb 11 23:54:02 2001
-@@ -16,6 +16,7 @@
- CC = @CC@
- INSTALL = @installprog@
- CFLAGS= @CFLAGS@ @DEFS@ @LIBS@
-+LIBS=	-L/usr/local/lib -lgnugetopt
- 
- ### The stuff below is (I hope) no longer needed now that we us autoconf/configure and friends
- # Solaris users should probably use the following instead (thanks Christoph Krempe <ck@ub.fu-berlin.de>)
-@@ -30,7 +31,7 @@
- 
- ### The main build stuff
- logtool: logtool.o $(OBJS)
--	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) 
-+	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) ${LIBS}
- 	@echo "strip $(PROG)"	
- 	@strip $(PROG)
- 
diff --git a/sysutils/logtool/pkg-plist b/sysutils/logtool/pkg-plist
index cbeb840d8745..26bd1f54de67 100644
--- a/sysutils/logtool/pkg-plist
+++ b/sysutils/logtool/pkg-plist
@@ -1,25 +1,21 @@
 bin/logtool
 bin/logtail
-@unexec if cmp -s %D/etc/logtool/exclude %D/etc/logtool/exclude.dist; then rm -f %D/etc/logtool/exclude; fi
+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
-@exec [ -f %B/exclude ] || cp %B/%f %B/exclude
-@unexec if cmp -s %D/etc/logtool/green %D/etc/logtool/green.dist; then rm -f %D/etc/logtool/green; fi
 etc/logtool/green.dist
-@exec [ -f %B/green ] || cp %B/%f %B/green
-@unexec if cmp -s %D/etc/logtool/include %D/etc/logtool/include.dist; then rm -f %D/etc/logtool/include; fi
 etc/logtool/include.dist
-@exec [ -f %B/include ] || cp %B/%f %B/include
-@unexec if cmp -s %D/etc/logtool/logtool.conf %D/etc/logtool/logtool.conf.dist; then rm -f %D/etc/logtool/logtool.conf; fi
-etc/logtool/logtool.conf.dist
-@exec [ -f %B/logtool.conf ] || cp %B/%f %B/logtool.conf
-@unexec if cmp -s %D/etc/logtool/yellow %D/etc/logtool/yellow.dist; then rm -f %D/etc/logtool/yellow; fi
 etc/logtool/yellow.dist
-@exec [ -f %B/yellow ] || cp %B/%f %B/yellow
-@unexec rmdir %D/etc/logtool 2>/dev/null || true
-%%PORTDOCS%%share/doc/logtool/examples/README
-%%PORTDOCS%%share/doc/logtool/examples/cronjob.genwebpage.sh
-%%PORTDOCS%%share/doc/logtool/examples/cronjob.emailreport.sh
-%%PORTDOCS%%share/doc/logtool/examples/monitor.logs.sh
+%%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
-%%PORTDOCS%%@dirrm share/doc/logtool/examples
+@dirrm etc/logtool
+%%PORTDOCS%%@dirrm share/doc/logtool/scripts
 %%PORTDOCS%%@dirrm share/doc/logtool