From nobody Thu Aug 15 17:00:08 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlBFN6Rcfz5STKn; Thu, 15 Aug 2024 17:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlBFN5rQvz4dNd; Thu, 15 Aug 2024 17:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723741208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMXswP/zDS7bdgtMNFAXxREB7ZNrSNuahr9YOyiCzFk=; b=vW4TIY+mbOWBV1gVrtlAmCNq6IIDMtbwOQD4SLssYm9/ztccLtisfrjQ/JjI33PdoB7GFY CBboQA7ZFn90LJ4D7LDrJs7MoVMRc3hqiHFrY0fUn2kRIgFMHe8lCfWHBoaJxB8GQNTB0L pzClGgen5tdv5CzxxL14Qzendr0nPHDF7NKqltI7OtgJdxM1pJtgfl8K/eTpeDVDfQDH0f ovDPuPZVe5adVlHFkshLUGb7V2xRtOFK69pVqisc4POS5EvmwF+JRd/HUMD/wf8uAQJ3GE GhWiB8B3oOhQRkQHlWt93KBxT3NEw4osRz3IkDJdjAGWktKtZbYVBQWnHf6Zqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723741208; a=rsa-sha256; cv=none; b=DtZkaVxz0ZvTS2KxrbeOOv65BARHy094wBrrpBD5jmH/XxreCX2OyR/uojhOzf/PDJGcu7 jOzcOy4brGBUjrs9h4BZeUyY9m9auUz/AgkcXnU++o9gmNm/J3uzwNyWQzRNSPsu6Tk9Cl rR+a5IGXr0D0GwmkjOxwHYL5A2FUjV6giM6YMLftPSO+4JfTIwFoHouWmU8BFk5CBQSNJn 6p1E6lRmP6fxi9NxFmPHIHnc5g/CjlPwTq88LalciZFF+NKLgkXHaofz8eIWQGOM+yPiw6 6RTuYauKZEVzdvMGyg+xJw/lbCbEv2j6XOqNTxshnw7KNzo0P+UUUcMICjo5Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723741208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RMXswP/zDS7bdgtMNFAXxREB7ZNrSNuahr9YOyiCzFk=; b=QsPEJtIHCrXp3QGFfvwkN1r2GMuaXOpMLQ/bE3rl1qWaL3pIFS1ICNpEwz2dF1Sut+iYjD 5TBeGBskhFX86SwwhSpmifJcXC6HjxssyAesfVDVH1V8zwtOHAo8+g/hcXY9IBRmb1PC8l crqt6sxx6M4NssyXuSj4nBVj4otXtzAgC762S68TTaL2dI7yL7dW1qMzEUGbLgEIcIgRKy 2fT4bs69J3ymQgiJmQmMuQKhahD2ibzKkyIltDHpgk1YjCBzhm6cle77ui1I03uQlMO76I /5mQSe0a5eJofjtwSyqajNsvxRRPjmnKBJMR8MGCA1QXI+iPtpv7p1Ce7pwnew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlBFN5RVwzWvs; Thu, 15 Aug 2024 17:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FH0884075737; Thu, 15 Aug 2024 17:00:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FH08oC075732; Thu, 15 Aug 2024 17:00:08 GMT (envelope-from git) Date: Thu, 15 Aug 2024 17:00:08 GMT Message-Id: <202408151700.47FH08oC075732@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: c174cd15a902 - main - www/tdom: update to 0.9.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c174cd15a902265d9387b99e32d53f574f5be571 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=c174cd15a902265d9387b99e32d53f574f5be571 commit c174cd15a902265d9387b99e32d53f574f5be571 Author: Mikhail Teterin AuthorDate: 2024-08-15 16:54:28 +0000 Commit: Zsolt Udvari 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 - -.if ${PORT_OPTIONS:MEBASE} -post-patch: - ${REINPLACE_CMD} 's|expat\.h|bsdxml.h|g' \ +post-patch-EBASE-on: + ${REINPLACE_CMD} 's|\([ 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 #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 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