Update tidy to 20031002, and docs to 20030610. No ChangeLog available,

unfortunately.

Tidy now comes with a (static) library, thus a buildlink2.mk file is now
provided.

There's no need to set PRESERVE_FILE_TIMES in CFLAGS anymore, thus
PR pkg/20489 is fixed.

6 files changed, 141 insertions, 66 deletions

diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index cc7ef9b876c..b087dc2fd12 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,35 +1,37 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:56:05 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/10/28 12:33:48 cube Exp $
 #
 
-DISTNAME=	tidy_src_021108
-PKGNAME=	tidy-20021108
+DISTNAME=	tidy_src_031002
+PKGNAME=	tidy-20031002
 WRKSRC=		${WRKDIR}/tidy
 CATEGORIES=	www
 MASTER_SITES=	http://tidy.sourceforge.net/src/ \
 		http://tidy.sourceforge.net/docs/ \
 		http://tidy.sourceforge.net/src/old/
 EXTRACT_SUFX=	.tgz
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tidy_docs_021021${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tidy_docs_030610${EXTRACT_SUFX}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://tidy.sourceforge.net/
 COMMENT=	Fixes and tidies up HTML files
 
-ALL_TARGET=	tidy
-CFLAGS+=	-DPRESERVE_FILE_TIMES=0
-
-DOCFILES=	htmldoc/Overview.html htmldoc/tidy.gif \
-		htmldoc/release-notes.html htmldoc/grid.gif
-
+USE_BUILDLINK2=	yes
+NO_CONFIGURE=	yes
 USE_GMAKE=	yes
+BUILD_DIRS=	${WRKSRC}/build/gmake
+
+HTML_DOCFILES=	Overview.html doxygen.cfg grid.gif quickref.html tidy.css	\
+		faq.html license.html pending.html release-notes.html tidy.gif
+HTML_DOCDIR=	${PREFIX}/share/doc/html/tidy
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
-	@${INSTALL_MAN}	${WRKSRC}/man_page.txt	${PREFIX}/man/man1/tidy.1
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tidy
-.for docfile in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
-.endfor
+post-install:
+	${INSTALL_DATA_DIR} ${HTML_DOCDIR}
+	for doc in ${HTML_DOCFILES}; do						\
+	    ${INSTALL_DATA} ${WRKSRC}/htmldoc/$$doc ${HTML_DOCDIR} ;	\
+	done
+	${INSTALL_DATA_DIR} ${HTML_DOCDIR}/api
+	for apifile in ${WRKSRC}/htmldoc/api/* ; do				\
+	    ${INSTALL_DATA} $$apifile ${HTML_DOCDIR}/api ;			\
+	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/tidy/PLIST b/www/tidy/PLIST
index ebfed4c986c..2963bec18b7 100644
--- a/www/tidy/PLIST
+++ b/www/tidy/PLIST
@@ -1,8 +1,74 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/10/28 12:33:48 cube Exp $
+bin/tab2space
 bin/tidy
+include/tidy/buffio.h
+include/tidy/fileio.h
+include/tidy/platform.h
+include/tidy/tidy.h
+include/tidy/tidyenum.h
+lib/libtidy.a
 man/man1/tidy.1
-share/doc/tidy/Overview.html
-share/doc/tidy/grid.gif
-share/doc/tidy/release-notes.html
-share/doc/tidy/tidy.gif
-@dirrm share/doc/tidy
+share/doc/html/tidy/Overview.html
+share/doc/html/tidy/doxygen.cfg
+share/doc/html/tidy/faq.html
+share/doc/html/tidy/grid.gif
+share/doc/html/tidy/pending.html
+share/doc/html/tidy/release-notes.html
+share/doc/html/tidy/tidy.css
+share/doc/html/tidy/tidy.gif
+share/doc/html/tidy/quickref.html
+share/doc/html/tidy/license.html
+share/doc/html/tidy/api/annotated.html
+share/doc/html/tidy/api/buffio_8h-source.html
+share/doc/html/tidy/api/buffio_8h.html
+share/doc/html/tidy/api/doxygen.css
+share/doc/html/tidy/api/doxygen.png
+share/doc/html/tidy/api/fileio_8h-source.html
+share/doc/html/tidy/api/fileio_8h.html
+share/doc/html/tidy/api/files.html
+share/doc/html/tidy/api/ftv2blank.png
+share/doc/html/tidy/api/ftv2doc.png
+share/doc/html/tidy/api/ftv2folderclosed.png
+share/doc/html/tidy/api/ftv2folderopen.png
+share/doc/html/tidy/api/ftv2lastnode.png
+share/doc/html/tidy/api/ftv2link.png
+share/doc/html/tidy/api/ftv2mlastnode.png
+share/doc/html/tidy/api/ftv2mnode.png
+share/doc/html/tidy/api/ftv2node.png
+share/doc/html/tidy/api/ftv2plastnode.png
+share/doc/html/tidy/api/ftv2pnode.png
+share/doc/html/tidy/api/ftv2vertline.png
+share/doc/html/tidy/api/functions.html
+share/doc/html/tidy/api/globals.html
+share/doc/html/tidy/api/group__AttrGet.html
+share/doc/html/tidy/api/group__Attribute.html
+share/doc/html/tidy/api/group__Basic.html
+share/doc/html/tidy/api/group__Clean.html
+share/doc/html/tidy/api/group__Configuration.html
+share/doc/html/tidy/api/group__IO.html
+share/doc/html/tidy/api/group__Memory.html
+share/doc/html/tidy/api/group__NodeAsk.html
+share/doc/html/tidy/api/group__Opaque.html
+share/doc/html/tidy/api/group__Parse.html
+share/doc/html/tidy/api/group__Save.html
+share/doc/html/tidy/api/group__Tree.html
+share/doc/html/tidy/api/index.html
+share/doc/html/tidy/api/main.html
+share/doc/html/tidy/api/modules.html
+share/doc/html/tidy/api/structTidyAttr.html
+share/doc/html/tidy/api/structTidyDoc.html
+share/doc/html/tidy/api/structTidyNode.html
+share/doc/html/tidy/api/structTidyOption.html
+share/doc/html/tidy/api/struct__TidyBuffer.html
+share/doc/html/tidy/api/struct__TidyInputSource.html
+share/doc/html/tidy/api/struct__TidyOutputSink.html
+share/doc/html/tidy/api/tidy_8h-source.html
+share/doc/html/tidy/api/tidy_8h.html
+share/doc/html/tidy/api/tidyenum_8h-source.html
+share/doc/html/tidy/api/tidyenum_8h.html
+share/doc/html/tidy/api/tree.html
+share/doc/html/tidy/api/tree.js
+share/doc/html/tidy/api/treeview.js
+@dirrm include/tidy
+@dirrm share/doc/html/tidy/api
+@dirrm share/doc/html/tidy
diff --git a/www/tidy/buildlink2.mk b/www/tidy/buildlink2.mk
new file mode 100644
index 00000000000..03f956b406f
--- /dev/null
+++ b/www/tidy/buildlink2.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/10/28 12:33:48 cube Exp $
+#
+# This Makefile fragment is included by packages that use tidy.
+#
+# This file was created automatically using createbuildlink 2.5.
+#
+
+.if !defined(TIDY_BUILDLINK2_MK)
+TIDY_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			tidy
+BUILDLINK_DEPENDS.tidy?=		tidy>=20031002
+BUILDLINK_PKGSRCDIR.tidy?=		../../www/tidy
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.tidy=tidy
+BUILDLINK_PREFIX.tidy_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.tidy+=	include/tidy/buffio.h
+BUILDLINK_FILES.tidy+=	include/tidy/fileio.h
+BUILDLINK_FILES.tidy+=	include/tidy/platform.h
+BUILDLINK_FILES.tidy+=	include/tidy/tidy.h
+BUILDLINK_FILES.tidy+=	include/tidy/tidyenum.h
+BUILDLINK_FILES.tidy+=	lib/libtidy.*
+
+BUILDLINK_TARGETS+=	tidy-buildlink
+
+tidy-buildlink: _BUILDLINK_USE
+
+.endif	# TIDY_BUILDLINK2_MK
diff --git a/www/tidy/distinfo b/www/tidy/distinfo
index 140bac060e4..fa322a0e795 100644
--- a/www/tidy/distinfo
+++ b/www/tidy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/11/22 16:37:06 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2003/10/28 12:33:48 cube Exp $
 
-SHA1 (tidy_src_021108.tgz) = ae7073ddf173ba5cd60a60995fe7e73260fc0c6a
-Size (tidy_src_021108.tgz) = 155401 bytes
-SHA1 (tidy_docs_021021.tgz) = 3617130b37299712862ff282eca7b64ed11bdbfb
-Size (tidy_docs_021021.tgz) = 67435 bytes
-SHA1 (patch-aa) = ed8c096031c01a211c6476783755f322acc92b58
-SHA1 (patch-ab) = d2e56dfc74e5eac3044256ab4cf433e6fa888a91
+SHA1 (tidy_src_031002.tgz) = bdd89ee2c09a8ba831dfce50c7ae18acb0b472fa
+Size (tidy_src_031002.tgz) = 236594 bytes
+SHA1 (tidy_docs_030610.tgz) = 3c3afddf861cebe91521be7ca0ae2476a547a3a9
+Size (tidy_docs_030610.tgz) = 152720 bytes
+SHA1 (patch-ab) = 10481ddf38e2d4bc5e12d4bfc7b214ecb5ec2120
+SHA1 (patch-ac) = 93e397595652a697bb705444f2923453818d1dde
diff --git a/www/tidy/patches/patch-aa b/www/tidy/patches/patch-aa
deleted file mode 100644
index bcc5d42d776..00000000000
--- a/www/tidy/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/11/22 16:37:07 jschauma Exp $
-
---- Makefile.orig	Fri Nov 22 11:14:40 2002
-+++ Makefile	Fri Nov 22 11:15:41 2002
-@@ -52,20 +52,20 @@
- #  acknowledgment is not required but would be appreciated.
- #
- 
--CC= gcc
-+#CC= gcc
- 
- INCLDIR= ./include/
- SRCDIR= ./src/
- OBJDIR= ./
- 
- DEBUGFLAGS=-g -DDMALLOC
--CFLAGS= -I $(INCLDIR)
-+CFLAGS+= -I $(INCLDIR)
- OTHERCFLAGS=
--LIBS=-lc
-+#LIBS=-lc
- DEBUGLIBS=-ldmalloc
- 
--INSTALLDIR= /usr/local/
--MANPAGESDIR= /usr/local/man/
-+INSTALLDIR= ${PREFIX}
-+MANPAGESDIR= ${PREFIX}/man/
- 
- OFILES=	$(OBJDIR)access.o \
- 		$(OBJDIR)attrs.o         $(OBJDIR)istack.o        $(OBJDIR)parser.o        $(OBJDIR)tags.o \
diff --git a/www/tidy/patches/patch-ab b/www/tidy/patches/patch-ab
index 4312e850e97..a48592d7a39 100644
--- a/www/tidy/patches/patch-ab
+++ b/www/tidy/patches/patch-ab
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2002/03/07 13:33:53 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2003/10/28 12:33:48 cube Exp $
 
---- include/platform.h.orig	Mon Feb 18 08:50:02 2002
+--- include/platform.h.orig	2003-06-10 08:57:04.000000000 +0200
 +++ include/platform.h
-@@ -28,7 +28,7 @@
-   variable is not set. Contributed by Todd Lewis.
+@@ -48,7 +48,7 @@ extern "C" {
+   Contributed by Todd Lewis.
  */
  
 -/* #define SUPPORT_GETPWNAM */
 +#define SUPPORT_GETPWNAM
  
+ 
  /* Enable/disable support for Big5 and Shift_JIS character encodings */
- #ifndef SUPPORT_ASIAN_ENCODINGS
+@@ -496,7 +496,7 @@ extern "C" {
+ #if !defined(HPUX_OS) && !defined(CYGWIN_OS) && !defined(MAC_OS_X) && !defined(BE_OS) && !defined(SOLARIS_OS) && !defined(BSD_BASED_OS) && !defined(OSF_OS) && !defined(IRIX_OS) && !defined(AIX_OS)
+ typedef unsigned int uint;
+ #endif
+-#if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || defined(BSD_BASED_OS) || defined(_WIN32)
++#if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || (defined(BSD_BASED_OS) && !defined(__NetBSD__)) || defined(_WIN32)
+ typedef unsigned long ulong;
+ #endif
+