Adapt this package to NetBSD using patches supplied by Takahiro Kambe

in PR pkg/9532.

6 files changed, 27 insertions, 30 deletions

diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index c974e7d23c4..ae9e78e4f20 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,20 +1,14 @@
-# New ports collection makefile for:	tidy
-# Version required:	0.10.99.1
-# Date created:		27 Oct 1998
-# Whom:			Abel Chow <achow@transoft.net>
-#
-# $FreeBSD: ports/www/tidy/Makefile,v 1.15 2000/02/16 00:08:36 mharo Exp $
-#
+# $NetBSD: Makefile,v 1.2 2000/03/28 17:22:19 tron Exp $
+# FreeBSD Id: ports/www/tidy/Makefile,v 1.15 2000/02/16 00:08:36 mharo Exp
 
-DISTNAME=	tidy30nov99
-PKGNAME=	tidy-0.11.99.2
+DISTNAME=	tidy13jan00
+PKGNAME=	tidy-20000113
 CATEGORIES=	www
 MASTER_SITES=	http://www.w3.org/People/Raggett/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	saken@hotel.rmta.org
-
-MAN1=		tidy.1
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.w3c.org/People/Raggett/tidy/
 
 ALL_TARGET=	tidy
 
@@ -23,12 +17,10 @@ DOCFILES=	Overview.html tidy.gif release-notes.html grid.gif
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
 	@${INSTALL_MAN}	${WRKSRC}/man_page.txt	${PREFIX}/man/man1/tidy.1
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${PREFIX}/share/doc/tidy
 .for docfile in ${DOCFILES}
 	@${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
 .endfor
-.endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/www/tidy/files/md5 b/www/tidy/files/md5
index ca187847950..09cf88b5eda 100644
--- a/www/tidy/files/md5
+++ b/www/tidy/files/md5
@@ -1 +1,3 @@
-MD5 (tidy30nov99.tgz) = d527142aa7cb10eee1acc1c896c4e5ed
+$NetBSD: md5,v 1.2 2000/03/28 17:22:20 tron Exp $
+
+MD5 (tidy13jan00.tgz) = 4ee20c19df8e27b0bb57d0525404075c
diff --git a/www/tidy/files/patch-sum b/www/tidy/files/patch-sum
new file mode 100644
index 00000000000..a9ef856a6b2
--- /dev/null
+++ b/www/tidy/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2000/03/28 17:22:20 tron Exp $
+
+MD5 (patch-aa) = f96289d920581c14cde7915e051ea344
+MD5 (patch-ab) = d6a51e284effda89da4db19c375f9e7e
diff --git a/www/tidy/patches/patch-aa b/www/tidy/patches/patch-aa
index b07d2911a74..b6cc9e8adde 100644
--- a/www/tidy/patches/patch-aa
+++ b/www/tidy/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.2 2000/03/28 17:22:20 tron Exp $
+
 --- Makefile.orig	Sun Dec 20 13:43:23 1998
 +++ Makefile	Sun Dec 20 13:45:24 1998
 @@ -1,8 +1,8 @@
diff --git a/www/tidy/patches/patch-ab b/www/tidy/patches/patch-ab
index d178ef5b367..db3294d35eb 100644
--- a/www/tidy/patches/patch-ab
+++ b/www/tidy/patches/patch-ab
@@ -1,22 +1,17 @@
---- platform.h.orig	Sat Nov 13 23:41:32 1999
-+++ platform.h	Sat Nov 13 23:42:40 1999
-@@ -17,17 +17,17 @@
+$NetBSD: patch-ab,v 1.2 2000/03/28 17:22:20 tron 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
    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 */
- #include <stdlib.h>
- #include <stdarg.h>  /* may need <varargs.h> for Unix V */
- #include <string.h>
--#include <malloc.h>
- #include <assert.h>
- 
- #ifdef SUPPORT_GETPWNAM
diff --git a/www/tidy/pkg/PLIST b/www/tidy/pkg/PLIST
index 156ae270f62..320f98e9cc9 100644
--- a/www/tidy/pkg/PLIST
+++ b/www/tidy/pkg/PLIST
@@ -1,4 +1,6 @@
+@comment $NetBSD: PLIST,v 1.2 2000/03/28 17:22:21 tron Exp $
 bin/tidy
+man/man1/tidy.1
 share/doc/tidy/Overview.html
 share/doc/tidy/grid.gif
 share/doc/tidy/release-notes.html