diff --git a/java/apache-commons-beanutils/Makefile b/java/apache-commons-beanutils/Makefile index f6538aa7eed0..fa01ca178156 100644 --- a/java/apache-commons-beanutils/Makefile +++ b/java/apache-commons-beanutils/Makefile @@ -1,53 +1,50 @@ PORTNAME= commons-beanutils -PORTVERSION= 1.9.4 -PORTREVISION= 1 +PORTVERSION= 1.11.0 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE PKGNAMEPREFIX= apache- DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= olgeni@FreeBSD.org COMMENT= JavaBeans utility library WWW= https://commons.apache.org/proper/commons-beanutils/ LICENSE= APACHE20 BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \ ${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections USES= dos2unix java:ant,run DOS2UNIX_FILES= build.xml -ALL_TARGET= dist MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \ -Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar +ALL_TARGET= dist + NO_ARCH= yes JARFILE= ${PORTNAME}.jar PLIST_FILES= ${JAVAJARDIR}/${JARFILE} OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} APIDOCS= api OTHERDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt PORTDOCS= ${APIDOCS} ${OTHERDOCS} .endif -pre-build: - @${REINPLACE_CMD} -e 's!1.9.3-SNAPSHOT!${PORTVERSION}!g;' \ - ${WRKSRC}/build.xml do-install: ${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE} .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/dist/docs \ && ${FIND} ${APIDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \ && ${FIND} ${APIDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .endif .include diff --git a/java/apache-commons-beanutils/distinfo b/java/apache-commons-beanutils/distinfo index 42e49d10c4cd..72e5fdac18f8 100644 --- a/java/apache-commons-beanutils/distinfo +++ b/java/apache-commons-beanutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580359877 -SHA256 (commons-beanutils-1.9.4-src.tar.gz) = 2d46a5ac37000cad57ed338dbc5a0ae08cb924471afb5b3d4cff084afa0c728e -SIZE (commons-beanutils-1.9.4-src.tar.gz) = 412606 +TIMESTAMP = 1749284837 +SHA256 (commons-beanutils-1.11.0-src.tar.gz) = 28cace1c5f454f6b17bc7d0175aab79fe85799b4fd56b16bb4683dabd2c84cc7 +SIZE (commons-beanutils-1.11.0-src.tar.gz) = 403183 diff --git a/java/apache-commons-beanutils/files/patch-build.xml b/java/apache-commons-beanutils/files/patch-build.xml index 4c1a8929b267..a20c7da7ed87 100644 --- a/java/apache-commons-beanutils/files/patch-build.xml +++ b/java/apache-commons-beanutils/files/patch-build.xml @@ -1,15 +1,24 @@ ---- build.xml.orig 2020-11-17 15:42:56 UTC +--- build.xml.orig +++ build.xml -@@ -62,10 +62,10 @@ +@@ -42,7 +42,7 @@ + + + +- ++ + + + +@@ -61,10 +61,10 @@ - -+ ++ - -+ ++