Wed Apr 9 09:01:53 2008 UTC ()
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.


(wiz)
diff -r1.26 -r1.27 pkgsrc/www/tidy/Makefile
diff -r1.2 -r1.3 pkgsrc/www/tidy/PLIST
diff -r1.7 -r1.8 pkgsrc/www/tidy/buildlink3.mk
diff -r1.14 -r1.15 pkgsrc/www/tidy/distinfo
diff -r1.6 -r0 pkgsrc/www/tidy/patches/patch-ab
diff -r1.5 -r0 pkgsrc/www/tidy/patches/patch-ac
cvs diff -r1.26 -r1.27 pkgsrc/www/tidy/Makefile (expand / switch to unified diff)

--- pkgsrc/www/tidy/Makefile 2006/07/27 18:48:04 1.26
+++ pkgsrc/www/tidy/Makefile 2008/04/09 09:01:52 1.27
@@ -1,44 +1,51 @@ @@ -1,44 +1,51 @@
1# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:04 jlam Exp $ 1# $NetBSD: Makefile,v 1.27 2008/04/09 09:01:52 wiz Exp $
2# 2#
3 3
4DISTNAME= tidy_src_051026 4DISTNAME= tidy-20080324
5PKGNAME= tidy-20051026 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= http://tidy.sourceforge.net/src/ \ 6MASTER_SITES= # manually created tarballs on ftp.NetBSD.org only
8 http://tidy.sourceforge.net/src/old/ 
9SITES.tidy_docs_050705.tgz= http://tidy.sourceforge.net/docs/ 
10EXTRACT_SUFX= .tgz 
11DISTFILES= ${DISTNAME}${EXTRACT_SUFX} tidy_docs_050705${EXTRACT_SUFX} 
12 7
13MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://tidy.sourceforge.net/ 9HOMEPAGE= http://tidy.sourceforge.net/
15COMMENT= Fixes and tidies up HTML files 10COMMENT= Fixes and tidies up HTML files
16 11
17BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt 12BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
 13BUILD_DEPENDS+= doxygen>=1.0:../../devel/doxygen
18 14
19WRKSRC= ${WRKDIR}/tidy 15WRKSRC= ${WRKDIR}/tidy
20NO_CONFIGURE= yes 16GNU_CONFIGURE= yes
21USE_TOOLS+= gmake 17USE_LIBTOOL= yes
22BUILD_DIRS= ${WRKSRC}/build/gmake 18USE_TOOLS+= aclocal autoconf automake gmake
23 19CPPFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1
24OPSYSVARS+= MAKEFLAGS 20CPPFLAGS+= -DSUPPORT_ASIAN_ENCODINGS=1 -DSUPPORT_GETPWNAM=1
25MAKEFLAGS.Darwin+= RANLIB=ranlib 21
26 22HTML_DOCFILES= Overview.html doxygen.cfg grid.gif tidy.css faq.html \
27HTML_DOCFILES= Overview.html doxygen.cfg grid.gif quickref.html tidy.css \ 23 license.html pending.html release-notes.html tidy.gif
28 faq.html license.html pending.html release-notes.html tidy.gif 24HTML_DOCDIR= ${PREFIX}/share/doc/tidy
29HTML_DOCDIR= ${PREFIX}/share/doc/html/tidy 25INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${HTML_DOCDIR} ${HTML_DOCDIR}/api
 26
 27pre-configure:
 28 cd ${WRKSRC}/build/gnuauto && cp -R -f * ${WRKSRC}
 29 cd ${WRKSRC} && \
 30 touch NEWS README AUTHORS ChangeLog; \
 31 libtoolize --force --copy; \
 32 aclocal; \
 33 autoconf; \
 34 automake -acf
30 35
31post-build: 36post-build:
32 cd ${BUILD_DIRS} && ${GMAKE} doc 37 cd ${WRKSRC}/htmldoc && \
 38 ${WRKSRC}/console/tidy -xml-help > tidy.xml && \
 39 ${WRKSRC}/console/tidy -xml-config > tidy-config.xml && \
 40 xsltproc tidy1.xsl tidy.xml > tidy.1
 41 cd ${WRKSRC} && \
 42 doxygen htmldoc/doxygen.cfg
33 43
34post-install: 44post-install:
35 ${INSTALL_DATA_DIR} ${HTML_DOCDIR} 45 ${INSTALL_MAN} ${WRKSRC}/htmldoc/tidy.1 ${PREFIX}/${PKGMANDIR}/man1
36 for doc in ${HTML_DOCFILES}; do \ 46 for doc in ${HTML_DOCFILES}; do \
37 ${INSTALL_DATA} ${WRKSRC}/htmldoc/$$doc ${HTML_DOCDIR} ; \ 47 ${INSTALL_DATA} ${WRKSRC}/htmldoc/$$doc ${HTML_DOCDIR} ; \
38 done 48 done
39 ${INSTALL_DATA_DIR} ${HTML_DOCDIR}/api 49 ${INSTALL_DATA} ${WRKSRC}/htmldoc/api/* ${HTML_DOCDIR}/api
40 for apifile in ${WRKSRC}/htmldoc/api/* ; do \ 
41 ${INSTALL_DATA} $$apifile ${HTML_DOCDIR}/api ; \ 
42 done 
43 50
44.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/tidy/PLIST (expand / switch to unified diff)

--- pkgsrc/www/tidy/PLIST 2003/10/28 12:33:48 1.2
+++ pkgsrc/www/tidy/PLIST 2008/04/09 09:01:52 1.3
@@ -1,74 +1,83 @@ @@ -1,74 +1,83 @@
1@comment $NetBSD: PLIST,v 1.2 2003/10/28 12:33:48 cube Exp $ 1@comment $NetBSD: PLIST,v 1.3 2008/04/09 09:01:52 wiz Exp $
2bin/tab2space 2bin/tab2space
3bin/tidy 3bin/tidy
4include/tidy/buffio.h 4include/tidy/buffio.h
5include/tidy/fileio.h 
6include/tidy/platform.h 5include/tidy/platform.h
7include/tidy/tidy.h 6include/tidy/tidy.h
8include/tidy/tidyenum.h 7include/tidy/tidyenum.h
9lib/libtidy.a 8lib/libtidy.la
10man/man1/tidy.1 9man/man1/tidy.1
11share/doc/html/tidy/Overview.html 10share/doc/tidy/Overview.html
12share/doc/html/tidy/doxygen.cfg 11share/doc/tidy/api/annotated.html
13share/doc/html/tidy/faq.html 12share/doc/tidy/api/buffio_8h-source.html
14share/doc/html/tidy/grid.gif 13share/doc/tidy/api/buffio_8h.html
15share/doc/html/tidy/pending.html 14share/doc/tidy/api/deprecated.html
16share/doc/html/tidy/release-notes.html 15share/doc/tidy/api/doxygen.css
17share/doc/html/tidy/tidy.css 16share/doc/tidy/api/doxygen.png
18share/doc/html/tidy/tidy.gif 17share/doc/tidy/api/files.html
19share/doc/html/tidy/quickref.html 18share/doc/tidy/api/ftv2blank.png
20share/doc/html/tidy/license.html 19share/doc/tidy/api/ftv2doc.png
21share/doc/html/tidy/api/annotated.html 20share/doc/tidy/api/ftv2folderclosed.png
22share/doc/html/tidy/api/buffio_8h-source.html 21share/doc/tidy/api/ftv2folderopen.png
23share/doc/html/tidy/api/buffio_8h.html 22share/doc/tidy/api/ftv2lastnode.png
24share/doc/html/tidy/api/doxygen.css 23share/doc/tidy/api/ftv2link.png
25share/doc/html/tidy/api/doxygen.png 24share/doc/tidy/api/ftv2mlastnode.png
26share/doc/html/tidy/api/fileio_8h-source.html 25share/doc/tidy/api/ftv2mnode.png
27share/doc/html/tidy/api/fileio_8h.html 26share/doc/tidy/api/ftv2node.png
28share/doc/html/tidy/api/files.html 27share/doc/tidy/api/ftv2plastnode.png
29share/doc/html/tidy/api/ftv2blank.png 28share/doc/tidy/api/ftv2pnode.png
30share/doc/html/tidy/api/ftv2doc.png 29share/doc/tidy/api/ftv2vertline.png
31share/doc/html/tidy/api/ftv2folderclosed.png 30share/doc/tidy/api/functions.html
32share/doc/html/tidy/api/ftv2folderopen.png 31share/doc/tidy/api/functions_func.html
33share/doc/html/tidy/api/ftv2lastnode.png 32share/doc/tidy/api/functions_vars.html
34share/doc/html/tidy/api/ftv2link.png 33share/doc/tidy/api/globals.html
35share/doc/html/tidy/api/ftv2mlastnode.png 34share/doc/tidy/api/globals_func.html
36share/doc/html/tidy/api/ftv2mnode.png 35share/doc/tidy/api/globals_type.html
37share/doc/html/tidy/api/ftv2node.png 36share/doc/tidy/api/group__AttrGet.html
38share/doc/html/tidy/api/ftv2plastnode.png 37share/doc/tidy/api/group__AttrGetAttributeName.html
39share/doc/html/tidy/api/ftv2pnode.png 38share/doc/tidy/api/group__AttrIsAttributeName.html
40share/doc/html/tidy/api/ftv2vertline.png 39share/doc/tidy/api/group__Attribute.html
41share/doc/html/tidy/api/functions.html 40share/doc/tidy/api/group__Basic.html
42share/doc/html/tidy/api/globals.html 41share/doc/tidy/api/group__Clean.html
43share/doc/html/tidy/api/group__AttrGet.html 42share/doc/tidy/api/group__Configuration.html
44share/doc/html/tidy/api/group__Attribute.html 43share/doc/tidy/api/group__IO.html
45share/doc/html/tidy/api/group__Basic.html 44share/doc/tidy/api/group__Memory.html
46share/doc/html/tidy/api/group__Clean.html 45share/doc/tidy/api/group__NodeAsk.html
47share/doc/html/tidy/api/group__Configuration.html 46share/doc/tidy/api/group__NodeIsElementName.html
48share/doc/html/tidy/api/group__IO.html 47share/doc/tidy/api/group__Opaque.html
49share/doc/html/tidy/api/group__Memory.html 48share/doc/tidy/api/group__Parse.html
50share/doc/html/tidy/api/group__NodeAsk.html 49share/doc/tidy/api/group__Save.html
51share/doc/html/tidy/api/group__Opaque.html 50share/doc/tidy/api/group__Tree.html
52share/doc/html/tidy/api/group__Parse.html 51share/doc/tidy/api/index.html
53share/doc/html/tidy/api/group__Save.html 52share/doc/tidy/api/main.html
54share/doc/html/tidy/api/group__Tree.html 53share/doc/tidy/api/modules.html
55share/doc/html/tidy/api/index.html 54share/doc/tidy/api/pages.html
56share/doc/html/tidy/api/main.html 55share/doc/tidy/api/platform_8h-source.html
57share/doc/html/tidy/api/modules.html 56share/doc/tidy/api/structTidyAttr.html
58share/doc/html/tidy/api/structTidyAttr.html 57share/doc/tidy/api/structTidyDoc.html
59share/doc/html/tidy/api/structTidyDoc.html 58share/doc/tidy/api/structTidyNode.html
60share/doc/html/tidy/api/structTidyNode.html 59share/doc/tidy/api/structTidyOption.html
61share/doc/html/tidy/api/structTidyOption.html 60share/doc/tidy/api/struct__TidyAllocator.html
62share/doc/html/tidy/api/struct__TidyBuffer.html 61share/doc/tidy/api/struct__TidyAllocatorVtbl.html
63share/doc/html/tidy/api/struct__TidyInputSource.html 62share/doc/tidy/api/struct__TidyBuffer.html
64share/doc/html/tidy/api/struct__TidyOutputSink.html 63share/doc/tidy/api/struct__TidyInputSource.html
65share/doc/html/tidy/api/tidy_8h-source.html 64share/doc/tidy/api/struct__TidyOutputSink.html
66share/doc/html/tidy/api/tidy_8h.html 65share/doc/tidy/api/tab_b.gif
67share/doc/html/tidy/api/tidyenum_8h-source.html 66share/doc/tidy/api/tab_l.gif
68share/doc/html/tidy/api/tidyenum_8h.html 67share/doc/tidy/api/tab_r.gif
69share/doc/html/tidy/api/tree.html 68share/doc/tidy/api/tabs.css
70share/doc/html/tidy/api/tree.js 69share/doc/tidy/api/tidy_8h-source.html
71share/doc/html/tidy/api/treeview.js 70share/doc/tidy/api/tidy_8h.html
 71share/doc/tidy/api/tidyenum_8h-source.html
 72share/doc/tidy/api/tree.html
 73share/doc/tidy/doxygen.cfg
 74share/doc/tidy/faq.html
 75share/doc/tidy/grid.gif
 76share/doc/tidy/license.html
 77share/doc/tidy/pending.html
 78share/doc/tidy/release-notes.html
 79share/doc/tidy/tidy.css
 80share/doc/tidy/tidy.gif
 81@dirrm share/doc/tidy/api
 82@dirrm share/doc/tidy
72@dirrm include/tidy 83@dirrm include/tidy
73@dirrm share/doc/html/tidy/api 
74@dirrm share/doc/html/tidy 
cvs diff -r1.7 -r1.8 pkgsrc/www/tidy/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/tidy/buildlink3.mk 2006/07/08 23:11:13 1.7
+++ pkgsrc/www/tidy/buildlink3.mk 2008/04/09 09:01:52 1.8
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2008/04/09 09:01:52 wiz Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+ 4TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= tidy 7BUILDLINK_DEPENDS+= tidy
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy}
11BUILDLINK_PACKAGES+= tidy 11BUILDLINK_PACKAGES+= tidy
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy
13 13
14.if !empty(TIDY_BUILDLINK3_MK:M+) 14.if !empty(TIDY_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.tidy+= tidy>=20031002 15BUILDLINK_API_DEPENDS.tidy+= tidy>=20080324
16BUILDLINK_ABI_DEPENDS.tidy?= tidy>=20050921nb1 
17BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy 16BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy
18.endif # TIDY_BUILDLINK3_MK 17.endif # TIDY_BUILDLINK3_MK
19 18
20BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.14 -r1.15 pkgsrc/www/tidy/distinfo (expand / switch to unified diff)

--- pkgsrc/www/tidy/distinfo 2006/09/16 15:29:36 1.14
+++ pkgsrc/www/tidy/distinfo 2008/04/09 09:01:52 1.15
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
1$NetBSD: distinfo,v 1.14 2006/09/16 15:29:36 hira Exp $ 1$NetBSD: distinfo,v 1.15 2008/04/09 09:01:52 wiz Exp $
2 2
3SHA1 (tidy_docs_050705.tgz) = b243d7910ce2fe57a8df27ff8f775e6d397c732d 3SHA1 (tidy-20080324.tar.gz) = 88bdeb0f470679704f9d41cb1f2278dda947136b
4RMD160 (tidy_docs_050705.tgz) = 49b8c2eaf87a0291b1bef6479cf1eeda6b720f52 4RMD160 (tidy-20080324.tar.gz) = 85209cd3614cd035b4be1794e4fda669fac16781
5Size (tidy_docs_050705.tgz) = 150359 bytes 5Size (tidy-20080324.tar.gz) = 490324 bytes
6SHA1 (tidy_src_051026.tgz) = 53be36945344af0c4080c34ebc95728bf8617f1c 
7RMD160 (tidy_src_051026.tgz) = 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 
8Size (tidy_src_051026.tgz) = 256131 bytes 
9SHA1 (patch-aa) = e27b9b82ee47b9b54004c4a4a5bccba944847040 6SHA1 (patch-aa) = e27b9b82ee47b9b54004c4a4a5bccba944847040
10SHA1 (patch-ab) = b243b9021f922e123b18a79566923a57d904b0d3 
11SHA1 (patch-ac) = a75e159377ea3694a406d9644f8abdd2cc6dca30 
File Deleted: pkgsrc/www/tidy/patches/Attic/patch-ab
File Deleted: pkgsrc/www/tidy/patches/Attic/patch-ac