Add package option 'doc'.

If and only if this option is set the documentation for the tidy
library is built with doxygen and then installed.

This new package option is set by default hence preserving the
previous package "behaviour" in the default case.

Not setting this option provides smaller build dependencies: doxygen
is not required.

Please note that the manual page of the command line tool tidy is
still provided even if the package option 'doc' is not set.

Bump PKGREVISION to 1.

3 files changed, 98 insertions, 79 deletions

diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 38280bd58bb..82bf110a54b 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2008/11/11 00:48:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2009/02/05 21:52:52 seb Exp $
 #
 
 DISTNAME=	tidy-20081014
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	# manually created tarballs on ftp.NetBSD.org only
 
@@ -12,7 +13,12 @@ COMMENT=	Fixes and tidies up HTML files
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+=	libxslt>=1.1.0:../../textproc/libxslt
-BUILD_DEPENDS+=	doxygen>=1.5.7.1:../../devel/doxygen
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.tidy
+PKG_SUPPORTED_OPTIONS=	doc
+PKG_SUGGESTED_OPTIONS=	doc
+
+.include "../../mk/bsd.options.mk"
 
 WRKSRC=		${WRKDIR}/tidy
 GNU_CONFIGURE=	yes
@@ -21,10 +27,18 @@ USE_TOOLS+=	aclocal autoconf automake gmake
 CPPFLAGS+=	-DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1
 CPPFLAGS+=	-DSUPPORT_ASIAN_ENCODINGS=1 -DSUPPORT_GETPWNAM=1
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
+PLIST_SRC+=		${PKGDIR}/PLIST
+
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+= doxygen>=1.5.7.1:../../devel/doxygen
+
 HTML_DOCFILES=	Overview.html doxygen.cfg grid.gif tidy.css faq.html \
 		license.html pending.html release-notes.html tidy.gif
 HTML_DOCDIR=	${PREFIX}/share/doc/tidy
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${HTML_DOCDIR} ${HTML_DOCDIR}/api
+INSTALLATION_DIRS+=	${HTML_DOCDIR} ${HTML_DOCDIR}/api
+PLIST_SRC+=	${PKGDIR}/PLIST.doc
+.endif
 
 pre-configure:
 	cd ${WRKSRC}/build/gnuauto && cp -R -f * ${WRKSRC}
@@ -40,14 +54,18 @@ post-build:
 	${WRKSRC}/console/tidy -xml-help > tidy.xml && \
 	${WRKSRC}/console/tidy -xml-config > tidy-config.xml && \
 	xsltproc tidy1.xsl tidy.xml > tidy.1
+.if !empty(PKG_OPTIONS:Mdoc)
 	cd ${WRKSRC} && \
 	doxygen htmldoc/doxygen.cfg
+.endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/htmldoc/tidy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.if !empty(PKG_OPTIONS:Mdoc)
 	for doc in ${HTML_DOCFILES}; do					\
 	    ${INSTALL_DATA} ${WRKSRC}/htmldoc/$$doc ${DESTDIR}${HTML_DOCDIR} ;	\
 	done
 	${INSTALL_DATA} ${WRKSRC}/htmldoc/api/* ${DESTDIR}${HTML_DOCDIR}/api
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/tidy/PLIST b/www/tidy/PLIST
index 3e4fb2022e3..3bbd8e41d18 100644
--- a/www/tidy/PLIST
+++ b/www/tidy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/11/11 00:48:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/02/05 21:52:52 seb Exp $
 bin/tab2space
 bin/tidy
 include/tidy/buffio.h
@@ -7,79 +7,4 @@ include/tidy/tidy.h
 include/tidy/tidyenum.h
 lib/libtidy.la
 man/man1/tidy.1
-share/doc/tidy/Overview.html
-share/doc/tidy/api/annotated.html
-share/doc/tidy/api/buffio_8h-source.html
-share/doc/tidy/api/buffio_8h.html
-share/doc/tidy/api/classes.html
-share/doc/tidy/api/deprecated.html
-share/doc/tidy/api/doxygen.css
-share/doc/tidy/api/doxygen.png
-share/doc/tidy/api/files.html
-share/doc/tidy/api/ftv2blank.png
-share/doc/tidy/api/ftv2doc.png
-share/doc/tidy/api/ftv2folderclosed.png
-share/doc/tidy/api/ftv2folderopen.png
-share/doc/tidy/api/ftv2lastnode.png
-share/doc/tidy/api/ftv2link.png
-share/doc/tidy/api/ftv2mlastnode.png
-share/doc/tidy/api/ftv2mnode.png
-share/doc/tidy/api/ftv2node.png
-share/doc/tidy/api/ftv2plastnode.png
-share/doc/tidy/api/ftv2pnode.png
-share/doc/tidy/api/ftv2vertline.png
-share/doc/tidy/api/functions.html
-share/doc/tidy/api/functions_func.html
-share/doc/tidy/api/functions_vars.html
-share/doc/tidy/api/globals.html
-share/doc/tidy/api/globals_defs.html
-share/doc/tidy/api/globals_func.html
-share/doc/tidy/api/globals_type.html
-share/doc/tidy/api/group__AttrGet.html
-share/doc/tidy/api/group__AttrGetAttributeName.html
-share/doc/tidy/api/group__AttrIsAttributeName.html
-share/doc/tidy/api/group__Attribute.html
-share/doc/tidy/api/group__Basic.html
-share/doc/tidy/api/group__Clean.html
-share/doc/tidy/api/group__Configuration.html
-share/doc/tidy/api/group__IO.html
-share/doc/tidy/api/group__Memory.html
-share/doc/tidy/api/group__NodeAsk.html
-share/doc/tidy/api/group__NodeIsElementName.html
-share/doc/tidy/api/group__Opaque.html
-share/doc/tidy/api/group__Parse.html
-share/doc/tidy/api/group__Save.html
-share/doc/tidy/api/group__Tree.html
-share/doc/tidy/api/index.html
-share/doc/tidy/api/main.html
-share/doc/tidy/api/modules.html
-share/doc/tidy/api/pages.html
-share/doc/tidy/api/platform_8h-source.html
-share/doc/tidy/api/structTidyAttr.html
-share/doc/tidy/api/structTidyDoc.html
-share/doc/tidy/api/structTidyNode.html
-share/doc/tidy/api/structTidyOption.html
-share/doc/tidy/api/struct__TidyAllocator.html
-share/doc/tidy/api/struct__TidyAllocatorVtbl.html
-share/doc/tidy/api/struct__TidyBuffer.html
-share/doc/tidy/api/struct__TidyInputSource.html
-share/doc/tidy/api/struct__TidyOutputSink.html
-share/doc/tidy/api/tab_b.gif
-share/doc/tidy/api/tab_l.gif
-share/doc/tidy/api/tab_r.gif
-share/doc/tidy/api/tabs.css
-share/doc/tidy/api/tidy_8h-source.html
-share/doc/tidy/api/tidy_8h.html
-share/doc/tidy/api/tidyenum_8h-source.html
-share/doc/tidy/api/tree.html
-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/release-notes.html
-share/doc/tidy/tidy.css
-share/doc/tidy/tidy.gif
-@dirrm share/doc/tidy/api
-@dirrm share/doc/tidy
 @dirrm include/tidy
diff --git a/www/tidy/PLIST.doc b/www/tidy/PLIST.doc
new file mode 100644
index 00000000000..1189cba0425
--- /dev/null
+++ b/www/tidy/PLIST.doc
@@ -0,0 +1,76 @@
+@comment $NetBSD: PLIST.doc,v 1.1 2009/02/05 21:52:52 seb Exp $
+share/doc/tidy/Overview.html
+share/doc/tidy/api/annotated.html
+share/doc/tidy/api/buffio_8h-source.html
+share/doc/tidy/api/buffio_8h.html
+share/doc/tidy/api/classes.html
+share/doc/tidy/api/deprecated.html
+share/doc/tidy/api/doxygen.css
+share/doc/tidy/api/doxygen.png
+share/doc/tidy/api/files.html
+share/doc/tidy/api/ftv2blank.png
+share/doc/tidy/api/ftv2doc.png
+share/doc/tidy/api/ftv2folderclosed.png
+share/doc/tidy/api/ftv2folderopen.png
+share/doc/tidy/api/ftv2lastnode.png
+share/doc/tidy/api/ftv2link.png
+share/doc/tidy/api/ftv2mlastnode.png
+share/doc/tidy/api/ftv2mnode.png
+share/doc/tidy/api/ftv2node.png
+share/doc/tidy/api/ftv2plastnode.png
+share/doc/tidy/api/ftv2pnode.png
+share/doc/tidy/api/ftv2vertline.png
+share/doc/tidy/api/functions.html
+share/doc/tidy/api/functions_func.html
+share/doc/tidy/api/functions_vars.html
+share/doc/tidy/api/globals.html
+share/doc/tidy/api/globals_defs.html
+share/doc/tidy/api/globals_func.html
+share/doc/tidy/api/globals_type.html
+share/doc/tidy/api/group__AttrGet.html
+share/doc/tidy/api/group__AttrGetAttributeName.html
+share/doc/tidy/api/group__AttrIsAttributeName.html
+share/doc/tidy/api/group__Attribute.html
+share/doc/tidy/api/group__Basic.html
+share/doc/tidy/api/group__Clean.html
+share/doc/tidy/api/group__Configuration.html
+share/doc/tidy/api/group__IO.html
+share/doc/tidy/api/group__Memory.html
+share/doc/tidy/api/group__NodeAsk.html
+share/doc/tidy/api/group__NodeIsElementName.html
+share/doc/tidy/api/group__Opaque.html
+share/doc/tidy/api/group__Parse.html
+share/doc/tidy/api/group__Save.html
+share/doc/tidy/api/group__Tree.html
+share/doc/tidy/api/index.html
+share/doc/tidy/api/main.html
+share/doc/tidy/api/modules.html
+share/doc/tidy/api/pages.html
+share/doc/tidy/api/platform_8h-source.html
+share/doc/tidy/api/structTidyAttr.html
+share/doc/tidy/api/structTidyDoc.html
+share/doc/tidy/api/structTidyNode.html
+share/doc/tidy/api/structTidyOption.html
+share/doc/tidy/api/struct__TidyAllocator.html
+share/doc/tidy/api/struct__TidyAllocatorVtbl.html
+share/doc/tidy/api/struct__TidyBuffer.html
+share/doc/tidy/api/struct__TidyInputSource.html
+share/doc/tidy/api/struct__TidyOutputSink.html
+share/doc/tidy/api/tab_b.gif
+share/doc/tidy/api/tab_l.gif
+share/doc/tidy/api/tab_r.gif
+share/doc/tidy/api/tabs.css
+share/doc/tidy/api/tidy_8h-source.html
+share/doc/tidy/api/tidy_8h.html
+share/doc/tidy/api/tidyenum_8h-source.html
+share/doc/tidy/api/tree.html
+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/release-notes.html
+share/doc/tidy/tidy.css
+share/doc/tidy/tidy.gif
+@dirrm share/doc/tidy/api
+@dirrm share/doc/tidy