4 files changed, 15 insertions, 21 deletions

diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index f5eda995ac39..a5934565e2d8 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -1,12 +1,13 @@
+# ex:ts=8
 # New ports collection makefile for:	logtool
-# Date created:		Dec 30, 2000
+# Date created:			Dec 30, 2000
 # Whom:				Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://users.digitex.net/~max/
 
@@ -14,7 +15,9 @@ MAINTAINER=	ijliao@csie.nctu.edu.tw
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
-USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS= default
+
 ALL_TARGET=	build
 
 .if defined(NOPORTDOCS)
@@ -24,7 +27,6 @@ NODOCS=		"@comment "
 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
@@ -34,7 +36,7 @@ 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
+	@${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/logtool
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/logtool/distinfo b/sysutils/logtool/distinfo
index 4a2490723069..79a9f11eada2 100644
--- a/sysutils/logtool/distinfo
+++ b/sysutils/logtool/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.2.tar.gz) = 40b78cfc003c7122712792da72135aef
+MD5 (logtool-1.0.3.tar.gz) = 88fb933946f00b8315e6e3967660eee0
diff --git a/sysutils/logtool/files/patch-aa b/sysutils/logtool/files/patch-aa
index 496bb1eb23e2..a35ed878c926 100644
--- a/sysutils/logtool/files/patch-aa
+++ b/sysutils/logtool/files/patch-aa
@@ -1,5 +1,5 @@
---- logtool/Makefile.orig	Wed Jan 10 04:13:50 2001
-+++ logtool/Makefile	Wed Jan 10 04:16:20 2001
+--- logtool/Makefile.orig	Sat Jan 13 14:56:21 2001
++++ logtool/Makefile	Sat Jan 13 14:58:01 2001
 @@ -9,8 +9,8 @@
  	 csv.o html.o raw.o logtool.o main.o
  SRC = logtool.c
@@ -24,18 +24,9 @@
 @@ -28,7 +29,7 @@
  
  ### The main build stuff
- logtool: logtool.o $(LIB)
--	$(CC) -o $(PROG) logtool.o $(LIB) $(ADDCFLAGS)
-+	$(CC) -o $(PROG) logtool.o $(LIB) $(ADDCFLAGS) ${LIBS}
+ logtool: logtool.o $(OBJS)
+-	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) 
++	$(CC) $(ADDCFLAGS) -o $(PROG) $(OBJS) ${LIBS}
  	@echo "strip $(PROG)"	
  	@strip $(PROG)
  
-@@ -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
diff --git a/sysutils/logtool/pkg-plist b/sysutils/logtool/pkg-plist
index 58c16260b23a..66d1bef91b27 100644
--- a/sysutils/logtool/pkg-plist
+++ b/sysutils/logtool/pkg-plist
@@ -1,15 +1,16 @@
 bin/logtool
+bin/lt
 bin/logtail
 etc/logtool/exclude
 etc/logtool/green
 etc/logtool/include
 etc/logtool/logtool.conf
 etc/logtool/yellow
+@dirrm etc/logtool
 %%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