Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_148758311330040"
MIME-Version: 1.0
Date: Mon, 20 Feb 2017 09:31:53 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/www/tidy
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20170220093153.C9E55FBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_148758311330040
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Feb 20 09:31:53 UTC 2017

Modified Files:
	pkgsrc/www/tidy: DESCR Makefile PLIST buildlink3.mk distinfo
Removed Files:
	pkgsrc/www/tidy: PLIST.doc
	pkgsrc/www/tidy/patches: patch-aa patch-src_lexer.c

Log Message:
Updated tidy to 5.2.0.

This is the currently maintained version of tidy.
No concise changelog compared to the 2009 version available though,
sorry.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/tidy/DESCR
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/tidy/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/tidy/PLIST
cvs rdiff -u -r1.11 -r0 pkgsrc/www/tidy/PLIST.doc
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/tidy/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/tidy/distinfo
cvs rdiff -u -r1.9 -r0 pkgsrc/www/tidy/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/www/tidy/patches/patch-src_lexer.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_148758311330040
Content-Disposition: inline
Content-Length: 7292
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/www/tidy/DESCR
diff -u pkgsrc/www/tidy/DESCR:1.2 pkgsrc/www/tidy/DESCR:1.3
--- pkgsrc/www/tidy/DESCR:1.2	Thu Aug 15 09:39:20 2002
+++ pkgsrc/www/tidy/DESCR	Mon Feb 20 09:31:53 2017
@@ -1,15 +1,16 @@
-When editing HTML it's easy to make mistakes. Wouldn't it be nice if
-there was a simple way to fix these mistakes automatically and tidy up
-sloppy editing into nicely layed out markup?  Well now there is thanks
-to Hewlett Packard's Dave Raggett. HTML TIDY is a free utility for
-doing just that. It also works great on the attrociously hard to read
-markup generated by specialized HTML editors and conversion tools, and
-can help you identify where you need to pay further attention on
-making your pages more accessible to people with disabilities.
+When editing HTML it's easy to make mistakes. Wouldn't it be nice
+if there was a simple way to fix these mistakes automatically and
+tidy up sloppy editing into nicely layed out markup?  Well now
+there is thanks to Hewlett Packard's Dave Raggett. HTML TIDY is a
+free utility for doing just that. It also works great on the
+attrociously hard to read markup generated by specialized HTML
+editors and conversion tools, and can help you identify where you
+need to pay further attention on making your pages more accessible
+to people with disabilities.
 
-Tidy is able to fix up a wide range of problems and to bring to your
-attention things that you need to work on yourself. Each item found is
-listed with the line number and column so that you can see where the
-problem lies in your markup. Tidy won't generate a cleaned up version
-when there are problems that it can't be sure of how to handle. These
-are logged as "errors" rather than "warnings".
+Tidy is able to fix up a wide range of problems and to bring to
+your attention things that you need to work on yourself. Each item
+found is listed with the line number and column so that you can
+see where the problem lies in your markup. Tidy won't generate a
+cleaned up version when there are problems that it can't be sure
+of how to handle. These are logged as "errors" rather than "warnings".

Index: pkgsrc/www/tidy/Makefile
diff -u pkgsrc/www/tidy/Makefile:1.49 pkgsrc/www/tidy/Makefile:1.50
--- pkgsrc/www/tidy/Makefile:1.49	Fri Nov 25 16:05:23 2016
+++ pkgsrc/www/tidy/Makefile	Mon Feb 20 09:31:53 2017
@@ -1,69 +1,23 @@
-# $NetBSD: Makefile,v 1.49 2016/11/25 16:05:23 leot Exp $
+# $NetBSD: Makefile,v 1.50 2017/02/20 09:31:53 wiz Exp $
 
-DISTNAME=	tidy-20091027
-PKGREVISION=	8
-CATEGORIES=	www
-MASTER_SITES=	# manually created tarballs on ftp.NetBSD.org only
+DISTNAME=	tidy-html5-5.2.0
+PKGNAME=	${DISTNAME:S/-html5//}
+CATEGORIES=	www textproc
+MASTER_SITES=	${MASTER_SITE_GITHUB:=htacg/}
+GITHUB_PROJECT=	tidy-html5
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.html-tidy.org/
 COMMENT=	Fixes and tidies up HTML files
 LICENSE=	mit
 
-BUILD_DEPENDS+=	libxslt>=1.1.0:../../textproc/libxslt
+# for man page
+BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
-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
-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
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
-PLIST_SRC+=		${PKGDIR}/PLIST
-
-.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= doxygen>=1.8.12:../../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+=	${HTML_DOCDIR} ${HTML_DOCDIR}/api
-PLIST_SRC+=	${PKGDIR}/PLIST.doc
-.endif
-
-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 ${WRKSRC}/htmldoc && \
-	${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
+USE_LANGUAGES=	c c++
+
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
+CMAKE_ARGS+=	-DINCLUDE_INSTALL_DIR:PATH=include/tidy
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/tidy/PLIST
diff -u pkgsrc/www/tidy/PLIST:1.7 pkgsrc/www/tidy/PLIST:1.8
--- pkgsrc/www/tidy/PLIST:1.7	Sun Jun 14 22:00:37 2009
+++ pkgsrc/www/tidy/PLIST	Mon Feb 20 09:31:53 2017
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 22:00:37 joerg Exp $
-bin/tab2space
+@comment $NetBSD: PLIST,v 1.8 2017/02/20 09:31:53 wiz Exp $
 bin/tidy
-include/tidy/buffio.h
-include/tidy/platform.h
 include/tidy/tidy.h
+include/tidy/tidybuffio.h
 include/tidy/tidyenum.h
-lib/libtidy.la
+include/tidy/tidyplatform.h
+lib/libtidy.so
+lib/libtidy.so.5
+lib/libtidy.so.${PKGVERSION}
+lib/libtidys.a
 man/man1/tidy.1

Index: pkgsrc/www/tidy/buildlink3.mk
diff -u pkgsrc/www/tidy/buildlink3.mk:1.9 pkgsrc/www/tidy/buildlink3.mk:1.10
--- pkgsrc/www/tidy/buildlink3.mk:1.9	Fri Mar 20 19:25:38 2009
+++ pkgsrc/www/tidy/buildlink3.mk	Mon Feb 20 09:31:53 2017
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2017/02/20 09:31:53 wiz Exp $
 
 BUILDLINK_TREE+=	tidy
 
 .if !defined(TIDY_BUILDLINK3_MK)
 TIDY_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.tidy+=	tidy>=20080324
+BUILDLINK_API_DEPENDS.tidy+=	tidy>=5.1.25<20000000
 BUILDLINK_PKGSRCDIR.tidy?=	../../www/tidy
 .endif # TIDY_BUILDLINK3_MK
 

Index: pkgsrc/www/tidy/distinfo
diff -u pkgsrc/www/tidy/distinfo:1.21 pkgsrc/www/tidy/distinfo:1.22
--- pkgsrc/www/tidy/distinfo:1.21	Wed Nov  4 02:47:40 2015
+++ pkgsrc/www/tidy/distinfo	Mon Feb 20 09:31:53 2017
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.21 2015/11/04 02:47:40 agc Exp $
+$NetBSD: distinfo,v 1.22 2017/02/20 09:31:53 wiz Exp $
 
-SHA1 (tidy-20091027.tar.gz) = f77203b481430fef66382dc32ae5152004dabe78
-RMD160 (tidy-20091027.tar.gz) = b1e1aa3178b2e16095e1e6a532644462640b3f7f
-SHA512 (tidy-20091027.tar.gz) = 6df1744a59efba4fa86c356d5ebb498f60ce458e5f946105b6b8bf6641424f04084acba55668b2d3eb11f3f3adb9e3ede9af04393f074f4bfbd311c1d3c617e9
-Size (tidy-20091027.tar.gz) = 492052 bytes
-SHA1 (patch-aa) = 1c9f52f2713bdab8662dd71ccecadbfe3806bda0
-SHA1 (patch-src_lexer.c) = abb93b322452607e552c3c76871acf5de93c9cf5
+SHA1 (tidy-html5-5.2.0.tar.gz) = c1571eafa928390feee9e03445bf806127852288
+RMD160 (tidy-html5-5.2.0.tar.gz) = 60688847dcfdaa2070d3ad7274daa78392856875
+SHA512 (tidy-html5-5.2.0.tar.gz) = 9ab4c085235ff01988fa86c43fdcd5870eee077e4bcbaee5ca9b9679f363f476b39243b749ea66e5eb8a08c41d7a8346166b73e71f0b3239b955d20211f3b253
+Size (tidy-html5-5.2.0.tar.gz) = 529016 bytes


--_----------=_148758311330040--