head 1.6; access; symbols pkgsrc-2013Q2:1.6.0.18 pkgsrc-2013Q2-base:1.6 pkgsrc-2012Q4:1.6.0.16 pkgsrc-2012Q4-base:1.6 pkgsrc-2011Q4:1.6.0.14 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q2:1.6.0.12 pkgsrc-2011Q2-base:1.6 pkgsrc-2009Q4:1.6.0.10 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.8 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.6 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.4 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.2 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.4.0.2 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.16 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.14 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.12 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.10 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.8 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.6 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.6 date 2008.04.09.09.01.53; author wiz; state dead; branches; next 1.5; 1.5 date 2006.09.16.15.29.36; author hira; state Exp; branches; next 1.4; 1.4 date 2006.04.08.06.09.15; author reed; state Exp; branches; next 1.3; 1.3 date 2006.01.20.12.09.21; author jmmv; state Exp; branches; next 1.2; 1.2 date 2005.10.04.18.00.49; author wiz; state Exp; branches; next 1.1; 1.1 date 2003.10.28.12.34.58; author cube; state Exp; branches; next ; desc @@ 1.6 log @Update to CVS state of 20080324: 2.5 years of various changes and improvements. pkgsrc changes: Use libtool to provide a shared library; fixes wip/kdewebdev4 on amd64. Generate API documentation from the provided files using doxygen. Standardize path to installed documentation. @ text @$NetBSD: patch-ac,v 1.5 2006/09/16 15:29:36 hira Exp $ --- build/gmake/Makefile.orig 2005-07-14 23:58:10.000000000 -0700 +++ build/gmake/Makefile 2006-04-07 23:06:38.000000000 -0700 @@@@ -58,13 +58,13 @@@@ PROJECT=tidy # Installation variables. Spaces OK, only dir create and file copy operations. -runinst_prefix=/usr/local -devinst_prefix=/usr/local +runinst_prefix=${PREFIX} +devinst_prefix=${PREFIX} bininst = ${runinst_prefix}/bin libinst = ${devinst_prefix}/lib incinst = ${devinst_prefix}/include/$(PROJECT) -maninst = ${devinst_prefix}/man +maninst = ${devinst_prefix}/${PKGMANDIR} # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names. TOPDIR = ../.. @@@@ -79,14 +79,14 @@@@ # CFLAGS etc.. # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1 # disabled. -CC= gcc -CFLAGS= -g -Wall -Wno-switch -Wno-parentheses -I $(INCDIR) +#CC= gcc +CFLAGS+= -g -Wall -Wno-switch -Wno-parentheses -I $(INCDIR) # flags only supported with gcc 3.x # CFLAGS += -Wunused-parameter OTHERCFLAGS= OTHERCFLAGS+= -D_DEBUG=1 -# OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 +OTHERCFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 ifdef SUPPORT_UTF16_ENCODINGS CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS) endif @@@@ -115,7 +115,7 @@@@ OBJSUF = .o LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX) -AR=ar -r +#AR=ar -r XSLTPROC = xsltproc @@@@ -164,7 +164,7 @@@@ $(LIBRARY): $(OBJFILES) if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi - $(AR) $@@ $(OBJFILES) + $(AR) -r $@@ $(OBJFILES) ifdef RANLIB $(RANLIB) $@@ endif @@@@ -175,7 +175,7 @@@@ $(BINDIR)/$(PROJECT): $(APPDIR)/tidy.c $(HFILES) $(LIBRARY) if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi - $(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@@ $(APPDIR)/tidy.c -I$(INCDIR) -L$(LIBDIR) -l$(PROJECT) + $(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@@ $(APPDIR)/tidy.c -I$(INCDIR) $(LIBRARY) $(BINDIR)/tab2space: $(APPDIR)/tab2space.c if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi @@@@ -205,19 +205,19 @@@@ 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)/" installib: $(LIBRARY) - 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) - if [ ! -d "$(bininst)" ]; then mkdir -p "$(bininst)"; fi - cp -f $(EXES) "$(bininst)/" + if [ ! -d "$(bininst)" ]; then $(BSD_INSTALL_PROGRAM_DIR) "$(bininst)"; fi + $(BSD_INSTALL_PROGRAM) $(EXES) "$(bininst)/" 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 @ 1.5 log @Add missing RCS Id. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Honor PKGMANDIR. @ text @d1 2 @ 1.3 log @Fix build under Mac OS X: link directly against the generated libtidy.a instead of using -ltidy, which picked up the (incompatible) libtidy.dylib from /usr/lib. I'm wondering if buildlink3 could help here in some way... @ text @d1 3 a3 5 $NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $ --- build/gmake/Makefile.orig 2005-07-15 08:58:10.000000000 +0200 +++ build/gmake/Makefile @@@@ -58,8 +58,8 @@@@ SHELL=/bin/sh d14 7 a20 1 @@@@ -79,14 +79,14 @@@@ DOCDIR = ${TOPDIR}/htmldoc d38 1 a38 1 @@@@ -115,7 +115,7 @@@@ LIBSUFFIX = .a d47 1 a47 1 @@@@ -164,7 +164,7 @@@@ doc: $(DOCS) d56 1 a56 1 @@@@ -175,7 +175,7 @@@@ $(OBJDIR)/%$(OBJSUF): $(SRCDIR)/%.c $(HF d65 1 a65 1 @@@@ -205,19 +205,19 @@@@ clean: @ 1.2 log @Update to 20050921, provided by Jeroen Ruigrok/asmodai in PR 31220. fix crashes with nested framesets fix dmalloc conflicts fix crashes with invalid x/html tags fix memory corruptions fix attributes with null values replace tabs with spaces a lot generic stability fixes fix accessibility crashes accessibility missing output added use id= instead of a name= fix crashes with mixed php-like code in html fix memory leaks xml: was stripped from xml:lang make sure id and name are identical when used do not add xml:lang for XHTML 1.1 check validity of id/name values a lot of new options for finegrained control support align="char" fix 64 bit portability issues fix support for nested and make sure id's are unique be more resistant against malformed comments make sure attribute values are lowercase for xhtml specified values ensure xml declarations are present allow empty action="" to form area does not need a mandatory href @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- build/gmake/Makefile.orig 2005-05-03 08:58:08.000000000 +0200 +++ build/gmake/Makefile 2005-07-03 14:56:45.000000000 +0200 @@@@ -58,8 +58,8 @@@@ d16 1 a16 1 @@@@ -79,14 +79,14 @@@@ d34 1 a34 1 @@@@ -115,7 +115,7 @@@@ d43 1 a43 1 @@@@ -164,7 +164,7 @@@@ d52 10 a61 1 @@@@ -205,19 +205,19 @@@@ @ 1.1 log @Forgotten patch needed by tidy update in previous commit. @ text @d3 3 a5 3 --- build/gmake/Makefile.orig 2003-04-12 08:57:03.000000000 +0200 +++ build/gmake/Makefile @@@@ -58,8 +58,8 @@@@ SHELL=/bin/sh d16 1 a16 3 @@@@ -76,7 +76,7 @@@@ LIBDIR = ${TOPDIR}/lib BINDIR = ${TOPDIR}/bin d18 2 d21 1 d23 13 a35 5 CFLAGS= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR) # OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1 @@@@ -107,7 +107,7 @@@@ LIBPREFIX = lib LIBSUFFIX = .a d41 1 a41 1 EXES = $(BINDIR)/$(PROJECT) $(BINDIR)/tab2space d43 1 a43 1 @@@@ -148,7 +148,7 @@@@ all: $(LIBRARY) $(EXES) d50 1 a50 1 $(RANLIB) $@@ d52 1 a52 1 @@@@ -177,21 +177,21 @@@@ clean: d73 6 a78 8 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 @