Subject: Re: pkg/31220: Update of www/tidy to 050826
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Jeroen Ruigrok/asmodai <asmodai@in-nomine.org>
List: pkgsrc-bugs
Date: 10/04/2005 13:52:02
The following reply was made to PR pkg/31220; it has been noted by GNATS.
From: Jeroen Ruigrok/asmodai <asmodai@in-nomine.org>
To: gnats-bugs@netbsd.org
Cc:
Subject: Re: pkg/31220: Update of www/tidy to 050826
Date: Tue, 4 Oct 2005 15:51:46 +0200
--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
And a patchset attached to update to 20050921.
--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
Free Tibet! http://www.savetibet.org/ | http://www.andf.info/
http://www.tendra.org/ | http://www.in-nomine.org/ | catcher@in-nomine.org
We never know the worth of water, 'till the well is dry...
--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="tidy.diff"
Index: www/tidy/Makefile
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/www/tidy/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- www/tidy/Makefile 22 May 2005 20:08:46 -0000 1.19
+++ www/tidy/Makefile 4 Oct 2005 13:06:43 -0000
@@ -1,20 +1,21 @@
# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:46 jlam Exp $
#
-DISTNAME= tidy_src_040811
-PKGNAME= tidy-20040811
-PKGREVISION= 1
+DISTNAME= tidy_src_050921
+PKGNAME= tidy-20050921
CATEGORIES= www
MASTER_SITES= http://tidy.sourceforge.net/src/ \
- http://tidy.sourceforge.net/docs/ \
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_040810${EXTRACT_SUFX}
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} tidy_docs_050705${EXTRACT_SUFX}
-MAINTAINER= tech-pkg@NetBSD.org
+MAINTAINER= asmodai@in-nomine.org
HOMEPAGE= http://tidy.sourceforge.net/
COMMENT= Fixes and tidies up HTML files
+BUILD_DEPENDS= libxslt>=1.1.0:../../textproc/libxslt
+
WRKSRC= ${WRKDIR}/tidy
NO_CONFIGURE= yes
USE_TOOLS+= gmake
@@ -23,18 +24,21 @@
OPSYSVARS+= MAKEFLAGS
MAKEFLAGS.Darwin+= RANLIB=ranlib
-HTML_DOCFILES= Overview.html doxygen.cfg grid.gif quickref.html tidy.css \
+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
+post-build:
+ cd ${BUILD_DIRS} && ${GMAKE} doc
+
post-install:
${INSTALL_DATA_DIR} ${HTML_DOCDIR}
- for doc in ${HTML_DOCFILES}; do \
+ 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 ; \
+ for apifile in ${WRKSRC}/htmldoc/api/* ; do \
+ ${INSTALL_DATA} $$apifile ${HTML_DOCDIR}/api ; \
done
.include "../../mk/bsd.pkg.mk"
Index: www/tidy/distinfo
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/www/tidy/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- www/tidy/distinfo 24 Feb 2005 14:08:39 -0000 1.9
+++ www/tidy/distinfo 4 Oct 2005 13:07:00 -0000
@@ -1,10 +1,11 @@
$NetBSD: distinfo,v 1.9 2005/02/24 14:08:39 wiz Exp $
-SHA1 (tidy_src_040811.tgz) = c3f72c7200ea2ef05d46c882e25ad015e12bfa26
-RMD160 (tidy_src_040811.tgz) = 4b4ccc6329dd9f6eb9495442a6c10481f1317dd2
-Size (tidy_src_040811.tgz) = 244076 bytes
-SHA1 (tidy_docs_040810.tgz) = c8665ede43f58d1b4dad5921f0b520ec863eb416
-RMD160 (tidy_docs_040810.tgz) = 65f31c49074098e7bd071ef693bd9399693c17a9
-Size (tidy_docs_040810.tgz) = 153044 bytes
-SHA1 (patch-ab) = 6d44dbc78bed849997108fe6bb5ff41088f653a3
-SHA1 (patch-ac) = 93e397595652a697bb705444f2923453818d1dde
+SHA1 (tidy_src_050921.tgz) = 4a53aa129e2575004dcbaf0cf4c5c3f1637723b0
+RMD160 (tidy_src_050921.tgz) = 958f532245412e3f8ac5bdd56edc5693cadf4b5b
+Size (tidy_src_050921.tgz) = 256079 bytes
+SHA1 (tidy_docs_050705.tgz) = b243d7910ce2fe57a8df27ff8f775e6d397c732d
+RMD160 (tidy_docs_050705.tgz) = 49b8c2eaf87a0291b1bef6479cf1eeda6b720f52
+Size (tidy_docs_050705.tgz) = 150359 bytes
+SHA1 (patch-aa) = e27b9b82ee47b9b54004c4a4a5bccba944847040
+SHA1 (patch-ab) = b243b9021f922e123b18a79566923a57d904b0d3
+SHA1 (patch-ac) = acc5e591182217a8cb7555c02e6954b7ceb60987
Index: www/tidy/patches/patch-ab
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/www/tidy/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- www/tidy/patches/patch-ab 30 Aug 2004 18:48:57 -0000 1.5
+++ www/tidy/patches/patch-ab 8 Sep 2005 13:56:37 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2004/08/30 18:48:57 reed Exp $
+$NetBSD$
---- include/platform.h.orig Fri Mar 19 00:00:57 2004
-+++ include/platform.h Sat Aug 28 15:41:12 2004
+--- 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.
*/
@@ -11,7 +11,22 @@
/* Enable/disable support for Big5 and Shift_JIS character encodings */
-@@ -497,7 +497,7 @@
+@@ -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
Index: www/tidy/patches/patch-ac
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/www/tidy/patches/patch-ac,v
retrieving revision 1.1
diff -u -r1.1 patch-ac
--- www/tidy/patches/patch-ac 28 Oct 2003 12:34:58 -0000 1.1
+++ www/tidy/patches/patch-ac 8 Sep 2005 13:56:37 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/10/28 12:34:58 cube Exp $
+$NetBSD$
---- build/gmake/Makefile.orig 2003-04-12 08:57:03.000000000 +0200
-+++ build/gmake/Makefile
-@@ -58,8 +58,8 @@ SHELL=/bin/sh
+--- build/gmake/Makefile.orig 2005-05-03 08:58:08.000000000 +0200
++++ build/gmake/Makefile 2005-07-03 14:56:45.000000000 +0200
+@@ -58,8 +58,8 @@
PROJECT=tidy
# Installation variables. Spaces OK, only dir create and file copy operations.
@@ -13,34 +13,43 @@
bininst = ${runinst_prefix}/bin
libinst = ${devinst_prefix}/lib
-@@ -76,7 +76,7 @@ LIBDIR = ${TOPDIR}/lib
- BINDIR = ${TOPDIR}/bin
-
+@@ -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= -Wall -Wno-switch -Wno-parentheses -Wno-unused -I $(INCDIR)
-
- # OTHERCFLAGS= -DSUPPORT_ACCESSIBILITY_CHECKS=1 -DSUPPORT_UTF16_ENCODINGS=1 -DSUPPORT_ASIAN_ENCODINGS=1
-@@ -107,7 +107,7 @@ LIBPREFIX = lib
- LIBSUFFIX = .a
++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
- EXES = $(BINDIR)/$(PROJECT) $(BINDIR)/tab2space
+ XSLTPROC = xsltproc
-@@ -148,7 +148,7 @@ all: $(LIBRARY) $(EXES)
+@@ -164,7 +164,7 @@
$(LIBRARY): $(OBJFILES)
if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi
- $(AR) $@ $(OBJFILES)
+ $(AR) -r $@ $(OBJFILES)
ifdef RANLIB
- $(RANLIB) $@
+ $(RANLIB) $@
endif
-@@ -177,21 +177,21 @@ clean:
+@@ -205,19 +205,19 @@
if [ "$(BINDIR)" != "$(TOPDIR)" -a -d $(BINDIR) ]; then rmdir $(BINDIR); fi
installhdrs: $(HFILES)
@@ -61,12 +70,10 @@
+ if [ ! -d "$(bininst)" ]; then $(BSD_INSTALL_PROGRAM_DIR) "$(bininst)"; fi
+ $(BSD_INSTALL_PROGRAM) $(EXES) "$(bininst)/"
- installmanpage:
- if [ -f "$(TOPDIR)/htmldoc/man_page.txt" ] ; then \
-- if [ ! -d "$(maninst)/man1" ]; then mkdir -p "$(maninst)/man1"; fi; \
-- cp -f $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \
-+ if [ ! -d "$(maninst)/man1" ]; then $(BSD_INSTALL_MAN_DIR) "$(maninst)/man1"; fi; \
-+ $(BSD_INSTALL_MAN) $(TOPDIR)/htmldoc/man_page.txt "$(maninst)/man1/tidy.1"; \
- fi
-
+ 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
--FCuugMFkClbJLl1L--