diff options
author | wiz <wiz@pkgsrc.org> | 2008-04-09 09:01:52 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2008-04-09 09:01:52 +0000 |
commit | 237e755fc0b6af403c480975c3360d505354d055 (patch) | |
tree | 4440e778590c12a0808618ecebd34b1ae742dcd9 /www/tidy | |
parent | 636b583e85a9f92e7d782341ea740b714252bd1a (diff) | |
download | pkgsrc-237e755fc0b6af403c480975c3360d505354d055.tar.gz |
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.
Diffstat (limited to 'www/tidy')
-rw-r--r-- | www/tidy/Makefile | 55 | ||||
-rw-r--r-- | www/tidy/PLIST | 141 | ||||
-rw-r--r-- | www/tidy/buildlink3.mk | 5 | ||||
-rw-r--r-- | www/tidy/distinfo | 13 | ||||
-rw-r--r-- | www/tidy/patches/patch-ab | 37 | ||||
-rw-r--r-- | www/tidy/patches/patch-ac | 94 |
6 files changed, 112 insertions, 233 deletions
diff --git a/www/tidy/Makefile b/www/tidy/Makefile index 87363dcb5c9..f329b63d056 100644 --- a/www/tidy/Makefile +++ b/www/tidy/Makefile @@ -1,44 +1,51 @@ -# $NetBSD: Makefile,v 1.26 2006/07/27 18:48:04 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2008/04/09 09:01:52 wiz Exp $ # -DISTNAME= tidy_src_051026 -PKGNAME= tidy-20051026 +DISTNAME= tidy-20080324 CATEGORIES= www -MASTER_SITES= http://tidy.sourceforge.net/src/ \ - http://tidy.sourceforge.net/src/old/ -SITES.tidy_docs_050705.tgz= http://tidy.sourceforge.net/docs/ -EXTRACT_SUFX= .tgz -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} tidy_docs_050705${EXTRACT_SUFX} +MASTER_SITES= # manually created tarballs on ftp.NetBSD.org only MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://tidy.sourceforge.net/ COMMENT= Fixes and tidies up HTML files BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt +BUILD_DEPENDS+= doxygen>=1.0:../../devel/doxygen WRKSRC= ${WRKDIR}/tidy -NO_CONFIGURE= yes -USE_TOOLS+= gmake -BUILD_DIRS= ${WRKSRC}/build/gmake - -OPSYSVARS+= MAKEFLAGS -MAKEFLAGS.Darwin+= RANLIB=ranlib - -HTML_DOCFILES= Overview.html doxygen.cfg grid.gif quickref.html tidy.css \ - faq.html license.html pending.html release-notes.html tidy.gif -HTML_DOCDIR= ${PREFIX}/share/doc/html/tidy +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= aclocal autoconf automake gmake +CPPFLAGS+= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 +CPPFLAGS+= -DSUPPORT_ASIAN_ENCODINGS=1 -DSUPPORT_GETPWNAM=1 + +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 + +pre-configure: + cd ${WRKSRC}/build/gnuauto && cp -R -f * ${WRKSRC} + cd ${WRKSRC} && \ + touch NEWS README AUTHORS ChangeLog; \ + libtoolize --force --copy; \ + aclocal; \ + autoconf; \ + automake -acf post-build: - cd ${BUILD_DIRS} && ${GMAKE} doc + cd ${WRKSRC}/htmldoc && \ + ${WRKSRC}/console/tidy -xml-help > tidy.xml && \ + ${WRKSRC}/console/tidy -xml-config > tidy-config.xml && \ + xsltproc tidy1.xsl tidy.xml > tidy.1 + cd ${WRKSRC} && \ + doxygen htmldoc/doxygen.cfg post-install: - ${INSTALL_DATA_DIR} ${HTML_DOCDIR} + ${INSTALL_MAN} ${WRKSRC}/htmldoc/tidy.1 ${PREFIX}/${PKGMANDIR}/man1 for doc in ${HTML_DOCFILES}; do \ ${INSTALL_DATA} ${WRKSRC}/htmldoc/$$doc ${HTML_DOCDIR} ; \ done - ${INSTALL_DATA_DIR} ${HTML_DOCDIR}/api - for apifile in ${WRKSRC}/htmldoc/api/* ; do \ - ${INSTALL_DATA} $$apifile ${HTML_DOCDIR}/api ; \ - done + ${INSTALL_DATA} ${WRKSRC}/htmldoc/api/* ${HTML_DOCDIR}/api .include "../../mk/bsd.pkg.mk" diff --git a/www/tidy/PLIST b/www/tidy/PLIST index 2963bec18b7..1f05676e0cf 100644 --- a/www/tidy/PLIST +++ b/www/tidy/PLIST @@ -1,74 +1,83 @@ -@comment $NetBSD: PLIST,v 1.2 2003/10/28 12:33:48 cube Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/09 09:01:52 wiz Exp $ bin/tab2space bin/tidy include/tidy/buffio.h -include/tidy/fileio.h include/tidy/platform.h include/tidy/tidy.h include/tidy/tidyenum.h -lib/libtidy.a +lib/libtidy.la man/man1/tidy.1 -share/doc/html/tidy/Overview.html -share/doc/html/tidy/doxygen.cfg -share/doc/html/tidy/faq.html -share/doc/html/tidy/grid.gif -share/doc/html/tidy/pending.html -share/doc/html/tidy/release-notes.html -share/doc/html/tidy/tidy.css -share/doc/html/tidy/tidy.gif -share/doc/html/tidy/quickref.html -share/doc/html/tidy/license.html -share/doc/html/tidy/api/annotated.html -share/doc/html/tidy/api/buffio_8h-source.html -share/doc/html/tidy/api/buffio_8h.html -share/doc/html/tidy/api/doxygen.css -share/doc/html/tidy/api/doxygen.png -share/doc/html/tidy/api/fileio_8h-source.html -share/doc/html/tidy/api/fileio_8h.html -share/doc/html/tidy/api/files.html -share/doc/html/tidy/api/ftv2blank.png -share/doc/html/tidy/api/ftv2doc.png -share/doc/html/tidy/api/ftv2folderclosed.png -share/doc/html/tidy/api/ftv2folderopen.png -share/doc/html/tidy/api/ftv2lastnode.png -share/doc/html/tidy/api/ftv2link.png -share/doc/html/tidy/api/ftv2mlastnode.png -share/doc/html/tidy/api/ftv2mnode.png -share/doc/html/tidy/api/ftv2node.png -share/doc/html/tidy/api/ftv2plastnode.png -share/doc/html/tidy/api/ftv2pnode.png -share/doc/html/tidy/api/ftv2vertline.png -share/doc/html/tidy/api/functions.html -share/doc/html/tidy/api/globals.html -share/doc/html/tidy/api/group__AttrGet.html -share/doc/html/tidy/api/group__Attribute.html -share/doc/html/tidy/api/group__Basic.html -share/doc/html/tidy/api/group__Clean.html -share/doc/html/tidy/api/group__Configuration.html -share/doc/html/tidy/api/group__IO.html -share/doc/html/tidy/api/group__Memory.html -share/doc/html/tidy/api/group__NodeAsk.html -share/doc/html/tidy/api/group__Opaque.html -share/doc/html/tidy/api/group__Parse.html -share/doc/html/tidy/api/group__Save.html -share/doc/html/tidy/api/group__Tree.html -share/doc/html/tidy/api/index.html -share/doc/html/tidy/api/main.html -share/doc/html/tidy/api/modules.html -share/doc/html/tidy/api/structTidyAttr.html -share/doc/html/tidy/api/structTidyDoc.html -share/doc/html/tidy/api/structTidyNode.html -share/doc/html/tidy/api/structTidyOption.html -share/doc/html/tidy/api/struct__TidyBuffer.html -share/doc/html/tidy/api/struct__TidyInputSource.html -share/doc/html/tidy/api/struct__TidyOutputSink.html -share/doc/html/tidy/api/tidy_8h-source.html -share/doc/html/tidy/api/tidy_8h.html -share/doc/html/tidy/api/tidyenum_8h-source.html -share/doc/html/tidy/api/tidyenum_8h.html -share/doc/html/tidy/api/tree.html -share/doc/html/tidy/api/tree.js -share/doc/html/tidy/api/treeview.js +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/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_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 -@dirrm share/doc/html/tidy/api -@dirrm share/doc/html/tidy diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk index febf1d5b016..2da1799d4aa 100644 --- a/www/tidy/buildlink3.mk +++ b/www/tidy/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:13 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2008/04/09 09:01:52 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+ @@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+= tidy BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy .if !empty(TIDY_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.tidy+= tidy>=20031002 -BUILDLINK_ABI_DEPENDS.tidy?= tidy>=20050921nb1 +BUILDLINK_API_DEPENDS.tidy+= tidy>=20080324 BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy .endif # TIDY_BUILDLINK3_MK diff --git a/www/tidy/distinfo b/www/tidy/distinfo index 817c1737b3f..1e1b085b346 100644 --- a/www/tidy/distinfo +++ b/www/tidy/distinfo @@ -1,11 +1,6 @@ -$NetBSD: distinfo,v 1.14 2006/09/16 15:29:36 hira Exp $ +$NetBSD: distinfo,v 1.15 2008/04/09 09:01:52 wiz Exp $ -SHA1 (tidy_docs_050705.tgz) = b243d7910ce2fe57a8df27ff8f775e6d397c732d -RMD160 (tidy_docs_050705.tgz) = 49b8c2eaf87a0291b1bef6479cf1eeda6b720f52 -Size (tidy_docs_050705.tgz) = 150359 bytes -SHA1 (tidy_src_051026.tgz) = 53be36945344af0c4080c34ebc95728bf8617f1c -RMD160 (tidy_src_051026.tgz) = 0cae41f8c0cec51d4600d1bf2aac338cf60aa6b9 -Size (tidy_src_051026.tgz) = 256131 bytes +SHA1 (tidy-20080324.tar.gz) = 88bdeb0f470679704f9d41cb1f2278dda947136b +RMD160 (tidy-20080324.tar.gz) = 85209cd3614cd035b4be1794e4fda669fac16781 +Size (tidy-20080324.tar.gz) = 490324 bytes SHA1 (patch-aa) = e27b9b82ee47b9b54004c4a4a5bccba944847040 -SHA1 (patch-ab) = b243b9021f922e123b18a79566923a57d904b0d3 -SHA1 (patch-ac) = a75e159377ea3694a406d9644f8abdd2cc6dca30 diff --git a/www/tidy/patches/patch-ab b/www/tidy/patches/patch-ab deleted file mode 100644 index 772cc7c7099..00000000000 --- a/www/tidy/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2005/10/04 18:00:49 wiz Exp $ - ---- include/platform.h.orig 2005-06-16 08:58:05.000000000 +0200 -+++ include/platform.h 2005-07-03 15:02:26.000000000 +0200 -@@ -48,7 +48,7 @@ - Contributed by Todd Lewis. - */ - --/* #define SUPPORT_GETPWNAM */ -+#define SUPPORT_GETPWNAM - - - /* Enable/disable support for Big5 and Shift_JIS character encodings */ -@@ -105,7 +105,13 @@ - - /* Convenience defines for BSD like platforms */ - --#if defined(__FreeBSD__) -+#if defined(__DragonFly__) -+#define BSD_BASED_OS -+#ifndef PLATFORM_NAME -+#define PLATFORM_NAME "DragonFly" -+#endif -+ -+#elif defined(__FreeBSD__) - #define BSD_BASED_OS - #ifndef PLATFORM_NAME - #define PLATFORM_NAME "FreeBSD" -@@ -504,7 +510,7 @@ - #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 --#if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || defined(BSD_BASED_OS) || defined(_WIN32) -+#if defined(HPUX_OS) || defined(CYGWIN_OS) || defined(MAC_OS) || (defined(BSD_BASED_OS) && !defined(__NetBSD__)) || defined(_WIN32) - typedef unsigned long ulong; - #endif - diff --git a/www/tidy/patches/patch-ac b/www/tidy/patches/patch-ac deleted file mode 100644 index fbc02281ff2..00000000000 --- a/www/tidy/patches/patch-ac +++ /dev/null @@ -1,94 +0,0 @@ -$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 |