upgrade to 1.0.6

change master site & WWW

10 files changed, 38 insertions, 34 deletions

diff --git a/sysutils/logtool-devel/Makefile b/sysutils/logtool-devel/Makefile
index b7b33e5a59d8..9203c20e3885 100644
--- a/sysutils/logtool-devel/Makefile
+++ b/sysutils/logtool-devel/Makefile
@@ -7,21 +7,24 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	sysutils
-MASTER_SITES=	http://users.digitex.net/~max/logtool/
+MASTER_SITES=	http://www.xjack.org/logtool/logtool/
 
 MAINTAINER=	ijliao@FreeBSD.org
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=/usr/local --sysconfdir=/usr/local/etc/logtool
+CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/logtool
 
 ALL_TARGET=	build
 
 MAN1=		logtool.1
 
+post-patch:
+	@${PERL} -pi -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/configure
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/logtool.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/logtool-devel/distinfo b/sysutils/logtool-devel/distinfo
index 597285aa1b3a..668518e2a1d3 100644
--- a/sysutils/logtool-devel/distinfo
+++ b/sysutils/logtool-devel/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.5.tar.gz) = 5fb5376725bfccb0bec31fbb054d92ef
+MD5 (logtool-1.0.6.tar.gz) = b8baf0022e93ad4f2e134dc93cf063a4
diff --git a/sysutils/logtool-devel/files/patch-configure b/sysutils/logtool-devel/files/patch-configure
index 90bf21b57c58..4b0f8184ce3b 100644
--- a/sysutils/logtool-devel/files/patch-configure
+++ b/sysutils/logtool-devel/files/patch-configure
@@ -1,11 +1,14 @@
---- configure.orig	Mon Feb 12 00:10:54 2001
-+++ configure	Mon Feb 12 00:11:16 2001
-@@ -745,7 +745,7 @@
- fi
- 
- if test -n "$GCC"; then
--	CFLAGS="-O3 -Wall -Werror -ansi -pedantic"
-+	CFLAGS="-ansi -pedantic"
+--- 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/pkg-descr b/sysutils/logtool-devel/pkg-descr
index 6d066e7ae916..3fdbd39d49f3 100644
--- a/sysutils/logtool-devel/pkg-descr
+++ b/sysutils/logtool-devel/pkg-descr
@@ -14,7 +14,4 @@ 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. 
 
-WWW: http://users.digitex.net/~max/
-
--- Ying-Chieh Liao
-   ijliao@csie.nctu.edu.tw
+WWW: http://www.xjack.org/logtool/
diff --git a/sysutils/logtool-devel/pkg-plist b/sysutils/logtool-devel/pkg-plist
index 749a1c9f5f05..3d13413c6013 100644
--- a/sysutils/logtool-devel/pkg-plist
+++ b/sysutils/logtool-devel/pkg-plist
@@ -1,5 +1,4 @@
 bin/logtool
-bin/lt
 bin/logtail
 etc/logtool/exclude
 etc/logtool/green
diff --git a/sysutils/logtool/Makefile b/sysutils/logtool/Makefile
index b7b33e5a59d8..9203c20e3885 100644
--- a/sysutils/logtool/Makefile
+++ b/sysutils/logtool/Makefile
@@ -7,21 +7,24 @@
 #
 
 PORTNAME=	logtool
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.6
 CATEGORIES=	sysutils
-MASTER_SITES=	http://users.digitex.net/~max/logtool/
+MASTER_SITES=	http://www.xjack.org/logtool/logtool/
 
 MAINTAINER=	ijliao@FreeBSD.org
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=/usr/local --sysconfdir=/usr/local/etc/logtool
+CONFIGURE_ARGS=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc/logtool
 
 ALL_TARGET=	build
 
 MAN1=		logtool.1
 
+post-patch:
+	@${PERL} -pi -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/configure
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/logtool.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/logtool/distinfo b/sysutils/logtool/distinfo
index 597285aa1b3a..668518e2a1d3 100644
--- a/sysutils/logtool/distinfo
+++ b/sysutils/logtool/distinfo
@@ -1 +1 @@
-MD5 (logtool-1.0.5.tar.gz) = 5fb5376725bfccb0bec31fbb054d92ef
+MD5 (logtool-1.0.6.tar.gz) = b8baf0022e93ad4f2e134dc93cf063a4
diff --git a/sysutils/logtool/files/patch-configure b/sysutils/logtool/files/patch-configure
index 90bf21b57c58..4b0f8184ce3b 100644
--- a/sysutils/logtool/files/patch-configure
+++ b/sysutils/logtool/files/patch-configure
@@ -1,11 +1,14 @@
---- configure.orig	Mon Feb 12 00:10:54 2001
-+++ configure	Mon Feb 12 00:11:16 2001
-@@ -745,7 +745,7 @@
- fi
- 
- if test -n "$GCC"; then
--	CFLAGS="-O3 -Wall -Werror -ansi -pedantic"
-+	CFLAGS="-ansi -pedantic"
+--- 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/pkg-descr b/sysutils/logtool/pkg-descr
index 6d066e7ae916..3fdbd39d49f3 100644
--- a/sysutils/logtool/pkg-descr
+++ b/sysutils/logtool/pkg-descr
@@ -14,7 +14,4 @@ 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. 
 
-WWW: http://users.digitex.net/~max/
-
--- Ying-Chieh Liao
-   ijliao@csie.nctu.edu.tw
+WWW: http://www.xjack.org/logtool/
diff --git a/sysutils/logtool/pkg-plist b/sysutils/logtool/pkg-plist
index 749a1c9f5f05..3d13413c6013 100644
--- a/sysutils/logtool/pkg-plist
+++ b/sysutils/logtool/pkg-plist
@@ -1,5 +1,4 @@
 bin/logtool
-bin/lt
 bin/logtail
 etc/logtool/exclude
 etc/logtool/green