Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jan 2025 15:50:49 GMT
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c56fb5626584 - main - textproc/apache-xmlbeans: upgrade to 5.2.1
Message-ID:  <202501021550.502FonYA074925@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c56fb5626584651aaf2507c3ae9da5809c13e3c5

commit c56fb5626584651aaf2507c3ae9da5809c13e3c5
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2025-01-02 15:30:21 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2025-01-02 15:40:12 +0000

    textproc/apache-xmlbeans: upgrade to 5.2.1
    
    Release notes at
    https://dlcdn.apache.org/poi/xmlbeans/release/RELEASE-NOTES-5.2.1.txt
---
 textproc/apache-xmlbeans/Makefile                 | 16 ++++++++++------
 textproc/apache-xmlbeans/distinfo                 |  6 +++---
 textproc/apache-xmlbeans/files/patch-bin___setlib | 13 +++++++------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/textproc/apache-xmlbeans/Makefile b/textproc/apache-xmlbeans/Makefile
index 38077588039d..dad4b598b891 100644
--- a/textproc/apache-xmlbeans/Makefile
+++ b/textproc/apache-xmlbeans/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	xmlbeans
-DISTVERSION=	5.1.1 # Do not upgrade without checking compatibility with math/R-cran-XLConnect
-PORTREVISION=	1
+DISTVERSION=	5.2.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/
 PKGNAMEPREFIX=	apache-
-DISTNAME=	${PORTNAME}-bin-${PORTVERSION}-${DATE_REL}
+DISTNAME=	apache-${PORTNAME}-bin-${PORTVERSION}-${DATE_REL}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Java classes for XML
@@ -12,11 +11,16 @@ WWW=		https://xmlbeans.apache.org/
 
 LICENSE=	APACHE20
 
+RUN_DEPENDS=	apache-log4j2>0:devel/apache-log4j2	\
+		slf4j>0:devel/slf4j
+
 USES=		cpe java tar:tgz
-DATE_REL=	20220819
+DATE_REL=	20240522
 CPE_VENDOR=	apache
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+JAVA_VERSION=	11+
+
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
@@ -28,7 +32,7 @@ PORTEXAMPLES=	*
 OPTIONS_DEFINE=		DOCS EXAMPLES SAXON
 OPTIONS_DEFAULT=	SAXON
 SAXON_DESC=		Saxon XQuery processor for full XQuery and XPath support
-SAXON_RUN_DEPENDS=	saxon-he=10.6:textproc/saxon-he
+SAXON_RUN_DEPENDS=	saxon-he=12.5:textproc/saxon-he
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|'	\
diff --git a/textproc/apache-xmlbeans/distinfo b/textproc/apache-xmlbeans/distinfo
index c734066f997c..21b8ac9153b8 100644
--- a/textproc/apache-xmlbeans/distinfo
+++ b/textproc/apache-xmlbeans/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674682794
-SHA256 (xmlbeans-bin-5.1.1-20220819.tgz) = 1f6a57f0ed43ad7c6971026fbf5f697a0dbb77c6447c06b22460612469553cdd
-SIZE (xmlbeans-bin-5.1.1-20220819.tgz) = 23507184
+TIMESTAMP = 1735758437
+SHA256 (apache-xmlbeans-bin-5.2.1-20240522.tgz) = eab189b2402595f685b2eede2deb47ab8fa29dec739b47662fd523f5900133cf
+SIZE (apache-xmlbeans-bin-5.2.1-20240522.tgz) = 24006418
diff --git a/textproc/apache-xmlbeans/files/patch-bin___setlib b/textproc/apache-xmlbeans/files/patch-bin___setlib
index 62ef0a9b3054..5f13f668561b 100644
--- a/textproc/apache-xmlbeans/files/patch-bin___setlib
+++ b/textproc/apache-xmlbeans/files/patch-bin___setlib
@@ -1,20 +1,21 @@
---- bin/_setlib.orig	2022-07-16 12:43:26 UTC
+--- bin/_setlib.orig	1970-01-02 00:00:00 UTC
 +++ bin/_setlib
-@@ -19,19 +19,12 @@ if [ -z "$XMLBEANS_HOME" ]; then
+@@ -19,19 +19,12 @@ fi
      XMLBEANS_HOME=`dirname $0`/..
  fi
  
 -XMLBEANS_LIB=
 -if ls $XMLBEANS_HOME/build/libs/xmlbeans*.jar 1> /dev/null 2>&1; then
 -    XMLBEANS_LIB=$XMLBEANS_HOME/build/libs
--fi
++if ls %%JAVAJARDIR%%/xmlbeans.jar 1> /dev/null 2>&1; then
++    XMLBEANS_LIB=$XMLBEANS_HOME
+ fi
 -if ls $XMLBEANS_HOME/build/lib/xmlbeans*.jar 1> /dev/null 2>&1; then
 -    XMLBEANS_LIB=$XMLBEANS_HOME/build/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
+-    XMLBEANS_LIB=$XMLBEANS_HOME/lib
+-fi
  
  echo XMLBEANS_LIB=$XMLBEANS_LIB
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501021550.502FonYA074925>