Add tidy-devel after Repocopy from www/tidy

PR:             46620
Submitted by:   Thierry Thomas <thierry@pompo.net>

15 files changed, 156 insertions, 225 deletions

diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile
index e9cb952..68e863d 100644
--- a/www/tidy-devel/Makefile
+++ b/www/tidy-devel/Makefile
@@ -6,30 +6,58 @@
 #
 
 PORTNAME=	tidy
-PORTVERSION=	20000804
-PORTREVISION=	2
+PORTVERSION=	030122
 CATEGORIES=	www
-MASTER_SITES=	http://www.w3.org/People/Raggett/
-DISTNAME=	tidy4aug00
+MASTER_SITES=	http://tidy.sourceforge.net/src/%SUBDIR%/	\
+		http://tidy.sourceforge.net/docs/
+MASTER_SITE_SUBDIR=	. old
+PKGNAMESUFFIX=	-devel
+DISTNAME=	tidy_src
 EXTRACT_SUFX=	.tgz
+DISTFILES=	${DISTNAME}_${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	saken@hotel.rmta.org
+MAINTAINER=	thierry@pompo.net
 
-MAN1=		tidy.1
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-ALL_TARGET=	tidy
+USE_GMAKE=	yes
 
-DOCFILES=	Overview.html tidy.gif release-notes.html grid.gif
+#MAN1=		tidy.1
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy
-	@${INSTALL_MAN}	${WRKSRC}/man_page.txt	${PREFIX}/man/man1/tidy.1
+.if !defined(NOPORTDOCS)
+DOCVER=		021222
+DISTFILES+=	tidy_docs_${DOCVER}${EXTRACT_SUFX}
+DOCFILES=	Overview.html faq.html grid.gif pending.html	\
+		quickref.html release-notes.html tidy.css tidy.gif
+APIEXT=		css html js png
+.endif
+
+BIN2STRIP=	tidy tab2space
+
+pre-install:
+	@if [ -f ${LOCALBASE}/bin/tidy ]; then \
+		${ECHO_MSG} "" ; \
+		${ECHO_MSG} "Conflict: please deinstall the port bin/tidy." ; \
+		${ECHO_MSG} "" ; \
+		${FALSE} ; \
+	fi
+
+post-install:
+.for pgm in ${BIN2STRIP}
+	@${STRIP_CMD} ${PREFIX}/bin/${pgm}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${PREFIX}/share/doc/tidy
+	@${MKDIR} ${DOCSDIR}
 .for docfile in ${DOCFILES}
-	@${INSTALL_MAN} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy
+	@${INSTALL_MAN} ${WRKSRC}/htmldoc/${docfile} ${DOCSDIR}
+.endfor
+	@${MKDIR} ${DOCSDIR}/api
+.for ext in ${APIEXT}
+	@${CP} -p ${WRKSRC}/htmldoc/api/*.${ext} ${DOCSDIR}/api
 .endfor
+	@${CHOWN} -R ${MANOWN}:${MANGRP} ${DOCSDIR}/api
+	@${ECHO_MSG} "===>   Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/tidy-devel/distinfo b/www/tidy-devel/distinfo
index 7d94c159..0d96563 100644
--- a/www/tidy-devel/distinfo
+++ b/www/tidy-devel/distinfo
@@ -1 +1,2 @@
-MD5 (tidy4aug00.tgz) = 5faa2b127ae7f1c7ab07ed677db189e7
+MD5 (tidy_src_030122.tgz) = ea0e22b4aa6422f7b022cd31c2e91fbb
+MD5 (tidy_docs_021222.tgz) = 515f04f80b3a6e18d4d094bcca0ed155
diff --git a/www/tidy-devel/files/patch-Makefile b/www/tidy-devel/files/patch-Makefile
new file mode 100644
index 0000000..daf9dbf
--- /dev/null
+++ b/www/tidy-devel/files/patch-Makefile
@@ -0,0 +1,30 @@
+--- Makefile.orig	Sat Dec 14 08:57:02 2002
++++ Makefile	Sun Dec 29 22:35:20 2002
+@@ -56,12 +56,12 @@
+ SHELL=/bin/sh
+ 
+ # Installation variables.  Spaces OK, only dir create and file copy operations.
+-runinst_prefix=/usr
+-devinst_prefix=/usr
++runinst_prefix=${PREFIX}
++devinst_prefix=${PREFIX}
+ 
+ bininst = ${runinst_prefix}/bin
+ libinst = ${devinst_prefix}/lib
+-incinst = ${devinst_prefix}/include
++incinst = ${devinst_prefix}/include/tidy
+ maninst = ${devinst_prefix}/man
+ 
+ # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names.
+@@ -74,8 +74,9 @@
+ BINDIR = ${TOPDIR}/bin
+ 
+ # CFLAGS etc..
+-CC= gcc
+-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
++#CC= gcc
++#CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
++CFLAGS+= -I $(INCDIR)
+ 
+ # OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
+ ifdef SUPPORT_UTF16_ENCODINGS
diff --git a/www/tidy-devel/files/patch-aa b/www/tidy-devel/files/patch-aa
deleted file mode 100644
index 0f0aac9..0000000
--- a/www/tidy-devel/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	Thu May  4 20:22:46 2000
-+++ Makefile	Thu May  4 20:23:52 2000
-@@ -1,14 +1,8 @@
- # Makefile - for tidy
- 
--CC= gcc
-+#CC= gcc
- 
--CFLAGS= -O
--
--# Makefile - for tidy
--
--CC= gcc
--
--CFLAGS= -O
-+CFLAGS+= -D__USE_MISC
- 
- OFILES=		attrs.o         istack.o        parser.o        tags.o \
- 		entities.o      lexer.o         pprint.o        clean.o \
diff --git a/www/tidy-devel/files/patch-ab b/www/tidy-devel/files/patch-ab
deleted file mode 100644
index 7493b2d..0000000
--- a/www/tidy-devel/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- platform.h.orig	Thu Jan 13 07:19:19 2000
-+++ platform.h	Mon Mar 27 16:31:20 2000
-@@ -17,9 +17,8 @@
-   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
- 
- #include <ctype.h>
- #include <stdio.h>
diff --git a/www/tidy-devel/files/patch-ac b/www/tidy-devel/files/patch-ac
deleted file mode 100644
index 073e660..0000000
--- a/www/tidy-devel/files/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
---- config.c.orig	Sat Aug  5 01:21:05 2000
-+++ config.c	Mon Jul  8 23:07:17 2002
-@@ -94,6 +94,7 @@
- Bool TidyMark = yes;        /* add meta element indicating tidied doc */
- Bool Emacs = no;            /* if true format error output for GNU Emacs */
- Bool LiteralAttribs = no;   /* if true attributes may use newlines */
-+Bool PreserveEntities = no; /* if true don't convert entities to chars */
- 
- typedef struct _lex PLex;
- 
-@@ -186,6 +187,7 @@
-     {"doctype",         {(int *)&doctype_str},      ParseDocType},
-     {"fix-backslash",   {(int *)&FixBackslash},     ParseBool},
-     {"gnu-emacs",       {(int *)&Emacs},            ParseBool},
-+    {"preserve-entities", {(int *)&PreserveEntities}, ParseBool},
- 
-   /* this must be the final entry */
-     {0,          0,             0}
-@@ -392,7 +394,8 @@
-         home_dir = passwd->pw_dir;
-     }
- 
--    if (p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1))
-+    if (home_dir != NULL &&
-+	(p = realloc(expanded_filename, strlen(filename)+strlen(home_dir)+1)))
-     {
-         strcat(strcpy(expanded_filename = p, home_dir), filename);
-         return(expanded_filename);
-@@ -423,7 +426,10 @@
-     /* open the file and parse its contents */
- 
-     if ((fin = fopen(fname, "r")) == null)
--        FileError(stderr, fname);
-+    {
-+        if (FileExists(fname))		/* quiet file open error on */
-+            FileError(stderr, fname);   /* non-existent file */
-+    }
-     else
-     {
-         config_text = null;
-@@ -533,6 +539,12 @@
-     {
-         QuoteAmpersand = yes;
-         HideEndTags = no;
-+    }
-+
-+ /* Avoid &amp;copy; in preserve-entities case */
-+    if (PreserveEntities)
-+    {
-+       QuoteAmpersand = no;
-     }
- }
- 
diff --git a/www/tidy-devel/files/patch-ad b/www/tidy-devel/files/patch-ad
deleted file mode 100644
index 4de7c78..0000000
--- a/www/tidy-devel/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- html.h.orig	Fri Aug  4 18:21:05 2000
-+++ html.h	Sat Jul 20 16:20:55 2002
-@@ -4,6 +4,8 @@
-   See tidy.c for the copyright notice.
- */
- 
-+#include <sys/types.h>
-+
- /* indentation modes */
- 
- #define NO_INDENT      0
-@@ -380,6 +382,7 @@
- 
- void FatalError(char *msg);
- void FileError(FILE *fp, const char *file);
-+int FileExists(const char *file);
- 
- Node *GetToken(Lexer *lexer, uint mode);
- 
-@@ -758,6 +761,7 @@
- extern Bool Word2000;
- extern Bool Emacs;  /* sasdjb 01May00 GNU Emacs error output format */
- extern Bool LiteralAttribs;
-+extern Bool PreserveEntities;
- 
- /* Parser methods for tags */
- 
diff --git a/www/tidy-devel/files/patch-ae b/www/tidy-devel/files/patch-ae
deleted file mode 100644
index fb56ac6..0000000
--- a/www/tidy-devel/files/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
---- lexer.c.orig	Fri Aug  4 19:21:05 2000
-+++ lexer.c	Thu Nov 15 21:44:03 2001
-@@ -1517,8 +1517,10 @@
- 
-                     continue;
-                 }
--                else if (c == '&' && mode != IgnoreMarkup)
--                    ParseEntity(lexer, mode);
-+                else if (c == '&' && mode != IgnoreMarkup
-+				&& !PreserveEntities) {
-+               		ParseEntity(lexer, mode);
-+		}
- 
-                 /* this is needed to avoid trimming trailing whitespace */
-                 if (mode == IgnoreWhitespace)
-@@ -2624,7 +2626,7 @@
-                 seen_gt = yes;
-         }
- 
--        if (c == '&')
-+        if (c == '&')	/* XXX: possibly need support for PreserveEntities */
-         {
-             AddCharToLexer(lexer, c);
-             ParseEntity(lexer, null);
diff --git a/www/tidy-devel/files/patch-af b/www/tidy-devel/files/patch-af
deleted file mode 100644
index 4c95873..0000000
--- a/www/tidy-devel/files/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
---- localize.c.orig	Fri Aug  4 19:21:05 2000
-+++ localize.c	Mon Nov 19 14:39:38 2001
-@@ -8,6 +8,9 @@
-   to localize HTML tidy.
- */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+
- #include "platform.h"
- #include "html.h"
- 
-@@ -50,6 +53,16 @@
-     tidy_out(fp, "Can't open \"%s\"\n", file);
- }
- 
-+int FileExists(const char *file)
-+{
-+    struct stat st;
-+
-+    if (stat(file, &st) < 0)
-+        return (0);
-+    else
-+        return (1);
-+}
-+
- static void ReportTag(Lexer *lexer, Node *tag)
- {
-     if (tag)
-@@ -736,6 +749,7 @@
-     tidy_out(out, "  -xml            use this when input is wellformed xml\n");
-     tidy_out(out, "  -asxml          to convert html to wellformed xml\n");
-     tidy_out(out, "  -slides         to burst into slides on h2 elements\n");
-+    tidy_out(out, "  -preserve       to preserve entities from source file\n");
-     tidy_out(out, "\n");
- 
-     tidy_out(out, "Character encodings\n");
diff --git a/www/tidy-devel/files/patch-ag b/www/tidy-devel/files/patch-ag
deleted file mode 100644
index 3c62b31..0000000
--- a/www/tidy-devel/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- man_page.txt.orig	Fri Aug  4 19:21:05 2000
-+++ man_page.txt	Thu Nov 15 21:54:05 2001
-@@ -12,6 +12,7 @@
- .IR column ]
- .RB [ -upper ]
- .RB [ -clean ]
-+.RB [ -preserve ]
- .RB [ -raw
- |
- .B -ascii
-@@ -106,6 +107,9 @@
- .TP
- .B -slides
- Burst into slides on <H2> elements.
-+.TP
-+.B -preserve
-+Preserve source file entities as is.
- .TP
- .BR -help ", " -h
- List command-line options.
diff --git a/www/tidy-devel/files/patch-ah b/www/tidy-devel/files/patch-ah
deleted file mode 100644
index f0a953e..0000000
--- a/www/tidy-devel/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- tidy.c.orig	Fri Aug  4 19:21:05 2000
-+++ tidy.c	Mon Nov 19 14:39:50 2001
-@@ -785,6 +785,8 @@
-                 Quiet = yes;
-             else if (strcmp(arg, "slides") == 0)
-                 BurstSlides = yes;
-+            else if (strcmp(arg, "preserve") == 0)
-+                PreserveEntities = yes;
-             else if (strcmp(arg, "help") == 0 ||
-                      argv[1][1] == '?'|| argv[1][1] == 'h')
-             {
diff --git a/www/tidy-devel/files/patch-include_platform.h b/www/tidy-devel/files/patch-include_platform.h
new file mode 100644
index 0000000..762d43b
--- /dev/null
+++ b/www/tidy-devel/files/patch-include_platform.h
@@ -0,0 +1,11 @@
+--- ./include/platform.h.orig	Mon Jul  8 08:50:02 2002
++++ ./include/platform.h	Sat Jul 27 10:55:37 2002
+@@ -28,7 +28,7 @@
+   variable is not set. Contributed by Todd Lewis.
+ */
+ 
+-/* #define SUPPORT_GETPWNAM */
++#define SUPPORT_GETPWNAM
+ 
+ /* Enable/disable support for Big5 and Shift_JIS character encodings */
+ #ifndef SUPPORT_ASIAN_ENCODINGS
diff --git a/www/tidy-devel/pkg-comment b/www/tidy-devel/pkg-comment
index ca421aa..0607468 100644
--- a/www/tidy-devel/pkg-comment
+++ b/www/tidy-devel/pkg-comment
@@ -1 +1 @@
-Fixes and tidies up HTML files
+HTML parser and pretty printer
diff --git a/www/tidy-devel/pkg-descr b/www/tidy-devel/pkg-descr
index ab48448..ba4b52a 100644
--- a/www/tidy-devel/pkg-descr
+++ b/www/tidy-devel/pkg-descr
@@ -14,4 +14,4 @@ problem lies in your markup. Tidy won't generate a cleaned up version
 when there are problems that it can't be sure of how to handle. These
 are logged as "errors" rather than "warnings".
 
-WWW: http://www.w3c.org/People/Raggett/tidy/
+WWW: http://tidy.sourceforge.net/
diff --git a/www/tidy-devel/pkg-plist b/www/tidy-devel/pkg-plist
index 156ae27..64190c6 100644
--- a/www/tidy-devel/pkg-plist
+++ b/www/tidy-devel/pkg-plist
@@ -1,6 +1,71 @@
+@comment $FreeBSD$
+bin/tab2space
 bin/tidy
-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
+include/tidy/buffio.h
+include/tidy/fileio.h
+include/tidy/platform.h
+include/tidy/tidy.h
+include/tidy/tidyenum.h
+lib/libtidy.a
+%%PORTDOCS%%share/doc/tidy/Overview.html
+%%PORTDOCS%%share/doc/tidy/faq.html
+%%PORTDOCS%%share/doc/tidy/grid.gif
+%%PORTDOCS%%share/doc/tidy/pending.html
+%%PORTDOCS%%share/doc/tidy/quickref.html
+%%PORTDOCS%%share/doc/tidy/release-notes.html
+%%PORTDOCS%%share/doc/tidy/tidy.css
+%%PORTDOCS%%share/doc/tidy/tidy.gif
+%%PORTDOCS%%share/doc/tidy/api/annotated.html
+%%PORTDOCS%%share/doc/tidy/api/buffio_8h-source.html
+%%PORTDOCS%%share/doc/tidy/api/buffio_8h.html
+%%PORTDOCS%%share/doc/tidy/api/doxygen.css
+%%PORTDOCS%%share/doc/tidy/api/doxygen.png
+%%PORTDOCS%%share/doc/tidy/api/fileio_8h-source.html
+%%PORTDOCS%%share/doc/tidy/api/fileio_8h.html
+%%PORTDOCS%%share/doc/tidy/api/files.html
+%%PORTDOCS%%share/doc/tidy/api/ftv2blank.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2doc.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2folderclosed.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2folderopen.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2lastnode.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2link.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2mlastnode.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2mnode.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2node.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2plastnode.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2pnode.png
+%%PORTDOCS%%share/doc/tidy/api/ftv2vertline.png
+%%PORTDOCS%%share/doc/tidy/api/functions.html
+%%PORTDOCS%%share/doc/tidy/api/globals.html
+%%PORTDOCS%%share/doc/tidy/api/group__AttrGet.html
+%%PORTDOCS%%share/doc/tidy/api/group__Attribute.html
+%%PORTDOCS%%share/doc/tidy/api/group__Basic.html
+%%PORTDOCS%%share/doc/tidy/api/group__Clean.html
+%%PORTDOCS%%share/doc/tidy/api/group__Configuration.html
+%%PORTDOCS%%share/doc/tidy/api/group__IO.html
+%%PORTDOCS%%share/doc/tidy/api/group__Memory.html
+%%PORTDOCS%%share/doc/tidy/api/group__NodeAsk.html
+%%PORTDOCS%%share/doc/tidy/api/group__Opaque.html
+%%PORTDOCS%%share/doc/tidy/api/group__Parse.html
+%%PORTDOCS%%share/doc/tidy/api/group__Save.html
+%%PORTDOCS%%share/doc/tidy/api/group__Tree.html
+%%PORTDOCS%%share/doc/tidy/api/index.html
+%%PORTDOCS%%share/doc/tidy/api/main.html
+%%PORTDOCS%%share/doc/tidy/api/modules.html
+%%PORTDOCS%%share/doc/tidy/api/structTidyAttr.html
+%%PORTDOCS%%share/doc/tidy/api/structTidyDoc.html
+%%PORTDOCS%%share/doc/tidy/api/structTidyNode.html
+%%PORTDOCS%%share/doc/tidy/api/structTidyOption.html
+%%PORTDOCS%%share/doc/tidy/api/struct__TidyBuffer.html
+%%PORTDOCS%%share/doc/tidy/api/struct__TidyInputSource.html
+%%PORTDOCS%%share/doc/tidy/api/struct__TidyOutputSink.html
+%%PORTDOCS%%share/doc/tidy/api/tidy_8h-source.html
+%%PORTDOCS%%share/doc/tidy/api/tidy_8h.html
+%%PORTDOCS%%share/doc/tidy/api/tidyenum_8h-source.html
+%%PORTDOCS%%share/doc/tidy/api/tidyenum_8h.html
+%%PORTDOCS%%share/doc/tidy/api/tree.html
+%%PORTDOCS%%share/doc/tidy/api/tree.js
+%%PORTDOCS%%share/doc/tidy/api/treeview.js
+@dirrm include/tidy
+%%PORTDOCS%%@dirrm share/doc/tidy/api
+%%PORTDOCS%%@dirrm share/doc/tidy