git: c174cd15a902 - main - www/tdom: update to 0.9.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 15 Aug 2024 17:00:08 UTC
The branch main has been updated by uzsolt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c174cd15a902265d9387b99e32d53f574f5be571
commit c174cd15a902265d9387b99e32d53f574f5be571
Author: Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2024-08-15 16:54:28 +0000
Commit: Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-08-15 16:59:08 +0000
www/tdom: update to 0.9.4
Use post-patch-EBASE-on instead of .if conditional.
Switch to DISTVERSION.
Pet portlint, portfmt.
Changelog: http://tdom.org/index.html/file?name=CHANGES&ci=trunk
PR: 280832
Approved by: submitter is maintainer
---
www/tdom/Makefile | 40 +++++++++++++++++---------------------
www/tdom/distinfo | 6 +++---
www/tdom/files/patch-generic-dom.h | 7 ++++---
www/tdom/files/patch-warnings | 27 +++++++++++++++++++++++++
www/tdom/pkg-plist | 1 +
5 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index f1ff11c490d2..40580b37ff36 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tDOM
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+DISTVERSION= 0.9.4
CATEGORIES= www
MASTER_SITES= http://tdom.org/downloads/
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}-src
@@ -15,51 +14,48 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tcl:tea
CONFIGURE_ARGS= --enable-threads --disable-tdomalloc
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-EXTRACT_AFTER_ARGS=--exclude 'expat*/*.c' --exclude 'expat*/[a-mo-z]*.h' \
- --exclude 'domalloc*' --exclude win
+EXTRACT_AFTER_ARGS= --exclude 'expat*/*.c' --exclude 'expat*/[a-mo-z]*.h' \
+ --exclude 'domalloc*' --exclude win
+MAKE_ARGS+= RANLIB_STUB=:
TEST_TARGET= test
PLIST_SUB= PORTVERSION=${PORTVERSION}
DOCS= CHANGES README.md
-OPTIONS_DEFINE= DOCS HTML5
-OPTIONS_DEFAULT=${OPTIONS_DEFINE} EBASE
-OPTIONS_SINGLE= EXPAT
+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)
-HTML5_LIB_DEPENDS=libgumbo.so:devel/gumbo
-HTML5_CONFIGURE_ENABLE=html5
-HTML5_CFLAGS= -I${LOCALBASE}/include
-HTML5_USES= pkgconfig
+EBASE_CONFIGURE_ON= --with-expat=/usr
EPORTS_LIB_DEPENDS= libexpat.so:textproc/expat2
EPORTS_CONFIGURE_ON= --with-expat=${LOCALBASE}
-EBASE_CONFIGURE_ON= --with-expat=/usr
+HTML5_LIB_DEPENDS= libgumbo.so:devel/gumbo
+HTML5_USES= pkgconfig
+HTML5_CONFIGURE_ENABLE= html5
+HTML5_CFLAGS= -I${LOCALBASE}/include
-MAKE_ARGS+= RANLIB_STUB=:
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEBASE}
-post-patch:
- ${REINPLACE_CMD} 's|expat\.h|bsdxml.h|g' \
+post-patch-EBASE-on:
+ ${REINPLACE_CMD} 's|\([</]\)expat\.h|\1bsdxml.h|g' \
${WRKSRC}/configure \
${WRKSRC}/generic/dom.h \
${WRKSRC}/generic/tdom.h \
${WRKSRC}/generic/tclexpat.h
${REINPLACE_CMD} 's|-lexpat|-lbsdxml|' ${WRKSRC}/configure
${REINPLACE_CMD} '553s|$$|knownBug} {|' ${WRKSRC}/tests/dom.test
-.endif
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/html/
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tdom0.9.4/libtdom0.9.4.so
+
.include <bsd.port.mk>
diff --git a/www/tdom/distinfo b/www/tdom/distinfo
index b51e0060dc48..535a11f1862f 100644
--- a/www/tdom/distinfo
+++ b/www/tdom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704653401
-SHA256 (tdom-0.9.3-src.tar.gz) = b46bcb6750283bcf41bd6f220cf06e7074752dc8b9a87a192bd81e53caad53f9
-SIZE (tdom-0.9.3-src.tar.gz) = 1319804
+TIMESTAMP = 1723737191
+SHA256 (tdom-0.9.4-src.tar.gz) = f947d38cbb7978ec1510e3cf894a672a4ad18cb823b8c9bb3604934ebe4c4546
+SIZE (tdom-0.9.4-src.tar.gz) = 1447298
diff --git a/www/tdom/files/patch-generic-dom.h b/www/tdom/files/patch-generic-dom.h
index 12289b8fa8a4..4b5ca5a4a46b 100644
--- a/www/tdom/files/patch-generic-dom.h
+++ b/www/tdom/files/patch-generic-dom.h
@@ -1,10 +1,11 @@
---- generic/dom.h.orig 2018-09-24 12:17:05.706742000 +0000
-+++ generic/dom.h 2018-09-24 12:17:16.003866000 +0000
-@@ -41,7 +41,6 @@
+--- 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 @@
#include <string.h>
#include <ctype.h>
#include <expat.h>
-#include <domalloc.h>
+ #include <limits.h>
/*
* 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
new file mode 100644
index 000000000000..3aa70de9d035
--- /dev/null
+++ b/www/tdom/files/patch-warnings
@@ -0,0 +1,27 @@
+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 d6eb7a7bb60f..4c332c81d4c1 100644
--- a/www/tdom/pkg-plist
+++ b/www/tdom/pkg-plist
@@ -22,6 +22,7 @@ share/man/mann/tnc.n.gz
%%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