diff options
author | arved <arved@FreeBSD.org> | 2003-02-01 23:24:54 +0000 |
---|---|---|
committer | arved <arved@FreeBSD.org> | 2003-02-01 23:24:54 +0000 |
commit | f3b0fa02b5afb6521adb2a270d3b8d4764805eb4 (patch) | |
tree | 85c30342d0c73fd9ff77ce7e4b0f8cd24ee11c59 /www/tidy-devel/files | |
parent | 01ea6900b3f65b85758a5e21468ccaf5ace482a8 (diff) | |
download | FreeBSD-ports-f3b0fa02b5afb6521adb2a270d3b8d4764805eb4.zip FreeBSD-ports-f3b0fa02b5afb6521adb2a270d3b8d4764805eb4.tar.gz |
Add tidy-devel after Repocopy from www/tidy
PR: 46620
Submitted by: Thierry Thomas <thierry@pompo.net>
Diffstat (limited to 'www/tidy-devel/files')
-rw-r--r-- | www/tidy-devel/files/patch-Makefile | 30 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-aa | 19 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ab | 13 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ac | 53 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ad | 27 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ae | 24 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-af | 37 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ag | 20 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-ah | 11 | ||||
-rw-r--r-- | www/tidy-devel/files/patch-include_platform.h | 11 |
10 files changed, 41 insertions, 204 deletions
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 &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 |