Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jan 2001 04:55:14 +0800 (CST)
From:      Ying-Chieh Liao <ijliao@terry.dragon2.net>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/24205: maintainer update : sysutils/logtool
Message-ID:  <200101092055.f09KtEk56778@Terry.Dorm8.NCTU.edu.tw>

next in thread | raw e-mail | index | archive | help

>Number:         24205
>Category:       ports
>Synopsis:       maintainer update : sysutils/logtool
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 09 13:00:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Liao
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD Terry.Dorm8.NCTU.edu.tw 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Dec 20 08:59:11 CST 2000 root@Terry.Dorm8.NCTU.edu.tw:/usr/obj/usr/src/sys/TERRY i386


	
>Description:

update to 1.0.2 and install documents

>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/sysutils/logtool/Makefile logtool/Makefile
--- /usr/ports/sysutils/logtool/Makefile	Sun Dec 31 00:46:49 2000
+++ logtool/Makefile	Wed Jan 10 04:48:40 2001
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://users.digitex.net/~max/
 
@@ -17,11 +17,24 @@
 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
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
 .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 -ruN /usr/ports/sysutils/logtool/distinfo logtool/distinfo
--- /usr/ports/sysutils/logtool/distinfo	Sun Dec 31 00:46:49 2000
+++ logtool/distinfo	Wed Jan 10 04:11:21 2001
@@ -1 +1 @@
-MD5 (logtool-1.0.1.tar.gz) = 6d6f122ecb77e47326cf57cbe2349f84
+MD5 (logtool-1.0.2.tar.gz) = 40b78cfc003c7122712792da72135aef
diff -ruN /usr/ports/sysutils/logtool/files/patch-aa logtool/files/patch-aa
--- /usr/ports/sysutils/logtool/files/patch-aa	Sun Dec 31 00:46:49 2000
+++ logtool/files/patch-aa	Wed Jan 10 04:17:11 2001
@@ -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 -ruN /usr/ports/sysutils/logtool/files/patch-ab logtool/files/patch-ab
--- /usr/ports/sysutils/logtool/files/patch-ab	Sun Dec 31 00:46:49 2000
+++ logtool/files/patch-ab	Wed Jan 10 04:20:49 2001
@@ -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 -ruN /usr/ports/sysutils/logtool/files/patch-ac logtool/files/patch-ac
--- /usr/ports/sysutils/logtool/files/patch-ac	Sun Dec 31 00:46:49 2000
+++ logtool/files/patch-ac	Thu Jan  1 08:00:00 1970
@@ -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 -ruN /usr/ports/sysutils/logtool/pkg-plist logtool/pkg-plist
--- /usr/ports/sysutils/logtool/pkg-plist	Sun Dec 31 00:46:49 2000
+++ logtool/pkg-plist	Wed Jan 10 04:47:46 2001
@@ -5,4 +5,11 @@
 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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101092055.f09KtEk56778>