diff --git a/www/tdom/Makefile b/www/tdom/Makefile index 40580b37ff36..2cdfc8a016dc 100644 --- a/www/tdom/Makefile +++ b/www/tdom/Makefile @@ -1,61 +1,60 @@ PORTNAME= tDOM -DISTVERSION= 0.9.4 +DISTVERSION= 0.9.5 CATEGORIES= www MASTER_SITES= http://tdom.org/downloads/ -DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-src +DISTNAME= ${PORTNAME:tl}-${DISTVERSION}-src MAINTAINER= ports@virtual-estates.net COMMENT= High performance processing of XML and HTML data with Tcl WWW= http://www.tdom.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= tcl:tea CONFIGURE_ARGS= --enable-threads --disable-tdomalloc EXTRACT_AFTER_ARGS= --exclude 'expat*/*.c' --exclude 'expat*/[a-mo-z]*.h' \ --exclude 'domalloc*' --exclude win -MAKE_ARGS+= RANLIB_STUB=: +MAKE_ARGS+= TESTFLAGS= TEST_TARGET= test -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= DISTVERSION=${DISTVERSION} DOCS= CHANGES README.md OPTIONS_DEFINE= DOCS HTML5 OPTIONS_DEFAULT= ${OPTIONS_DEFINE} EBASE OPTIONS_SINGLE= EXPAT OPTIONS_SINGLE_EXPAT= EBASE EPORTS EBASE_DESC= Use Expat from base EPORTS_DESC= Use Expat from ports HTML5_DESC= Enable parsing of HTML5 (requires gumbo) EBASE_CONFIGURE_ON= --with-expat=/usr EPORTS_LIB_DEPENDS= libexpat.so:textproc/expat2 EPORTS_CONFIGURE_ON= --with-expat=${LOCALBASE} HTML5_LIB_DEPENDS= libgumbo.so:devel/gumbo HTML5_USES= pkgconfig HTML5_CONFIGURE_ENABLE= html5 HTML5_CFLAGS= -I${LOCALBASE}/include post-patch-EBASE-on: ${REINPLACE_CMD} 's|\([ diff --git a/www/tdom/distinfo b/www/tdom/distinfo index 535a11f1862f..11e2cad75820 100644 --- a/www/tdom/distinfo +++ b/www/tdom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723737191 -SHA256 (tdom-0.9.4-src.tar.gz) = f947d38cbb7978ec1510e3cf894a672a4ad18cb823b8c9bb3604934ebe4c4546 -SIZE (tdom-0.9.4-src.tar.gz) = 1447298 +TIMESTAMP = 1729089057 +SHA256 (tdom-0.9.5-src.tar.gz) = ce22e3f42da9f89718688bf413b82fbf079b40252ba4dd7f2a0e752232bb67e8 +SIZE (tdom-0.9.5-src.tar.gz) = 1512934 diff --git a/www/tdom/files/patch-Makefile.in b/www/tdom/files/patch-Makefile.in deleted file mode 100644 index 6d360066ee0d..000000000000 --- a/www/tdom/files/patch-Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ ---- Makefile.in 2018-07-23 18:03:51.409385897 -0400 -+++ Makefile.in 2018-10-14 10:04:41.681243000 -0400 -@@ -114,5 +114,5 @@ - EXEEXT = @EXEEXT@ - LDFLAGS_DEFAULT = @LDFLAGS_DEFAULT@ --MAKE_LIB = @MAKE_LIB@ -+MAKE_LIB = @MAKE_LIB@ ${LDFLAGS_DEFAULT} - MAKE_SHARED_LIB = @MAKE_SHARED_LIB@ - MAKE_STATIC_LIB = @MAKE_STATIC_LIB@ diff --git a/www/tdom/files/patch-generic-dom.h b/www/tdom/files/patch-generic-dom.h index 4b5ca5a4a46b..8af052f0c01d 100644 --- a/www/tdom/files/patch-generic-dom.h +++ b/www/tdom/files/patch-generic-dom.h @@ -1,11 +1,10 @@ ---- generic/dom.h 2018-09-24 12:17:05.706742000 +0000 -+++ generic/dom.h 2024-08-15 12:03:29.000000000 -0400 -@@ -41,8 +41,7 @@ +--- generic/dom.h.orig 2024-10-22 09:14:54 UTC ++++ generic/dom.h +@@ -39,7 +39,6 @@ +----------------------------------------------------- #include #include #include -#include #include /* - * tDOM provides it's own memory allocator which is optimized for diff --git a/www/tdom/files/patch-warnings b/www/tdom/files/patch-warnings deleted file mode 100644 index 3aa70de9d035..000000000000 --- a/www/tdom/files/patch-warnings +++ /dev/null @@ -1,27 +0,0 @@ -Remove the set-but-unused variable (nHash). Pointed out by -clang... - - -mi - ---- generic/domxslt.c 2024-07-25 20:20:32.000000000 -0400 -+++ generic/domxslt.c 2024-08-15 12:08:27.351920000 -0400 -@@ -1152,5 +1152,5 @@ - char wrongFormat[] = "Unable to interpret format pattern."; - domLength l, zl, gLen; -- int i, j, k, g, nHash, nZero, fHash, fZero, isNeg; -+ int i, j, k, g, nZero, fHash, fZero, isNeg; - int prefixMinux, percentMul = 0, perMilleMul = 0; - Tcl_DString dStr, s; -@@ -1219,5 +1219,5 @@ - } - prefix1[i] = '\0'; -- nHash = nZero = fHash = fZero = 0; -+ nZero = fHash = fZero = 0; - gLen = -2222; - while (*p) { -@@ -1227,5 +1227,4 @@ - goto xsltFormatNumberError; - } -- nHash++; - } - else if (*p==df->zeroDigit) { nZero++; } diff --git a/www/tdom/pkg-plist b/www/tdom/pkg-plist index 4c332c81d4c1..be41a865f330 100644 --- a/www/tdom/pkg-plist +++ b/www/tdom/pkg-plist @@ -1,29 +1,29 @@ 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/tdom%%DISTVERSION%%/lib%%TCL_PKG_LIB_PREFIX%%tdom%%DISTVERSION%%.so +lib/tdom%%DISTVERSION%%/libtdomstub%%TCL_PKG_STUB_POSTFIX%%.a +lib/tdom%%DISTVERSION%%/pkgIndex.tcl +lib/tdom%%DISTVERSION%%/tdom.tcl lib/tdomConfig.sh share/man/mann/dom.n.gz share/man/mann/domDoc.n.gz share/man/mann/domNode.n.gz share/man/mann/expat.n.gz share/man/mann/expatapi.n.gz share/man/mann/pullparser.n.gz share/man/mann/schema.n.gz share/man/mann/tdomcmd.n.gz share/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/pullparser.html %%PORTDOCS%%%%DOCSDIR%%/html/schema.html %%PORTDOCS%%%%DOCSDIR%%/html/tdomcmd.html %%PORTDOCS%%%%DOCSDIR%%/html/tnc.html %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/README.md