Hi!
Attached is an update for tidy-050705. Works for me on i386, sparc64
and amd64. I haven't found a ChangeLog.
- tidy depends on libxslt now (manpage generation)
- fmt -w 72 for DESCR
- honor CFLAGS
- disable _DEBUG=1
Please test and comment.
Bernd
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/tidy/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 11 Dec 2004 13:29:22 -0000 1.17
+++ Makefile 12 Jul 2005 10:58:46 -0000
@@ -2,7 +2,7 @@
COMMENT= "validate, correct, and pretty-print HTML files"
-TIDYDATE= 040706
+TIDYDATE= 050705
DISTNAME= tidy_src_${TIDYDATE}
PKGNAME= tidy-${TIDYDATE}
@@ -24,10 +24,12 @@
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/tidy/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo 5 Jan 2005 17:39:02 -0000 1.5
+++ distinfo 12 Jul 2005 10:58:46 -0000
@@ -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
Index: patches/patch-build_gmake_Makefile
===================================================================
RCS file: /cvs/ports/www/tidy/patches/patch-build_gmake_Makefile,v
retrieving revision 1.1
diff -u -r1.1 patch-build_gmake_Makefile
--- patches/patch-build_gmake_Makefile 2 Mar 2004 21:20:12 -0000 1.1
+++ patches/patch-build_gmake_Makefile 12 Jul 2005 10:58:46 -0000
@@ -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
+--- 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 @@
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 @@
+ 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
Index: patches/patch-include_platform_h
===================================================================
RCS file: /cvs/ports/www/tidy/patches/patch-include_platform_h,v
retrieving revision 1.2
diff -u -r1.2 patch-include_platform_h
--- patches/patch-include_platform_h 14 Jul 2004 14:07:45 -0000 1.2
+++ patches/patch-include_platform_h 12 Jul 2005 10:58:46 -0000
@@ -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
+--- 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 @@
/* 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
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/tidy/pkg/DESCR,v
retrieving revision 1.4
diff -u -r1.4 DESCR
--- pkg/DESCR 15 Dec 2003 21:55:40 -0000 1.4
+++ pkg/DESCR 12 Jul 2005 10:58:46 -0000
@@ -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.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tidy/pkg/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- pkg/PLIST 15 Sep 2004 18:49:52 -0000 1.5
+++ pkg/PLIST 12 Jul 2005 10:58:46 -0000
@@ -63,12 +63,12 @@
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
