Update to tidy-20020301.

Changes are mostly bugfixes, but I couldn't find a ChangeLog.

4 files changed, 49 insertions, 37 deletions

diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 3b5ad5216d2..c4496e4b292 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,19 +1,24 @@
-# $NetBSD: Makefile,v 1.5 2001/02/25 04:18:25 hubertf Exp $
-# FreeBSD Id: ports/www/tidy/Makefile,v 1.15 2000/02/16 00:08:36 mharo Exp
+# $NetBSD: Makefile,v 1.6 2002/03/07 13:33:52 wiz Exp $
+#
 
-DISTNAME=	tidy4aug00
-PKGNAME=	tidy-20000804
+DISTNAME=	tidy_src_020301
+PKGNAME=	tidy-20020301
+WRKSRC=		${WRKDIR}/tidy
 CATEGORIES=	www
-MASTER_SITES=	http://www.w3.org/People/Raggett/
+MASTER_SITES=	http://tidy.sourceforge.net/src/ \
+		http://tidy.sourceforge.net/docs/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.w3c.org/People/Raggett/tidy/
 COMMENT=	Fixes and tidies up HTML files
 
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tidy_docs_000804${EXTRACT_SUFX}
 ALL_TARGET=	tidy
+CFLAGS+=	-DPRESERVE_FILE_TIMES=0
 
-DOCFILES=	Overview.html tidy.gif release-notes.html grid.gif
+DOCFILES=	htmldoc/Overview.html htmldoc/tidy.gif \
+		htmldoc/release-notes.html htmldoc/grid.gif
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
diff --git a/www/tidy/distinfo b/www/tidy/distinfo
index 3bb39735685..39759326a02 100644
--- a/www/tidy/distinfo
+++ b/www/tidy/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:46 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/03/07 13:33:52 wiz Exp $
 
-SHA1 (tidy4aug00.tgz) = 0cf968ebdc048e008c5068ba064f71627aad0d5c
-Size (tidy4aug00.tgz) = 143169 bytes
-SHA1 (patch-aa) = 66a8f3a3d00720cbdb3f17b214f5ff8cc8164df9
-SHA1 (patch-ab) = e045c3af782fff5427d665f6d6902d91d090c861
+SHA1 (tidy_src_020301.tgz) = b7dd5ff5b27e2b08e10d86b6a415451b0dce6103
+Size (tidy_src_020301.tgz) = 121823 bytes
+SHA1 (tidy_docs_000804.tgz) = 4a65d4edbacf00b85ee4a8d5475403624df83ceb
+Size (tidy_docs_000804.tgz) = 55569 bytes
+SHA1 (patch-aa) = e5822a63c68ae342710b96374e1217115ac7e6bb
+SHA1 (patch-ab) = d2e56dfc74e5eac3044256ab4cf433e6fa888a91
diff --git a/www/tidy/patches/patch-aa b/www/tidy/patches/patch-aa
index 6e5ca8a3646..1c3e13ae7f6 100644
--- a/www/tidy/patches/patch-aa
+++ b/www/tidy/patches/patch-aa
@@ -1,21 +1,30 @@
-$NetBSD: patch-aa,v 1.3 2000/12/18 20:20:12 kim Exp $
+$NetBSD: patch-aa,v 1.4 2002/03/07 13:33:53 wiz Exp $
 
---- Makefile.orig	Fri Aug  4 12:21:20 2000
-+++ Makefile	Mon Dec 18 15:09:19 2000
-@@ -1,14 +1,8 @@
- # Makefile - for tidy
+--- Makefile.orig	Mon Jan 21 08:50:02 2002
++++ Makefile
+@@ -52,20 +52,20 @@
+ #  acknowledgment is not required but would be appreciated.
+ #
  
 -CC= gcc
 +#CC= gcc
  
--CFLAGS= -O
--
--# Makefile - for tidy
--
--CC= gcc
--
--CFLAGS= -O
-+CFLAGS+= -D__USE_MISC
+ INCLDIR= ./include/
+ SRCDIR= ./src/
+ OBJDIR= ./
+ 
+ DEBUGFLAGS=-g -DDMALLOC
+-CFLAGS= -I $(INCLDIR)
++CFLAGS+= -I $(INCLDIR)
+ OTHERCFLAGS=
+-LIBS=-lc
++#LIBS=-lc
+ DEBUGLIBS=-ldmalloc
  
- INSTALLDIR= /usr/local/
+-INSTALLDIR= /usr/local/
+-MANPAGESDIR= /usr/local/man/
++INSTALLDIR= ${PREFIX}/
++MANPAGESDIR= ${PREFIX}/man/
  
+ OFILES=		$(OBJDIR)attrs.o         $(OBJDIR)istack.o        $(OBJDIR)parser.o        $(OBJDIR)tags.o \
+ 		$(OBJDIR)entities.o      $(OBJDIR)lexer.o         $(OBJDIR)pprint.o        $(OBJDIR)clean.o \
diff --git a/www/tidy/patches/patch-ab b/www/tidy/patches/patch-ab
index db3294d35eb..4312e850e97 100644
--- a/www/tidy/patches/patch-ab
+++ b/www/tidy/patches/patch-ab
@@ -1,17 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/03/28 17:22:20 tron Exp $
+$NetBSD: patch-ab,v 1.3 2002/03/07 13:33:53 wiz Exp $
 
---- platform.h.orig	Thu Jan 13 21:19:19 2000
-+++ platform.h	Fri Mar  3 12:52:05 2000
-@@ -17,10 +17,10 @@
-   It enables tidy to find config files named ~/.tidyrc
-   and ~your/.tidyrc etc if the HTML_TIDY environment
+--- include/platform.h.orig	Mon Feb 18 08:50:02 2002
++++ include/platform.h
+@@ -28,7 +28,7 @@
    variable is not set. Contributed by Todd Lewis.
--
--#define SUPPORT_GETPWNAM
  */
+ 
+-/* #define SUPPORT_GETPWNAM */
 +#define SUPPORT_GETPWNAM
  
-+#include <sys/types.h>
- #include <ctype.h>
- #include <stdio.h>
- #include <setjmp.h>  /* for longjmp on error exit */
+ /* Enable/disable support for Big5 and Shift_JIS character encodings */
+ #ifndef SUPPORT_ASIAN_ENCODINGS