update to 050705, from Bernd Ahlers <b.ahlers@ba-net.org>.

ok alek@
2005-07-19 08:10:10 +00:00 · 2005-07-19 08:10:10 +00:00 · be18cd58bc
commit be18cd58bc
parent f4e01a2810
6 changed files with 49 additions and 45 deletions
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2004/12/11 13:29:22 alek Exp $
+# $OpenBSD: Makefile,v 1.18 2005/07/19 08:10:10 aanriot Exp $

 COMMENT=	"validate, correct, and pretty-print HTML files"

-TIDYDATE=	040706
+TIDYDATE=	050705
 DISTNAME=	tidy_src_${TIDYDATE}
 PKGNAME=	tidy-${TIDYDATE}

@ -24,11 +24,13 @@ MASTER_SITES=	${HOMEPAGE}src/ \
 MASTER_SITES0=	${HOMEPAGE}docs/
 EXTRACT_SUFX=	.tgz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		tidy_docs_040317${EXTRACT_SUFX}:0
+		tidy_docs_${TIDYDATE}${EXTRACT_SUFX}:0

 USE_GMAKE=	Yes
 NO_REGRESS=	Yes

+BUILD_DEPENDS=	::textproc/libxslt
+
 WRKDIST=	${WRKDIR}/tidy
 WRKBUILD=	${WRKDIST}/build/gmake

--- a/www/tidy/distinfo
+++ b/www/tidy/distinfo
@ -1,8 +1,8 @@
-MD5 (tidy_docs_040317.tgz) = ec60e9c63ed5d98cbdf98260a9a03c23
-MD5 (tidy_src_040706.tgz) = 78590c24bd5b8bbdc80e945220fcb6a8
-RMD160 (tidy_docs_040317.tgz) = 7608fbcf1ff0bc092c15ada68a786e592db33545
-RMD160 (tidy_src_040706.tgz) = 5bd6b00d35d9aa4521f6be77dc3057a6e32d7327
-SHA1 (tidy_docs_040317.tgz) = 1c959cd61087992f64d0ad3fcecd4a215cf32453
-SHA1 (tidy_src_040706.tgz) = fb89fb0a163da1a1676e7b390302c61ea7e90381
-SIZE (tidy_docs_040317.tgz) = 152421
-SIZE (tidy_src_040706.tgz) = 243636
+MD5 (tidy_docs_050705.tgz) = 2e6533fc48b077ff6243deaf21a781de
+MD5 (tidy_src_050705.tgz) = 35689cbbec2776c8e3b191f59a72d4db
+RMD160 (tidy_docs_050705.tgz) = 49b8c2eaf87a0291b1bef6479cf1eeda6b720f52
+RMD160 (tidy_src_050705.tgz) = e87ab354b1f64b52f69ffa87efd2e3612b2eb596
+SHA1 (tidy_docs_050705.tgz) = b243d7910ce2fe57a8df27ff8f775e6d397c732d
+SHA1 (tidy_src_050705.tgz) = 5ca7706d777f5790312ec55860390a1e16655bc0
+SIZE (tidy_docs_050705.tgz) = 150359
+SIZE (tidy_src_050705.tgz) = 254692
--- a/www/tidy/patches/patch-build_gmake_Makefile
+++ b/www/tidy/patches/patch-build_gmake_Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-build_gmake_Makefile,v 1.1 2004/03/02 21:20:12 xsa Exp $
--- build/gmake/Makefile.orig	2003-04-12 08:57:03.000000000 +0200
-+++ build/gmake/Makefile	2004-03-01 19:50:56.000000000 +0100
+$OpenBSD: patch-build_gmake_Makefile,v 1.2 2005/07/19 08:10:10 aanriot Exp $
+--- build/gmake/Makefile.orig	Tue May  3 08:58:08 2005
+++ build/gmake/Makefile	Tue Jul 12 12:03:54 2005
@@ -58,8 +58,8 @@ SHELL=/bin/sh
 PROJECT=tidy
 
@ -12,48 +12,52 @@ $OpenBSD: patch-build_gmake_Makefile,v 1.1 2004/03/02 21:20:12 xsa Exp $
 
 bininst = ${runinst_prefix}/bin
 libinst = ${devinst_prefix}/lib
-@@ -76,8 +76,8 @@ LIBDIR = ${TOPDIR}/lib
- BINDIR = ${TOPDIR}/bin
- 
+@@ -79,13 +79,13 @@ DOCDIR = ${TOPDIR}/htmldoc
 # CFLAGS etc..
+ # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
+ # disabled.
 -CC= gcc
-CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
+-CFLAGS= -g -Wall -Wno-switch -Wno-parentheses -I $(INCDIR)
 +#CC= gcc
 +CFLAGS+= -I $(INCDIR)
+ # flags only supported with gcc 3.x
+ # CFLAGS += -Wunused-parameter
 
- # OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
+ OTHERCFLAGS=
+-OTHERCFLAGS+= -D_DEBUG=1
+#OTHERCFLAGS+= -D_DEBUG=1
+ # OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
 ifdef SUPPORT_UTF16_ENCODINGS
-@@ -107,7 +107,7 @@ LIBPREFIX = lib
- LIBSUFFIX = .a
+ CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
+@@ -115,7 +115,7 @@ LIBSUFFIX = .a
+ OBJSUF = .o
 
 LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX)
 -AR=ar -r
 +#AR=ar -r
 
- EXES = $(BINDIR)/$(PROJECT) $(BINDIR)/tab2space
+ XSLTPROC = xsltproc
 
-@@ -148,7 +148,7 @@ all:    $(LIBRARY) $(EXES)
+@@ -164,7 +164,7 @@ doc:    $(DOCS)
 
 $(LIBRARY): $(OBJFILES)
 	if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi
 -	$(AR) $@ $(OBJFILES)
 +	$(AR) -r $@ $(OBJFILES)
 ifdef RANLIB
- 	$(RANLIB) $@ 
+ 	$(RANLIB) $@
 endif
-@@ -177,21 +177,21 @@ clean:
+@@ -205,19 +205,19 @@ clean:
 	if [ "$(BINDIR)" != "$(TOPDIR)" -a -d $(BINDIR) ]; then rmdir $(BINDIR); fi
 
 installhdrs: $(HFILES)
 -	if [ ! -d "$(incinst)" ]; then mkdir -p "$(incinst)"; fi
-	cp -f $(HFILES) "$(incinst)/"
 +	if [ ! -d "$(incinst)" ]; then ${BSD_INSTALL_DATA_DIR} "$(incinst)"; fi
-+	${BSD_INSTALL_DATA} $(HFILES) "$(incinst)/"
+ 	cp -f $(HFILES) "$(incinst)/"
 
 installib: $(LIBRARY)
-	if [ ! -d "$(libinst)" ]; then mkdir -p "$(libinst)"; fi
+ 	if [ ! -d "$(libinst)" ]; then mkdir -p "$(libinst)"; fi
 -	cp -f $(LIBRARY) "$(libinst)/"
-+	if [ ! -d "$(libinst)" ]; then ${BSD_INSTALL_DATA_DIR} "$(libinst)"; fi
 +	${BSD_INSTALL_DATA} $(LIBRARY) "$(libinst)/"
 
 installexes: $(EXES)
@ -62,12 +66,10 @@ $OpenBSD: patch-build_gmake_Makefile,v 1.1 2004/03/02 21:20:12 xsa Exp $
 +	if [ ! -d "$(bininst)" ]; then ${BSD_INSTALL_PROGRAM_DIR} "$(bininst)"; fi
 +	${BSD_INSTALL_PROGRAM} $(EXES) "$(bininst)/"
 
- installmanpage:
- 	if [ -f "$(TOPDIR)/htmldoc/man_page.txt" ] ; then \
-    	if [ ! -d "$(maninst)/man1" ]; then mkdir -p "$(maninst)/man1"; fi; \
-    	cp -f $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \
-+    	if [ ! -d "$(maninst)/man1" ]; then ${BSD_INSTALL_MAN_DIR} "$(maninst)/man1"; fi; \
-+    	${BSD_INSTALL_MAN} $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \
- 	fi
-    
+ installmanpage: $(DOCDIR)/tidy.1
+-	if [ ! -d "$(maninst)/man1" ]; then mkdir -p "$(maninst)/man1"; fi;
+-	cp -f $(DOCDIR)/tidy.1 "$(maninst)/man1/tidy.1";
+	if [ ! -d "$(maninst)/man1" ]; then ${BSD_INSTALL_MAN_DIR} "$(maninst)/man1"; fi;
+	${BSD_INSTALL_MAN} $(DOCDIR)/tidy.1 "$(maninst)/man1/tidy.1";
+ 
 install: installhdrs installib installmanpage installexes
--- a/www/tidy/patches/patch-include_platform_h
+++ b/www/tidy/patches/patch-include_platform_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-include_platform_h,v 1.2 2004/07/14 14:07:45 xsa Exp $
--- include/platform.h.orig	Fri Mar 19 09:00:57 2004
-+++ include/platform.h	Wed Jul 14 15:51:59 2004
+$OpenBSD: patch-include_platform_h,v 1.3 2005/07/19 08:10:10 aanriot Exp $
+--- include/platform.h.orig	Fri Jul  1 20:41:09 2005
+++ include/platform.h	Fri Jul  1 20:42:55 2005
@@ -33,7 +33,7 @@ extern "C" {
   It enables tidy to find config files named ~/.tidyrc if 
   the HTML_TIDY environment variable is not set.
@ -19,7 +19,7 @@ $OpenBSD: patch-include_platform_h,v 1.2 2004/07/14 14:07:45 xsa Exp $
 
 
 /* Enable/disable support for Big5 and Shift_JIS character encodings */
-@@ -497,7 +497,7 @@ extern "C" {
+@@ -504,7 +504,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) && !defined(LINUX_OS)
 typedef unsigned int uint;
 #endif
--- a/www/tidy/pkg/DESCR
+++ b/www/tidy/pkg/DESCR
@ -1,5 +1,5 @@
-Tidy is a tool that automatically fixes errors in your HTML, validates it
-and pretty prints it.
+Tidy is a tool that automatically fixes errors in your HTML, validates
+it and pretty prints it.

 Tidy's output can be customized to your needs.

--- a/www/tidy/pkg/PLIST
+++ b/www/tidy/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:49:52 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/07/19 08:10:10 aanriot Exp $
 bin/tab2space
 bin/tidy
 include/tidy/
@ -63,12 +63,12 @@ share/doc/tidy/api/tidyenum_8h.html
 share/doc/tidy/api/tree.html
 share/doc/tidy/api/tree.js
 share/doc/tidy/api/treeview.js
+share/doc/tidy/checked_by_tidy.gif
 share/doc/tidy/doxygen.cfg
 share/doc/tidy/faq.html
 share/doc/tidy/grid.gif
 share/doc/tidy/license.html
 share/doc/tidy/pending.html
-share/doc/tidy/quickref.html
 share/doc/tidy/release-notes.html
 share/doc/tidy/tidy.css
 share/doc/tidy/tidy.gif