diff --git a/app-text/htmltidy/htmltidy-20092812.bep b/app-text/htmltidy/htmltidy-20092812.bep
index fc3f4c0f1..567430299 100644
--- a/app-text/htmltidy/htmltidy-20092812.bep
+++ b/app-text/htmltidy/htmltidy-20092812.bep
@@ -1,18 +1,16 @@
DESCRIPTION="htmltidy - Tidy the layout and correct errors in HTML and XML documents."
HOMEPAGE="http://tidy.sourceforge.net/"
-SRC_URI="http://www.haiku-ports.de/packages/app-text/htmltidy/sources/htmltidy-20092812.tar.bz2"
-CHECKSUM_MD5="c86b556da9e2447a03a090ea551c5a4a"
+SRC_URI="cvs://:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy/tidy#12/28/2009"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
+LICENSE="MIT"
+COPYRIGHT="1998-2008 World Wide Web Consortium"
BUILD {
cd htmltidy-20092812/build/gmake
make
}
-
INSTALL {
cd htmltidy-20092812/build/gmake
make installexes installhdrs installib
}
-LICENSE="MIT"
-COPYRIGHT="1998-2008 World Wide Web Consortium"
diff --git a/app-text/htmltidy/patches/htmltidy-20092812.patch b/app-text/htmltidy/patches/htmltidy-20092812.patch
index 97c6f53da..66e4c78a6 100644
--- a/app-text/htmltidy/patches/htmltidy-20092812.patch
+++ b/app-text/htmltidy/patches/htmltidy-20092812.patch
@@ -1,13 +1,13 @@
-diff -ur htmltidy-20092812/build/gmake/Makefile htmltidy-20092812-haiku/build/gmake/Makefile
---- htmltidy-20092812/build/gmake/Makefile 2009-12-29 00:06:14.000000000 -0700
-+++ htmltidy-20092812-haiku/build/gmake/Makefile 2009-12-28 23:53:45.000000000 -0700
-@@ -58,8 +58,13 @@
+diff -up htmltidy-20092812/build/gmake/Makefile.orig htmltidy-20092812/build/gmake/Makefile
+--- htmltidy-20092812/build/gmake/Makefile.orig 2008-03-22 15:13:38.035389440 -0600
++++ htmltidy-20092812/build/gmake/Makefile 2010-05-18 13:58:13.713293824 -0600
+@@ -58,8 +58,13 @@ SHELL=/bin/sh
PROJECT=tidy
# Installation variables. Spaces OK, only dir create and file copy operations.
+ifeq ($(shell uname), Haiku)
-+runinst_prefix=/boot/common
-+devinst_prefix=/boot/common
++runinst_prefix=${DESTDIR}/boot/common
++devinst_prefix=${DESTDIR}/boot/common
+else
runinst_prefix=/usr/local
devinst_prefix=/usr/local
@@ -15,7 +15,7 @@ diff -ur htmltidy-20092812/build/gmake/Makefile htmltidy-20092812-haiku/build/gm
bininst = ${runinst_prefix}/bin
libinst = ${devinst_prefix}/lib
-@@ -93,7 +98,10 @@
+@@ -93,7 +98,10 @@ DOCDIR = ${TOPDIR}/htmldoc
CC= gcc
CFLAGS= -g -pedantic -Wall -I $(INCDIR)
# flags only supported with gcc 3.x
@@ -26,10 +26,10 @@ diff -ur htmltidy-20092812/build/gmake/Makefile htmltidy-20092812-haiku/build/gm
OTHERCFLAGS=
OTHERCFLAGS+= -D_DEBUG=1
-diff -ur htmltidy-20092812/include/platform.h htmltidy-20092812-haiku/include/platform.h
---- htmltidy-20092812/include/platform.h 2009-12-29 00:06:14.000000000 -0700
-+++ htmltidy-20092812-haiku/include/platform.h 2009-12-28 23:34:23.000000000 -0700
-@@ -296,6 +296,15 @@
+diff -up htmltidy-20092812/include/platform.h.orig htmltidy-20092812/include/platform.h
+--- htmltidy-20092812/include/platform.h.orig 2008-03-17 06:57:01.048758784 -0600
++++ htmltidy-20092812/include/platform.h 2010-05-18 13:54:14.034865152 -0600
+@@ -296,6 +296,15 @@ extern "C" {
#endif
#endif
@@ -45,7 +45,7 @@ diff -ur htmltidy-20092812/include/platform.h htmltidy-20092812-haiku/include/pl
/* Convenience defines for Cygwin platforms */
#if defined(__CYGWIN__)
-@@ -417,7 +426,7 @@
+@@ -417,7 +426,7 @@ extern "C" {
#if PRESERVE_FILE_TIMES
#ifndef HAS_FUTIME
@@ -54,7 +54,7 @@ diff -ur htmltidy-20092812/include/platform.h htmltidy-20092812-haiku/include/pl
#define HAS_FUTIME 0
#else
#define HAS_FUTIME 1
-@@ -513,10 +522,10 @@
+@@ -513,10 +522,10 @@ extern "C" {
/* hack for gnu sys/types.h file which defines uint and ulong */