tidy: remove, pkgsrc version is newer.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: tidy: remove, pkgsrc version is newer.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Mon, 20 Feb 2017 09:38:01 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Feb 20 10:38:01 2017 +0100
Changeset:	be37b2c5ccfc221c13403e51f91059606da0fb76

Modified Files:
	Makefile
	docbook2X/Makefile
	kde-baseapps4/Makefile
	kde-baseapps4/distinfo
Added Files:
	kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp
Removed Files:
	tidy/DESCR
	tidy/Makefile
	tidy/PLIST
	tidy/TODO
	tidy/buildlink3.mk
	tidy/distinfo

Log Message:
tidy: remove, pkgsrc version is newer.

Adapt some packages to tidy-5.x.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=be37b2c5ccfc221c13403e51f91059606da0fb76

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

diffstat:
 Makefile                                            |  1 -
 docbook2X/Makefile                                  |  1 +
 kde-baseapps4/Makefile                              |  1 +
 kde-baseapps4/distinfo                              |  1 +
 ...atch-konq-plugins_validators_tidy__validator.cpp | 16 ++++++++++++++++
 tidy/DESCR                                          | 16 ----------------
 tidy/Makefile                                       | 19 -------------------
 tidy/PLIST                                          | 11 -----------
 tidy/TODO                                           | 21 ---------------------
 tidy/buildlink3.mk                                  | 12 ------------
 tidy/distinfo                                       |  6 ------
 11 files changed, 19 insertions(+), 86 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 0dff39d856..ca46c761e9 100644
--- a/Makefile
+++ b/Makefile
@@ -4133,7 +4133,6 @@ SUBDIR+=	theama
 SUBDIR+=	thepeg
 SUBDIR+=	threadingbuildingblocks
 SUBDIR+=	thrift
-SUBDIR+=	tidy
 SUBDIR+=	tilda
 SUBDIR+=	timewarrior
 SUBDIR+=	tinyca2
diff --git a/docbook2X/Makefile b/docbook2X/Makefile
index 2a0959ffc3..2fe7a77bfb 100644
--- a/docbook2X/Makefile
+++ b/docbook2X/Makefile
@@ -2,6 +2,7 @@
 #
 
 DISTNAME=	docbook2X-0.8.8
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook2x/}
 
diff --git a/kde-baseapps4/Makefile b/kde-baseapps4/Makefile
index e7f81d9272..c130cefb08 100644
--- a/kde-baseapps4/Makefile
+++ b/kde-baseapps4/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	kde-baseapps-16.04.0
 PKGNAME=	${DISTNAME:S/-1/4-1/}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/16.04.0/src/}
diff --git a/kde-baseapps4/distinfo b/kde-baseapps4/distinfo
index 69bc9c5715..6858be2c39 100644
--- a/kde-baseapps4/distinfo
+++ b/kde-baseapps4/distinfo
@@ -5,3 +5,4 @@ RMD160 (kde-baseapps-16.04.0.tar.xz) = 21d83e6237693e363d437bbd79bb8d4e06051670
 SHA512 (kde-baseapps-16.04.0.tar.xz) = d8da8e76b6cbbf418af3f865d414f124423c573fa21751ddbb09cb2fa53792ad3e652455b215d9ae255b8dbfcf9731884384dce8e75168919b33cadcf3f8f6f8
 Size (kde-baseapps-16.04.0.tar.xz) = 2051040 bytes
 SHA1 (patch-dolphin_src_kitemviews_private_kdirectorycontentscounterworker.cpp) = db1d193f2413ae1aa53dbc979076ba76d485883f
+SHA1 (patch-konq-plugins_validators_tidy__validator.cpp) = ba60dda7562670b340f3efa88f6c5b968da3db6f
diff --git a/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp b/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp
new file mode 100644
index 0000000000..315afcd97e
--- /dev/null
+++ b/kde-baseapps4/patches/patch-konq-plugins_validators_tidy__validator.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+tidy-5.x compatibility.
+
+--- konq-plugins/validators/tidy_validator.cpp.orig	2016-03-25 06:39:47.000000000 +0000
++++ konq-plugins/validators/tidy_validator.cpp
+@@ -25,8 +25,8 @@
+ 
+ #include <kdebug.h>
+ 
+-#include <buffio.h>
+ #include <tidy.h>
++#include <tidybuffio.h>
+ 
+ #include <config-konq-validator.h>
+ 
diff --git a/tidy/DESCR b/tidy/DESCR
deleted file mode 100644
index 276adabcf2..0000000000
--- a/tidy/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-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".
diff --git a/tidy/Makefile b/tidy/Makefile
deleted file mode 100644
index 2f6c1cf795..0000000000
--- a/tidy/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-DISTNAME=	tidy-html5-5.1.25
-PKGNAME=	${DISTNAME:S/-html5//}
-CATEGORIES=	www textproc
-MASTER_SITES=	${MASTER_SITE_GITHUB:=htacg/}
-GITHUB_PROJECT=	tidy-html5
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.html-tidy.org/
-COMMENT=	Fixes and tidies up HTML files
-LICENSE=	mit
-
-USE_LANGUAGES=	c c++
-
-USE_CMAKE=	yes
-CMAKE_ARGS+=	-DMAN_INSTALL_DIR:PATH=${PKGMANDIR}/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/tidy/PLIST b/tidy/PLIST
deleted file mode 100644
index 8b1ece642f..0000000000
--- a/tidy/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD$
-bin/tidy
-include/tidy.h
-include/tidybuffio.h
-include/tidyenum.h
-include/tidyplatform.h
-lib/libtidy.so
-lib/libtidy.so.5
-lib/libtidy.so.5.1.25
-lib/libtidys.a
-man/man1/tidy.1
diff --git a/tidy/TODO b/tidy/TODO
deleted file mode 100644
index dfd0bfd166..0000000000
--- a/tidy/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-o Add a "doc" option like www/tidy
-o Still not ready to be imported because probably all the existing programs in
-  pkgsrc expect tidy headers in <tidy/...>:
-  + DEPENDS on tidy:
-   - meta-pkgs/netbsd-doc
-   - doc/guide/Makefile.common (used by meta-pkgs/pkgsrc-guide-tools)
-  + Change in htdocs/share/mk/doc.docbook.mk:63:
-     REQPKGS_HTML=   tidy>=20021108
-  + Other tidy users (via buildlink3.mk):
-   - editors/abiword-plugins/Makefile	-- hardcode tidy/tidy.h in configure,
-       plugins/mht/xp/tidyReader.h
-   - mail/prayer/Makefile		-- hardcode tidy/ in
-       patches/patch-defaults_Config
-   - www/kdewebdev4/Makefile		-- dunno, check
-       ${WRKSRC}/klinkstatus/cmake/modules/FindLibTidy.cmake
-       (probably it will work but it will not be able to recognise the
-       TIDY_ULONG_VERSION)
-   - www/php-tidy/Makefile		-- should be ok
-   - x11/kde-baseapps4/Makefile		-- like www/kdewebdev4, check
-       ${WRKSRC}/konq-plugins/validators/FindLibTidy.cmake
-   - wip/gurlchecker/options.mk		-- should be ok
diff --git a/tidy/buildlink3.mk b/tidy/buildlink3.mk
deleted file mode 100644
index 92ec9fd89c..0000000000
--- a/tidy/buildlink3.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:38 joerg Exp $
-
-BUILDLINK_TREE+=	tidy
-
-.if !defined(TIDY_BUILDLINK3_MK)
-TIDY_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.tidy+=	tidy>=5.1.25
-BUILDLINK_PKGSRCDIR.tidy?=	../../wip/tidy
-.endif # TIDY_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-tidy
diff --git a/tidy/distinfo b/tidy/distinfo
deleted file mode 100644
index f3e4668c08..0000000000
--- a/tidy/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (tidy-html5-5.1.25.tar.gz) = 2a2cd09298901c5c578253ce103e77f0755187c2
-RMD160 (tidy-html5-5.1.25.tar.gz) = 1a57a3a4975d4988e8f87aa40cfff0ca65afdb47
-SHA512 (tidy-html5-5.1.25.tar.gz) = d58757858cdc41b064e6002d30ff5a7059dca9c4a25f4f8a7cb8ffbfc175b1bddc92c0f7139660872a86024e9d96797637872bc44dda1652d13dec883be296f8
-Size (tidy-html5-5.1.25.tar.gz) = 645230 bytes
Prev by Date: doxygen-depend: fix PKGNAME to match directory name.
Next by Date: doxygen-depend: remove tidy
Previous by Thread: doxygen-depend: fix PKGNAME to match directory name.
Next by Thread: doxygen-depend: remove tidy
Indexes:
Home | Main Index | Thread Index | Old Index