Index: branches/2015Q2/www/tidy-devel/Makefile =================================================================== --- branches/2015Q2/www/tidy-devel/Makefile (revision 389853) +++ branches/2015Q2/www/tidy-devel/Makefile (revision 389854) @@ -1,104 +1,104 @@ # Created by: Abel Chow # $FreeBSD$ PORTNAME?= tidy DISTVERSION= 090315-cvs -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} #MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \ # http://tidy.sourceforge.net/docs/:docs #MASTER_SITE_SUBDIR= . old MASTER_SITE_SUBDIR= thierry PKGNAMESUFFIX?= -devel MAINTAINER?= thierry@FreeBSD.org COMMENT?= Utility to clean up and pretty print HTML/XHTML/XML BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt USES= tar:bzip2 SLAVEDIRS= www/tidy-lib WRKSRC= ${WRKDIR}/${PORTNAME} MAKE_JOBS_UNSAFE= yes .if !defined(WITH_SHLIB) USES+= gmake PLIST_SUB= SHLIB="@comment " NSHLIB="" MAKE_ARGS+= PREFIX=${STAGEDIR}${PREFIX} CONFLICTS= tidy-20000804* tidy-lib-[0-9]* .else USES+= autoreconf libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= SHLIB="" NSHLIB="@comment " CONFLICTS= tidy-devel-[0-9]* .endif DESCR= ${.CURDIR}/pkg-descr BIN2STRIP= tidy tab2space OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} . if !defined(WITH_SHLIB) ALL_TARGET= all doc DOCFILES= quickref.html . endif DOCFILES+= Overview.html checked_by_tidy.gif faq.html grid.gif pending.html \ release-notes.html tidy.css tidy.gif .endif .if defined(MAINTAINER_MODE) CVSROOT= ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy" CVS_PASSFILE= ${WRKDIR}/temp-cvs-passfile getcvs: ${MKDIR} ${WRKDIR}/cvs ${ECHO_CMD} ${CVSROOT} A > ${CVS_PASSFILE} cd ${WRKDIR}/cvs && \ CVSROOT=${CVSROOT} CVS_PASSFILE=${CVS_PASSFILE} cvs -z3 co -P tidy tarball: ${RM} -rf ${WRKDIR}/cvs/tidy/CVSROOT ${FIND} ${WRKDIR}/cvs -name CVS | ${XARGS} ${RM} -rf cd ${WRKDIR}/cvs && \ ${TAR} cfj ${_DISTDIR}${DISTFILES} tidy .endif post-patch: ${CHMOD} a+x ${WRKSRC}/test/testxml.sh .if !defined(WITH_SHLIB) ${CP} ${WRKSRC}/build/gmake/Makefile ${WRKSRC} .else ${CP} -R -f ${WRKSRC}/build/gnuauto/* ${WRKSRC} . for t in testone.sh testaccessone.sh ${REINPLACE_CMD} -e 's|../bin/tidy|../console/tidy|' \ ${WRKSRC}/test/${t} . endfor .endif post-install: .for pgm in ${BIN2STRIP} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pgm} .endfor .if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/htmldoc/|} ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif regression-test: .for t in testaccess.sh testall.sh testxml.sh cd ${WRKSRC}/test && ./${t} .endfor .include Index: branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile (revision 389853) +++ branches/2015Q2/www/tidy-devel/files/patch-build_gmake_Makefile (revision 389854) @@ -1,33 +1,33 @@ ---- build/gmake/Makefile.orig 2008-03-22 22:13:38.000000000 +0100 -+++ build/gmake/Makefile 2008-06-21 15:52:41.000000000 +0200 -@@ -58,8 +58,8 @@ +--- build/gmake/Makefile.orig 2008-03-22 21:13:38 UTC ++++ build/gmake/Makefile +@@ -58,8 +58,8 @@ SHELL=/bin/sh 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 -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ incinst = ${devinst_prefix}/include/$(PR maninst = ${devinst_prefix}/man # Internal variables. - No spaces allowed: libtool chokes on spaces in directory names. -TOPDIR = ../.. +TOPDIR = . INCDIR = ${TOPDIR}/include APPDIR = ${TOPDIR}/console SRCDIR = ${TOPDIR}/src -@@ -90,8 +90,8 @@ +@@ -90,8 +90,8 @@ DOCDIR = ${TOPDIR}/htmldoc # CFLAGS etc.. # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1 # disabled. -CC= gcc -CFLAGS= -g -pedantic -Wall -I $(INCDIR) +#CC= gcc +CFLAGS+= -pedantic -Wall -I $(INCDIR) -fPIC # flags only supported with gcc 3.x CFLAGS += -Wunused-parameter Index: branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in (revision 389853) +++ branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_configure.in (revision 389854) @@ -1,11 +1,11 @@ ---- build/gnuauto/configure.in.orig Mon Aug 2 09:14:28 2004 -+++ build/gnuauto/configure.in Tue Aug 3 00:05:55 2004 -@@ -72,7 +72,7 @@ +--- build/gnuauto/configure.in.orig 2008-03-24 21:08:16 UTC ++++ build/gnuauto/configure.in +@@ -72,7 +72,7 @@ AC_ARG_ENABLE(debug,[ --enable-debug if test $debug_build = yes; then CFLAGS="$save_cflags -g" else - CFLAGS="-O2 $save_cflags" + CFLAGS="$save_cflags" fi # # ============================================= Index: branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am (revision 389853) +++ branches/2015Q2/www/tidy-devel/files/patch-build_gnuauto_include_Makefile.am (revision 389854) @@ -1,13 +1,13 @@ ---- build/gnuauto/include/Makefile.am.orig Sat Jan 18 15:23:43 2003 -+++ build/gnuauto/include/Makefile.am Thu Feb 20 23:42:21 2003 +--- build/gnuauto/include/Makefile.am.orig 2006-10-06 09:25:13 UTC ++++ build/gnuauto/include/Makefile.am @@ -53,8 +53,8 @@ # acknowledgment is not required but would be appreciated. # -#tidyincdir = $(includedir)/tidy -tidyincdir = $(includedir) +tidyincdir = $(includedir)/tidy +#tidyincdir = $(includedir) tidyinc_HEADERS = \ platform.h \ Index: branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c (revision 389853) +++ branches/2015Q2/www/tidy-devel/files/patch-console__tidy.c (revision 389854) @@ -1,12 +1,12 @@ ---- console/tidy.c.orig Sat Mar 6 08:59:12 2004 -+++ console/tidy.c Fri Mar 12 18:16:30 2004 -@@ -505,6 +505,9 @@ +--- console/tidy.c.orig 2008-03-22 20:53:08 UTC ++++ console/tidy.c +@@ -1031,6 +1031,9 @@ int main( int argc, char** argv ) else if ( strcasecmp(arg, "quiet") == 0 ) tidyOptSetBool( tdoc, TidyQuiet, yes ); + else if ( strcasecmp(arg, "preserve") == 0 ) /* NOOP for docproj */ + printf( errout, "Warning: tidy-devel does not honour the -preserve flag\n"); + else if ( strcasecmp(arg, "help") == 0 || strcasecmp(arg, "h") == 0 || *arg == '?' ) { Index: branches/2015Q2/www/tidy-devel/files/patch-include_platform.h =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-include_platform.h (revision 389853) +++ branches/2015Q2/www/tidy-devel/files/patch-include_platform.h (revision 389854) @@ -1,20 +1,20 @@ ---- include/platform.h.orig Sun Jan 21 21:36:21 2007 -+++ include/platform.h Sat Feb 3 17:39:40 2007 -@@ -33,7 +33,7 @@ +--- include/platform.h.orig 2008-03-17 12:57:01 UTC ++++ include/platform.h +@@ -33,7 +33,7 @@ extern "C" { It enables tidy to find config files named ~/.tidyrc if the HTML_TIDY environment variable is not set. */ -/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */ +#define TIDY_USER_CONFIG_FILE "~/.tidyrc" /* Uncomment the following #define if your -@@ -48,7 +48,7 @@ +@@ -48,7 +48,7 @@ extern "C" { Contributed by Todd Lewis. */ -/* #define SUPPORT_GETPWNAM */ +#define SUPPORT_GETPWNAM /* Enable/disable support for Big5 and Shift_JIS character encodings */ Index: branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c =================================================================== --- branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c (nonexistent) +++ branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c (revision 389854) @@ -0,0 +1,23 @@ +--- src/lexer.c.orig 2008-03-22 21:06:55 UTC ++++ src/lexer.c +@@ -3467,16 +3467,17 @@ static tmbstr ParseValue( TidyDocImpl* d + /* and prompts attributes unless --literal-attributes is set to yes */ + /* #994841 - Whitespace is removed from value attributes */ + +- if (munge && ++ /* Issue #217 from tidy-html5 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */ ++ if ((len > 0) && munge && + TY_(tmbstrcasecmp)(name, "alt") && + TY_(tmbstrcasecmp)(name, "title") && + TY_(tmbstrcasecmp)(name, "value") && + TY_(tmbstrcasecmp)(name, "prompt")) + { +- while (TY_(IsWhite)(lexer->lexbuf[start+len-1])) ++ while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0)) + --len; + +- while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len) ++ while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0)) + { + ++start; + --len; Property changes on: branches/2015Q2/www/tidy-devel/files/patch-src_lexer.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2015Q2/www/tidy-devel/pkg-plist =================================================================== --- branches/2015Q2/www/tidy-devel/pkg-plist (revision 389853) +++ branches/2015Q2/www/tidy-devel/pkg-plist (revision 389854) @@ -1,22 +1,20 @@ bin/tab2space bin/tidy include/tidy/buffio.h include/tidy/platform.h include/tidy/tidy.h include/tidy/tidyenum.h %%SHLIB%%lib/libtidy-0.99.so.0 %%SHLIB%%lib/libtidy-0.99.so.0.0.0 %%SHLIB%%lib/libtidy.so lib/libtidy.a %%NSHLIB%%man/man1/tidy.1.gz %%PORTDOCS%%%%DOCSDIR%%/Overview.html %%PORTDOCS%%%%DOCSDIR%%/checked_by_tidy.gif %%PORTDOCS%%%%DOCSDIR%%/faq.html %%PORTDOCS%%%%DOCSDIR%%/grid.gif %%PORTDOCS%%%%DOCSDIR%%/pending.html %%NSHLIB%%%%PORTDOCS%%%%DOCSDIR%%/quickref.html %%PORTDOCS%%%%DOCSDIR%%/release-notes.html %%PORTDOCS%%%%DOCSDIR%%/tidy.css %%PORTDOCS%%%%DOCSDIR%%/tidy.gif -@dirrm include/tidy -%%PORTDOCS%%@dirrm %%DOCSDIR%% Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 389853) +++ branches/2015Q2 (revision 389854) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r388849