Update to 1.0.2 and install documents.

PR:		ports/24205
Submitted by:	Ying-Chieh Liao <ijliao@csie.nctu.edu.tw> (MAINTAINER)

12 files changed, 80 insertions, 54 deletions

diff --git a/sysutils/logtool-devel/Makefile b/sysutils/logtool-devel/Makefile
index fa42950c7861..f5eda995ac39 100644
--- a/sysutils/logtool-devel/Makefile
+++ b/sysutils/logtool-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://users.digitex.net/~max/
 
@@ -17,6 +17,12 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 USE_GMAKE=	yes
 ALL_TARGET=	build
 
+.if defined(NOPORTDOCS)
+NODOCS=		"@comment "
+.endif
+
+PLIST_SUB=	NOPORTDOCS=${NODOCS}
+
 post-patch:
 	@${PERL} -pi -e "s|make|${GMAKE}|g" ${WRKSRC}/Makefile
 .for file in logtool/Makefile logtail/Makefile
@@ -24,4 +30,11 @@ post-patch:
 .endfor
 	@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/logtool/config.h
 
+post-install:
+.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/* ${PREFIX}/share/doc/logtool
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/logtool-devel/distinfo b/sysutils/logtool-devel/distinfo
index ec034f6969cc..4a2490723069 100644
--- a/sysutils/logtool-devel/distinfo
+++ b/sysutils/logtool-devel/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.1.tar.gz) = 6d6f122ecb77e47326cf57cbe2349f84
+MD5 (logtool-1.0.2.tar.gz) = 40b78cfc003c7122712792da72135aef
diff --git a/sysutils/logtool-devel/files/patch-aa b/sysutils/logtool-devel/files/patch-aa
index 6f3f655400b7..496bb1eb23e2 100644
--- a/sysutils/logtool-devel/files/patch-aa
+++ b/sysutils/logtool-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- logtool/Makefile.orig	Sat Dec 30 16:57:27 2000
-+++ logtool/Makefile	Sat Dec 30 20:43:49 2000
-@@ -9,12 +9,13 @@
+--- logtool/Makefile.orig	Wed Jan 10 04:13:50 2001
++++ logtool/Makefile	Wed Jan 10 04:16:20 2001
+@@ -9,8 +9,8 @@
  	 csv.o html.o raw.o logtool.o main.o
  SRC = logtool.c
  # These options affect where logtool gets installed
@@ -10,14 +10,18 @@
 +ETCDIR = %%PREFIX%%/etc/logtool
  CC = gcc
  
+ INSTALL = /usr/bin/install
+@@ -18,7 +18,8 @@
+ # INSTALL = /usr/ucb/install
+ 
  # For RedHat (and most other) Linux'es, this should be ideal
 -CFLAGS= -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
 +CFLAGS= -I/usr/local/include -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
-+LIBS=	-L/usr/local/lib -lgnugetopt
++LIBS=  -L/usr/local/lib -lgnugetopt
  
  # For portability to non-linux'es/non-standard-linux'es, try this
- # CFLAGS = -Wall -Werror
-@@ -22,7 +23,7 @@
+ # CFLAGS = -Wall
+@@ -28,7 +29,7 @@
  
  ### The main build stuff
  logtool: logtool.o $(LIB)
@@ -26,12 +30,12 @@
  	@echo "strip $(PROG)"	
  	@strip $(PROG)
  
-@@ -56,7 +57,7 @@
+@@ -62,7 +63,7 @@
  
  ### How to install this puppy
  install: logtool
 -	mkdir -p /etc/logtool
 +	mkdir -p ${ETCDIR}
- 	install -c -m 0644 -o root ../conf/logtool.conf $(ETCDIR)/logtool.conf
- 	install -c -m 0644 -o root ../conf/green $(ETCDIR)/green
- 	install -c -m 0644 -o root ../conf/yellow $(ETCDIR)/yellow
+ 	$(INSTALL) -c -m 0644 -o root ../conf/logtool.conf $(ETCDIR)/logtool.conf
+ 	$(INSTALL) -c -m 0644 -o root ../conf/green $(ETCDIR)/green
+ 	$(INSTALL) -c -m 0644 -o root ../conf/yellow $(ETCDIR)/yellow
diff --git a/sysutils/logtool-devel/files/patch-ab b/sysutils/logtool-devel/files/patch-ab
index d157f7fb0176..7788159c0f29 100644
--- a/sysutils/logtool-devel/files/patch-ab
+++ b/sysutils/logtool-devel/files/patch-ab
@@ -1,9 +1,9 @@
---- logtool/includes.h.orig	Sat Dec 30 20:19:32 2000
-+++ logtool/includes.h	Sat Dec 30 20:40:09 2000
-@@ -23,6 +23,7 @@
+--- 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<getopt.h>
 +#include<unistd.h>
  #include<regex.h>
  #include<errno.h>
diff --git a/sysutils/logtool-devel/files/patch-ac b/sysutils/logtool-devel/files/patch-ac
deleted file mode 100644
index e4a1e31c8f8a..000000000000
--- a/sysutils/logtool-devel/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- logtool/logtool.h.orig	Sat Dec 30 20:21:40 2000
-+++ logtool/logtool.h	Sat Dec 30 20:22:16 2000
-@@ -62,7 +62,7 @@
-  * For some reason string.h doesn't define this, so I do it here 
-  * Are there portability problems with strncasesmp or sumpthin? 
-  */
--int strncasecmp(char *s1, char *s2, size_t size); 
-+/*int strncasecmp(char *s1, char *s2, size_t size); */
- 
- 
- /*
diff --git a/sysutils/logtool-devel/pkg-plist b/sysutils/logtool-devel/pkg-plist
index 6298bf3737f8..58c16260b23a 100644
--- a/sysutils/logtool-devel/pkg-plist
+++ b/sysutils/logtool-devel/pkg-plist
@@ -5,4 +5,11 @@ etc/logtool/green
 etc/logtool/include
 etc/logtool/logtool.conf
 etc/logtool/yellow
+%%NOPORTDOCS%%share/doc/logtool/examples/README
+%%NOPORTDOCS%%share/doc/logtool/examples/cronjob.genwebpage.sh
+%%NOPORTDOCS%%share/doc/logtool/examples/cronjob.emailreport.sh
+%%NOPORTDOCS%%share/doc/logtool/examples/monitor.logs.sh
+%%NOPORTDOCS%%share/doc/logtool/logtool.txt
 @dirrm etc/logtool
+%%NOPORTDOCS%%@dirrm share/doc/logtool/examples
+%%NOPORTDOCS%%@dirrm share/doc/logtool
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index fa42950c7861..f5eda995ac39 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://users.digitex.net/~max/
 
@@ -17,6 +17,12 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 USE_GMAKE=	yes
 ALL_TARGET=	build
 
+.if defined(NOPORTDOCS)
+NODOCS=		"@comment "
+.endif
+
+PLIST_SUB=	NOPORTDOCS=${NODOCS}
+
 post-patch:
 	@${PERL} -pi -e "s|make|${GMAKE}|g" ${WRKSRC}/Makefile
 .for file in logtool/Makefile logtail/Makefile
@@ -24,4 +30,11 @@ post-patch:
 .endfor
 	@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/logtool/config.h
 
+post-install:
+.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/* ${PREFIX}/share/doc/logtool
+.endif
+
 .include <bsd.port.mk>
diff --git a/sysutils/logtool/distinfo b/sysutils/logtool/distinfo
index ec034f6969cc..4a2490723069 100644
--- a/sysutils/logtool/distinfo
+++ b/sysutils/logtool/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.1.tar.gz) = 6d6f122ecb77e47326cf57cbe2349f84
+MD5 (logtool-1.0.2.tar.gz) = 40b78cfc003c7122712792da72135aef
diff --git a/sysutils/logtool/files/patch-aa b/sysutils/logtool/files/patch-aa
index 6f3f655400b7..496bb1eb23e2 100644
--- a/sysutils/logtool/files/patch-aa
+++ b/sysutils/logtool/files/patch-aa
@@ -1,6 +1,6 @@
---- logtool/Makefile.orig	Sat Dec 30 16:57:27 2000
-+++ logtool/Makefile	Sat Dec 30 20:43:49 2000
-@@ -9,12 +9,13 @@
+--- logtool/Makefile.orig	Wed Jan 10 04:13:50 2001
++++ logtool/Makefile	Wed Jan 10 04:16:20 2001
+@@ -9,8 +9,8 @@
  	 csv.o html.o raw.o logtool.o main.o
  SRC = logtool.c
  # These options affect where logtool gets installed
@@ -10,14 +10,18 @@
 +ETCDIR = %%PREFIX%%/etc/logtool
  CC = gcc
  
+ INSTALL = /usr/bin/install
+@@ -18,7 +18,8 @@
+ # INSTALL = /usr/ucb/install
+ 
  # For RedHat (and most other) Linux'es, this should be ideal
 -CFLAGS= -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
 +CFLAGS= -I/usr/local/include -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
-+LIBS=	-L/usr/local/lib -lgnugetopt
++LIBS=  -L/usr/local/lib -lgnugetopt
  
  # For portability to non-linux'es/non-standard-linux'es, try this
- # CFLAGS = -Wall -Werror
-@@ -22,7 +23,7 @@
+ # CFLAGS = -Wall
+@@ -28,7 +29,7 @@
  
  ### The main build stuff
  logtool: logtool.o $(LIB)
@@ -26,12 +30,12 @@
  	@echo "strip $(PROG)"	
  	@strip $(PROG)
  
-@@ -56,7 +57,7 @@
+@@ -62,7 +63,7 @@
  
  ### How to install this puppy
  install: logtool
 -	mkdir -p /etc/logtool
 +	mkdir -p ${ETCDIR}
- 	install -c -m 0644 -o root ../conf/logtool.conf $(ETCDIR)/logtool.conf
- 	install -c -m 0644 -o root ../conf/green $(ETCDIR)/green
- 	install -c -m 0644 -o root ../conf/yellow $(ETCDIR)/yellow
+ 	$(INSTALL) -c -m 0644 -o root ../conf/logtool.conf $(ETCDIR)/logtool.conf
+ 	$(INSTALL) -c -m 0644 -o root ../conf/green $(ETCDIR)/green
+ 	$(INSTALL) -c -m 0644 -o root ../conf/yellow $(ETCDIR)/yellow
diff --git a/sysutils/logtool/files/patch-ab b/sysutils/logtool/files/patch-ab
index d157f7fb0176..7788159c0f29 100644
--- a/sysutils/logtool/files/patch-ab
+++ b/sysutils/logtool/files/patch-ab
@@ -1,9 +1,9 @@
---- logtool/includes.h.orig	Sat Dec 30 20:19:32 2000
-+++ logtool/includes.h	Sat Dec 30 20:40:09 2000
-@@ -23,6 +23,7 @@
+--- 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<getopt.h>
 +#include<unistd.h>
  #include<regex.h>
  #include<errno.h>
diff --git a/sysutils/logtool/files/patch-ac b/sysutils/logtool/files/patch-ac
deleted file mode 100644
index e4a1e31c8f8a..000000000000
--- a/sysutils/logtool/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- logtool/logtool.h.orig	Sat Dec 30 20:21:40 2000
-+++ logtool/logtool.h	Sat Dec 30 20:22:16 2000
-@@ -62,7 +62,7 @@
-  * For some reason string.h doesn't define this, so I do it here 
-  * Are there portability problems with strncasesmp or sumpthin? 
-  */
--int strncasecmp(char *s1, char *s2, size_t size); 
-+/*int strncasecmp(char *s1, char *s2, size_t size); */
- 
- 
- /*
diff --git a/sysutils/logtool/pkg-plist b/sysutils/logtool/pkg-plist
index 6298bf3737f8..58c16260b23a 100644
--- a/sysutils/logtool/pkg-plist
+++ b/sysutils/logtool/pkg-plist
@@ -5,4 +5,11 @@ etc/logtool/green
 etc/logtool/include
 etc/logtool/logtool.conf
 etc/logtool/yellow
+%%NOPORTDOCS%%share/doc/logtool/examples/README
+%%NOPORTDOCS%%share/doc/logtool/examples/cronjob.genwebpage.sh
+%%NOPORTDOCS%%share/doc/logtool/examples/cronjob.emailreport.sh
+%%NOPORTDOCS%%share/doc/logtool/examples/monitor.logs.sh
+%%NOPORTDOCS%%share/doc/logtool/logtool.txt
 @dirrm etc/logtool
+%%NOPORTDOCS%%@dirrm share/doc/logtool/examples
+%%NOPORTDOCS%%@dirrm share/doc/logtool