git: 32d1396682c4 - main - textproc/apache-xmlbeans: upgrade to 5.1.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Wed, 25 Jan 2023 21:49:47 UTC
The branch main has been updated by thierry:

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

commit 32d1396682c41b11af9534b1e2d1d1ef2ef338b4
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-01-25 21:45:32 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-01-25 21:49:43 +0000

    textproc/apache-xmlbeans: upgrade to 5.1.1
    
    Changelog at <https://xmlbeans.apache.org/status.html>.
---
 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