Index: head/www/tdom/Makefile =================================================================== --- head/www/tdom/Makefile (revision 461017) +++ head/www/tdom/Makefile (revision 461018) @@ -1,49 +1,42 @@ # Created by: Aldert Nooitgedagt # $FreeBSD$ PORTNAME= tDOM -PORTVERSION= 0.8.3 +PORTVERSION= 0.9.0 CATEGORIES= www -MASTER_SITES= GHC http://mirrors.rit.edu/zi/ +MASTER_SITES= http://tdom.org/downloads/ +DISTNAME= ${PORTNAME:tl}-${PORTVERSION} +EXTRACT_SUFX= -src.tgz MAINTAINER= mi@aldan.algebra.com -COMMENT= High performance XML data processing with Tcl (ARGS for OpenACS) +COMMENT= High performance processing of XML and HTML data with Tcl -LICENSE= MPL11 MIT -LICENSE_COMB= multi -LICENSE_FILE_MIT= ${WRKSRC}/expat/COPYING +LICENSE= MPL11 +LICENSE_FILE= ${WRKSRC}/LICENSE -TDOMBASE= ${PREFIX}/lib/tdom${PORTVERSION} - -USES= gmake tar:tgz tcl:tea -USE_GITHUB= yes +USES= gmake tcl:tea CONFIGURE_ARGS= --enable-threads --disable-tdomalloc +CONFIGURE_ARGS+=--with-expat=/usr +EXTRACT_AFTER_ARGS=--exclude 'expat*/*.c' --exclude 'expat*/[a-mo-z]*.h' \ + --exclude 'domalloc*' TEST_TARGET= test PLIST_SUB= PORTVERSION=${PORTVERSION} -DOCS= CHANGES README README.AOL -HTMLDOCS= category-index.html dom.html domDoc.html domNode.html \ - expat.html expatapi.html index.html keyword-index.html \ - tdomcmd.html tnc.html +DOCS= CHANGES README -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS HTML5 +OPTIONS_DEFAULT=${OPTIONS_DEFINE} -pre-configure: - @${RM} ${WRKSRC}/generic/domalloc.? +HTML5_DESC= Enable parsing of HTML5 (requires gumbo) +HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo +HTML5_CONFIGURE_ENABLE=html5 +HTML5_CFLAGS= -I${LOCALBASE}/include -post-install: - ${CHMOD} 755 ${STAGEDIR}${TDOMBASE} - ${CHMOD} 644 ${STAGEDIR}${TDOMBASE}/* - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/html -.for FILE in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}/${FILE} -.endfor -.for FILE in ${HTMLDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE} -.endfor + ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html/ .include Index: head/www/tdom/distinfo =================================================================== --- head/www/tdom/distinfo (revision 461017) +++ head/www/tdom/distinfo (revision 461018) @@ -1,2 +1,3 @@ -SHA256 (tDOM-0.8.3.tgz) = 496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9 -SIZE (tDOM-0.8.3.tgz) = 990367 +TIMESTAMP = 1517858044 +SHA256 (tdom-0.9.0-src.tgz) = 201e7f1b0df28b1f1921d9ec18f1ffd5a1b558c0509c54c88206b65a81ba2740 +SIZE (tdom-0.9.0-src.tgz) = 1065288 Index: head/www/tdom/files/patch-configure =================================================================== --- head/www/tdom/files/patch-configure (revision 461017) +++ head/www/tdom/files/patch-configure (nonexistent) @@ -1,37 +0,0 @@ ---- configure.orig 2007-08-15 21:40:11 UTC -+++ configure -@@ -6168,14 +6168,14 @@ extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char $ac_func (); -+void * $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ - #if defined (__stub_$ac_func) || defined (__stub___$ac_func) - choke me - #else --char (*f) () = $ac_func; -+void * (*f) () = $ac_func; - #endif - #ifdef __cplusplus - } -@@ -7261,7 +7261,7 @@ fi - CFLAGS_OPTIMIZE=-O - if test "$GCC" = "yes" ; then - CFLAGS_OPTIMIZE=-O2 -- CFLAGS_WARNING="-Wall -Wno-implicit-int" -+ CFLAGS_WARNING="-Wall -Wno-implicit-int -Wno-uninitialized" - else - CFLAGS_WARNING="" - fi -@@ -8402,7 +8402,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - # The -pthread needs to go in the CFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` - CFLAGS="$CFLAGS -pthread" -- LDFLAGS="$LDFLAGS -pthread" -+ LDFLAGS="$LDFLAGS" - fi - case $system in - FreeBSD-3.*) Property changes on: head/www/tdom/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tdom/files/patch-expat_xmlparse.c =================================================================== --- head/www/tdom/files/patch-expat_xmlparse.c (revision 461017) +++ head/www/tdom/files/patch-expat_xmlparse.c (nonexistent) @@ -1,20 +0,0 @@ ---- expat/xmlparse.c.orig 2007-07-31 00:16:28 UTC -+++ expat/xmlparse.c -@@ -1475,7 +1475,7 @@ XML_Parse(XML_Parser parser, const char - else if (bufferPtr == bufferEnd) { - const char *end; - int nLeftOver; -- enum XML_Error result; -+ enum XML_Error result = XML_STATUS_ERROR; - parseEndByteIndex += len; - positionPtr = s; - ps_finalBuffer = (XML_Bool)isFinal; -@@ -1499,6 +1499,8 @@ XML_Parse(XML_Parser parser, const char - ps_parsing = XML_FINISHED; - return result; - } -+ case XML_FINISHED: -+ /* nothing */; - } - } - Property changes on: head/www/tdom/files/patch-expat_xmlparse.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tdom/files/patch-generic-tclexpat.c =================================================================== --- head/www/tdom/files/patch-generic-tclexpat.c (revision 461017) +++ head/www/tdom/files/patch-generic-tclexpat.c (nonexistent) @@ -1,11 +0,0 @@ ---- generic/tclexpat.c.orig 2008-03-04 20:34:28 UTC -+++ generic/tclexpat.c -@@ -42,6 +42,8 @@ - - #ifdef _MSC_VER - #include -+#else -+#include /* read() and close() live there */ - #endif - - #ifdef _POSIX_SOURCE Property changes on: head/www/tdom/files/patch-generic-tclexpat.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tdom/files/patch-generic-tcldom.c =================================================================== --- head/www/tdom/files/patch-generic-tcldom.c (revision 461017) +++ head/www/tdom/files/patch-generic-tcldom.c (nonexistent) @@ -1,21 +0,0 @@ ---- generic/tcldom.c.orig 2007-12-25 23:19:02 UTC -+++ generic/tcldom.c -@@ -5915,6 +5915,9 @@ int tcldom_DomObjCmd ( - | tcldom_EvalLocked - | - \---------------------------------------------------------------------------*/ -+#if !defined(Tcl_GetErrorLine) -+#define Tcl_GetErrorLine(interp) (interp->errorLine) -+#endif - - static - int tcldom_EvalLocked ( -@@ -5934,7 +5937,7 @@ int tcldom_EvalLocked ( - if (ret == TCL_ERROR) { - char msg[64 + TCL_INTEGER_SPACE]; - sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), -- Tcl_GetString(objv[1]), interp->errorLine); -+ Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp)); - Tcl_AddErrorInfo(interp, msg); - } - Property changes on: head/www/tdom/files/patch-generic-tcldom.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/tdom/files/patch-bsdxml =================================================================== --- head/www/tdom/files/patch-bsdxml (nonexistent) +++ head/www/tdom/files/patch-bsdxml (revision 461018) @@ -0,0 +1,47 @@ +Use FreeBSD's Expat (a.k.a. bsdxml) instead of the bundled version. + + -mi + +--- configure 2017-08-24 09:59:41.657305804 -0400 ++++ configure 2018-02-05 14:36:36.444830000 -0500 +@@ -5443,8 +5443,8 @@ + ;; + *) +- if test -f "$with_expat/include/expat.h"; then ++ if test -f "$with_expat/include/bsdxml.h"; then + ac_cv_c_expat=`(cd $with_expat; pwd)` + else +- as_fn_error $? "${with_expat} directory doesn't contain expat.h" "$LINENO" 5 ++ as_fn_error $? "${with_expat} directory doesn't contain bsdxml.h" "$LINENO" 5 + fi + esac +@@ -5511,2 +5511,2 @@ + +- vars="-lexpat" ++ vars="-lbsdxml" +--- generic/dom.h 2017-08-23 10:19:33.726158496 -0400 ++++ generic/dom.h 2018-02-05 14:34:53.308599000 -0500 +@@ -39,5 +39,5 @@ + #include + #include +-#include ++#include + #include + +--- generic/tdom.h 2017-08-23 10:19:33.726158496 -0400 ++++ generic/tdom.h 2018-02-05 14:34:53.308798000 -0500 +@@ -1,5 +1,5 @@ + + #include "tcl.h" +-#include ++#include + + +--- generic/tclexpat.h 2017-08-23 10:19:33.725158500 -0400 ++++ generic/tclexpat.h 2018-02-05 14:34:53.309022000 -0500 +@@ -1,4 +1,4 @@ + #include +-#include ++#include + + struct TclGenExpatInfo; Property changes on: head/www/tdom/files/patch-bsdxml ___________________________________________________________________ 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: head/www/tdom/pkg-descr =================================================================== --- head/www/tdom/pkg-descr (revision 461017) +++ head/www/tdom/pkg-descr (revision 461018) @@ -1,11 +1,10 @@ tDOM combines high performance XML data processing with easy and powerful Tcl scripting functionality. tDOM should be one of the fastest ways to manipulate XML with a scripting language and uses very few memory (for example the DOM tree of the XML recommendation in XML (160K) needs only about 450K in memory)! Configured for OpenACS (http://openacs.org) -WWW: http://wiki.tcl.tk/1948 - http://tdom.github.com/ +WWW: http://www.tdom.org/ Index: head/www/tdom/pkg-plist =================================================================== --- head/www/tdom/pkg-plist (revision 461017) +++ head/www/tdom/pkg-plist (revision 461018) @@ -1,26 +1,25 @@ include/tdom.h lib/tdom%%PORTVERSION%%/libtdom%%PORTVERSION%%.so lib/tdom%%PORTVERSION%%/libtdomstub%%PORTVERSION%%.a lib/tdom%%PORTVERSION%%/pkgIndex.tcl lib/tdom%%PORTVERSION%%/tdom.tcl lib/tdomConfig.sh man/mann/dom.n.gz man/mann/domDoc.n.gz man/mann/domNode.n.gz man/mann/expat.n.gz man/mann/expatapi.n.gz man/mann/tdomcmd.n.gz man/mann/tnc.n.gz %%PORTDOCS%%%%DOCSDIR%%/html/category-index.html %%PORTDOCS%%%%DOCSDIR%%/html/dom.html %%PORTDOCS%%%%DOCSDIR%%/html/domDoc.html %%PORTDOCS%%%%DOCSDIR%%/html/domNode.html %%PORTDOCS%%%%DOCSDIR%%/html/expat.html %%PORTDOCS%%%%DOCSDIR%%/html/expatapi.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/keyword-index.html %%PORTDOCS%%%%DOCSDIR%%/html/tdomcmd.html %%PORTDOCS%%%%DOCSDIR%%/html/tnc.html %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.AOL