From nobody Wed Jan 25 21:49:47 2023 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 4P2HYl5yKGz3bXBP; Wed, 25 Jan 2023 21:49:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2HYl5QgVz44cR; Wed, 25 Jan 2023 21:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674683387; 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=Iyo8t1MYbc5/qnZNoARdQaMeK5VLveHpVe/cS67532Q=; b=pPPF1Hg2uTnvoFxoTcP3KbB00pVOa3ggUd7JROIJXvIRYtz93f7VQLlugjSJCM4NkGdHkW 7tFALfKvLKfKxXE9EyHXR5lyZ2Ejtfy7tgj3qng9MyrGYymYfE6fbaOe463Aaq3pQqbU9C wq0JyvdGWO/3v9uw/uxZRxRABaQ+RYc9OqivZ1pmhtnB1XOAUiGOE5FVrZy2tvrJef5olr 1LwQk3xFWnbVM7xShdkS1kt8kQ7BeneriAHL5EZColQ4K4Ry+akyAnv9oCah4AgnPjOCMv se0ob6aKfm2EiuhBhzqai+mA1UCig3Hy4UNd9FZkaUxP+g2CKRJzI3H4VKAWug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674683387; 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=Iyo8t1MYbc5/qnZNoARdQaMeK5VLveHpVe/cS67532Q=; b=O2O4yMqMFvh30s97X24hz75l5JydhbJKn2ots72tSMTzVypT5vYksoYfFL57VKgO68u0oP aTKtKyvBfEJJuAeWAUQRcclNNJgwPtFQomt0gx5Hrv17jir19xiqzNBQUk+zGoMdNW39TI cG93NO6wgakl/BmEb8tj8FqOf5oSEjln8/wh16Zd1jAgYKyr77+R098ziOMtRNHn5HGXUE eKEUUTskQku4bJbz9shzrDxBQTclL2MLH02fcZPDqHCabLd4VA5rCopoosAZumwGK5Hp24 6k2aEk6OznFdhmkHle5GBlrgNGItigr9eMSg7GHPefFGdC7rdoR2Jx9EpiX5oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674683387; a=rsa-sha256; cv=none; b=NJpe+G+CJ6j/gkDlcJQohJtmPrP2CUQaXWBgmrhp9eJgHM8ZGbQajLwQgmap3E6Wp/6JfG 16AvVbqWapO9KdxoIAe9iOeuRt8Syht7PD2NI0qy1yxv5giOtljHx6F1bcfPEDxmBs6pEh xHtzifBskpEV0tXPhqLHCQP8tfd8vNgrqUpHtGUNKMYf36RDHpMEEaZDk1jodHbyGS4307 n6K8oPV1vTfEMnZqUl6ABAMumQDTXPy95rZxYhUp/SzqGxoFoiJRkeT3xqKMDGzCbcq3LM emt19oj26XrrcMZCDIJAt22h3WFfR+hRkaplM/0x05txNzU0HK2e/IO1EnUeiw== 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 4P2HYl4H5sz14pP; Wed, 25 Jan 2023 21:49:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30PLnlsT021837; Wed, 25 Jan 2023 21:49:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PLnlH9021836; Wed, 25 Jan 2023 21:49:47 GMT (envelope-from git) Date: Wed, 25 Jan 2023 21:49:47 GMT Message-Id: <202301252149.30PLnlH9021836@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 32d1396682c4 - main - textproc/apache-xmlbeans: upgrade to 5.1.1 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32d1396682c41b11af9534b1e2d1d1ef2ef338b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=32d1396682c41b11af9534b1e2d1d1ef2ef338b4 commit 32d1396682c41b11af9534b1e2d1d1ef2ef338b4 Author: Thierry Thomas AuthorDate: 2023-01-25 21:45:32 +0000 Commit: Thierry Thomas CommitDate: 2023-01-25 21:49:43 +0000 textproc/apache-xmlbeans: upgrade to 5.1.1 Changelog at . --- textproc/apache-xmlbeans/Makefile | 18 +++++------------- textproc/apache-xmlbeans/distinfo | 8 +++----- textproc/apache-xmlbeans/files/patch-bin___setlib | 22 +++++++++++++--------- textproc/apache-xmlbeans/pkg-plist | 9 --------- 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/textproc/apache-xmlbeans/Makefile b/textproc/apache-xmlbeans/Makefile index ef6261642c74..6c0df4c360b4 100644 --- a/textproc/apache-xmlbeans/Makefile +++ b/textproc/apache-xmlbeans/Makefile @@ -1,12 +1,9 @@ PORTNAME= xmlbeans -PORTVERSION= 3.1.0 # Do not upgrade without checking compatibility with math/R-cran-XLConnect +DISTVERSION= 5.1.1 # Do not upgrade without checking compatibility with math/R-cran-XLConnect CATEGORIES= textproc java -MASTER_SITES= https://archive.apache.org/dist/poi/xmlbeans/release/bin/:xb \ - https://repo1.maven.org/maven2/org/apache/poi/ooxml-schemas/${SCHEMAS_VER}/:sch +MASTER_SITES= https://archive.apache.org/dist/poi/xmlbeans/release/bin/ PKGNAMEPREFIX= apache- -DISTFILES= ${PORTNAME}-bin-${PORTVERSION}${EXTRACT_SUFX}:xb \ - ooxml-schemas-${SCHEMAS_VER}.jar:sch -EXTRACT_ONLY= ${PORTNAME}-bin-${PORTVERSION}${EXTRACT_SUFX} +DISTNAME= ${PORTNAME}-bin-${PORTVERSION}-${DATE_REL} MAINTAINER= thierry@FreeBSD.org COMMENT= Java classes for XML @@ -17,7 +14,7 @@ LICENSE= APACHE20 USES= cpe tar:tgz USE_JAVA= yes JAVA_VERSION= 8+ -SCHEMAS_VER= 1.4 +DATE_REL= 20220819 CPE_VENDOR= apache WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} @@ -39,20 +36,15 @@ pre-configure: do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} \ - ${STAGEDIR}${PREFIX}/bin \ - ${STAGEDIR}${DATADIR} + ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/lib/${PORTNAME}-${PORTVERSION}.jar \ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - ${INSTALL_DATA} ${DISTDIR}/ooxml-schemas-${SCHEMAS_VER}.jar \ - ${STAGEDIR}${JAVAJARDIR}/ooxml-schemas.jar ${FIND} ${WRKSRC}/bin ! -name "*.cmd" -type f -exec \ ${INSTALL_SCRIPT} {} ${STAGEDIR}${PREFIX}/bin \; - (cd ${WRKSRC} && ${COPYTREE_SHARE} schemas ${STAGEDIR}${DATADIR}) do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${OTHERDOCS} ${STAGEDIR}${DOCSDIR}) - (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/textproc/apache-xmlbeans/distinfo b/textproc/apache-xmlbeans/distinfo index 14a1b2753d70..c734066f997c 100644 --- a/textproc/apache-xmlbeans/distinfo +++ b/textproc/apache-xmlbeans/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1651435086 -SHA256 (xmlbeans-bin-3.1.0.tgz) = abc4883f38b6147090c5995a31ec71b5c8d8207e03665acadc076c1fc21c8b32 -SIZE (xmlbeans-bin-3.1.0.tgz) = 6509656 -SHA256 (ooxml-schemas-1.4.jar) = f8256738040d66ccb677814873674c1212464e00af491e9df490fc45decbd932 -SIZE (ooxml-schemas-1.4.jar) = 16356588 +TIMESTAMP = 1674682794 +SHA256 (xmlbeans-bin-5.1.1-20220819.tgz) = 1f6a57f0ed43ad7c6971026fbf5f697a0dbb77c6447c06b22460612469553cdd +SIZE (xmlbeans-bin-5.1.1-20220819.tgz) = 23507184 diff --git a/textproc/apache-xmlbeans/files/patch-bin___setlib b/textproc/apache-xmlbeans/files/patch-bin___setlib index b7c8022ec9c4..62ef0a9b3054 100644 --- a/textproc/apache-xmlbeans/files/patch-bin___setlib +++ b/textproc/apache-xmlbeans/files/patch-bin___setlib @@ -1,20 +1,24 @@ ---- bin/_setlib.orig 2019-02-25 00:31:32 UTC +--- bin/_setlib.orig 2022-07-16 12:43:26 UTC +++ bin/_setlib -@@ -19,14 +19,10 @@ if [ -z "$XMLBEANS_HOME" ]; then +@@ -19,19 +19,12 @@ if [ -z "$XMLBEANS_HOME" ]; then XMLBEANS_HOME=`dirname $0`/.. fi -XMLBEANS_LIB= --if [ -f "$XMLBEANS_HOME"/build/lib/xbean.jar ]; then +-if ls $XMLBEANS_HOME/build/libs/xmlbeans*.jar 1> /dev/null 2>&1; then +- XMLBEANS_LIB=$XMLBEANS_HOME/build/libs +-fi +-if ls $XMLBEANS_HOME/build/lib/xmlbeans*.jar 1> /dev/null 2>&1; then - XMLBEANS_LIB=$XMLBEANS_HOME/build/lib -+if [ -f %%JAVAJARDIR%%/xmlbeans.jar ]; then -+ XMLBEANS_LIB=%%JAVAJARDIR%% - fi --if [ -f "$XMLBEANS_HOME"/lib/xbean.jar ]; then -- XMLBEANS_LIB=$XMLBEANS_HOME/lib -fi +-if ls $XMLBEANS_HOME/lib/xmlbeans*.jar 1> /dev/null 2>&1; then ++if ls %%JAVAJARDIR%%/xmlbeans.jar 1> /dev/null 2>&1; then + XMLBEANS_LIB=$XMLBEANS_HOME/lib + fi + + echo XMLBEANS_LIB=$XMLBEANS_LIB if [ -z "$XMLBEANS_LIB" ]; then -- echo "ERROR: Could not find xbean.jar, try set XMLBEANS_LIB to the directory containing xbean.jar" +- echo "ERROR: Could not find xmlbeans*.jar, try set XMLBEANS_LIB to the directory containing xmlbeans*.jar" + echo "ERROR: Could not find xmlbeans.jar, try set XMLBEANS_LIB to the directory containing xmlbeans.jar" fi diff --git a/textproc/apache-xmlbeans/pkg-plist b/textproc/apache-xmlbeans/pkg-plist index 7ec1b3fb0b1b..5b04e45f4dfc 100644 --- a/textproc/apache-xmlbeans/pkg-plist +++ b/textproc/apache-xmlbeans/pkg-plist @@ -9,13 +9,4 @@ bin/validate bin/xpretty bin/xsd2inst bin/xsdtree -bin/xstc -%%JAVAJARDIR%%/ooxml-schemas.jar %%JAVAJARDIR%%/xmlbeans.jar -%%DATADIR%%/schemas/easypo.xsd -%%DATADIR%%/schemas/easypo.xsdconfig -%%DATADIR%%/schemas/nameworld.xsd -%%DATADIR%%/schemas/numerals.xsd -%%DATADIR%%/schemas/s4s/XML.xsd -%%DATADIR%%/schemas/s4s/XMLSchema.xsd -%%PORTEXAMPLES%%@dir %%EXAMPLESDIR%%/XQueryXPath/src/org/apache/xmlbeans/samples/xquery/employees/impl