summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MOVED1
-rw-r--r--databases/jasperreports/Makefile4
-rw-r--r--devel/apache-commons-configuration/Makefile3
-rw-r--r--java/Makefile2
-rw-r--r--java/apache-commons-beanutils/Makefile10
-rw-r--r--java/apache-commons-beanutils/distinfo5
-rw-r--r--java/apache-commons-beanutils/files/patch-build.xml11
-rw-r--r--java/apache-commons-beanutils/pkg-descr4
-rw-r--r--java/jakarta-commons-beanutils/Makefile52
-rw-r--r--java/jakarta-commons-beanutils/distinfo2
-rw-r--r--java/jakarta-commons-beanutils/files/patch-build.xml11
-rw-r--r--java/jakarta-commons-beanutils/pkg-descr5
-rw-r--r--math/scilab/Makefile4
-rw-r--r--textproc/apache-commons-digester/Makefile6
14 files changed, 23 insertions, 97 deletions
diff --git a/MOVED b/MOVED
index cc4b3d58bd98..fa88f8898eff 100644
--- a/MOVED
+++ b/MOVED
@@ -14003,3 +14003,4 @@ x11-wm/plwm||2020-01-27|Has expired: Unmaintained, uses EOLed python27
games/vegastrike-data||2020-01-27|Removed
textproc/gnome-doc-utils||2020-01-27|Abandoned upstream, Python 2.7 only
java/jakarta-commons-discovery|java/apache-commons-discovery|2020-01-29|Renamed upstream
+java/jakarta-commons-commons-beanutils|apache-commons-beanutils|2020-01-30|Renamed upstream
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
index b2e08940d543..c2df95390c2a 100644
--- a/databases/jasperreports/Makefile
+++ b/databases/jasperreports/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jasperreports
PORTVERSION= 5.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases print java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JasperReports%20${PORTVERSION}
DISTFILES= ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
@@ -17,7 +17,7 @@ RUN_DEPENDS= ${JAVALIBDIR}/itext.jar:devel/itext \
${JAVALIBDIR}/poi.jar:textproc/apache-poi \
${JAVALIBDIR}/jfreechart.jar:java/jfreechart \
${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
- ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils\
+ ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils\
${JAVALIBDIR}/commons-digester.jar:textproc/apache-commons-digester
OPTIONS_DEFINE= MYSQL PGSQL HSQLDB
diff --git a/devel/apache-commons-configuration/Makefile b/devel/apache-commons-configuration/Makefile
index 05c1c7402c9a..0392abf93372 100644
--- a/devel/apache-commons-configuration/Makefile
+++ b/devel/apache-commons-configuration/Makefile
@@ -3,6 +3,7 @@
PORTNAME= commons-configuration
PORTVERSION= 1.10
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= apache-
@@ -13,7 +14,7 @@ COMMENT= Java package for the reading of configuration/preferences files
LICENSE= APACHE20
-RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
diff --git a/java/Makefile b/java/Makefile
index 899a574dbf84..acbf1214a8f2 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -4,6 +4,7 @@
COMMENT = Java language support
SUBDIR += apache-bcel
+ SUBDIR += apache-commons-beanutils
SUBDIR += apache-commons-cli
SUBDIR += apache-commons-codec
SUBDIR += apache-commons-collections
@@ -47,7 +48,6 @@
SUBDIR += intellij-ultimate
SUBDIR += jad
SUBDIR += jai
- SUBDIR += jakarta-commons-beanutils
SUBDIR += jakarta-oro
SUBDIR += jakarta-regexp
SUBDIR += jasmin
diff --git a/java/apache-commons-beanutils/Makefile b/java/apache-commons-beanutils/Makefile
index c4205acbd512..0ecf5452689b 100644
--- a/java/apache-commons-beanutils/Makefile
+++ b/java/apache-commons-beanutils/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= commons-beanutils
-PORTVERSION= 1.9.2
-PORTREVISION= 1
+PORTVERSION= 1.9.4
CATEGORIES= java devel
MASTER_SITES= APACHE_COMMONS_SOURCE
-PKGNAMEPREFIX= jakarta-
+PKGNAMEPREFIX= apache-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= olgeni@FreeBSD.org
@@ -28,7 +27,7 @@ MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
JARFILE= ${PORTNAME}.jar
-PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES= ${JAVAJARDIR}/${JARFILE}
OPTIONS_DEFINE= DOCS
@@ -40,6 +39,9 @@ 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}
diff --git a/java/apache-commons-beanutils/distinfo b/java/apache-commons-beanutils/distinfo
index 3643d3caf32d..42e49d10c4cd 100644
--- a/java/apache-commons-beanutils/distinfo
+++ b/java/apache-commons-beanutils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (commons-beanutils-1.9.2-src.tar.gz) = 91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049
-SIZE (commons-beanutils-1.9.2-src.tar.gz) = 396910
+TIMESTAMP = 1580359877
+SHA256 (commons-beanutils-1.9.4-src.tar.gz) = 2d46a5ac37000cad57ed338dbc5a0ae08cb924471afb5b3d4cff084afa0c728e
+SIZE (commons-beanutils-1.9.4-src.tar.gz) = 412606
diff --git a/java/apache-commons-beanutils/files/patch-build.xml b/java/apache-commons-beanutils/files/patch-build.xml
deleted file mode 100644
index d0c1a0cc8b7f..000000000000
--- a/java/apache-commons-beanutils/files/patch-build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig
-+++ build.xml
-@@ -212,8 +212,6 @@
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
-- <copy file="README.txt"
-- todir="${dist.home}"/>
- <antcall target="jar"/>
- </target>
-
diff --git a/java/apache-commons-beanutils/pkg-descr b/java/apache-commons-beanutils/pkg-descr
index 678d74c184ce..cfbb33003e69 100644
--- a/java/apache-commons-beanutils/pkg-descr
+++ b/java/apache-commons-beanutils/pkg-descr
@@ -1,5 +1,7 @@
+Commons BeanUtils
+
JavaBeans utility library. It provides wrappers around getters
and setters for a property in an object for classes that conform
to the JavaBeans naming standard.
-WWW: http://jakarta.apache.org/commons/beanutils/
+WWW: http://commons.apache.org/proper/commons-beanutils/
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
deleted file mode 100644
index c4205acbd512..000000000000
--- a/java/jakarta-commons-beanutils/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# Created by: Ernst de Haan <znerd@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= commons-beanutils
-PORTVERSION= 1.9.2
-PORTREVISION= 1
-CATEGORIES= java devel
-MASTER_SITES= APACHE_COMMONS_SOURCE
-PKGNAMEPREFIX= jakarta-
-DISTNAME= ${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER= olgeni@FreeBSD.org
-COMMENT= JavaBeans utility library
-
-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
-USE_JAVA= yes
-USE_ANT= yes
-DOS2UNIX_FILES= build.xml
-ALL_TARGET= dist
-MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
- -Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
-
-JARFILE= ${PORTNAME}.jar
-PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
-
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-APIDOCS= api
-OTHERDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-PORTDOCS= ${APIDOCS} ${OTHERDOCS}
-.endif
-
-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 <bsd.port.mk>
diff --git a/java/jakarta-commons-beanutils/distinfo b/java/jakarta-commons-beanutils/distinfo
deleted file mode 100644
index 3643d3caf32d..000000000000
--- a/java/jakarta-commons-beanutils/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (commons-beanutils-1.9.2-src.tar.gz) = 91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049
-SIZE (commons-beanutils-1.9.2-src.tar.gz) = 396910
diff --git a/java/jakarta-commons-beanutils/files/patch-build.xml b/java/jakarta-commons-beanutils/files/patch-build.xml
deleted file mode 100644
index d0c1a0cc8b7f..000000000000
--- a/java/jakarta-commons-beanutils/files/patch-build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.orig
-+++ build.xml
-@@ -212,8 +212,6 @@
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
-- <copy file="README.txt"
-- todir="${dist.home}"/>
- <antcall target="jar"/>
- </target>
-
diff --git a/java/jakarta-commons-beanutils/pkg-descr b/java/jakarta-commons-beanutils/pkg-descr
deleted file mode 100644
index 678d74c184ce..000000000000
--- a/java/jakarta-commons-beanutils/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-JavaBeans utility library. It provides wrappers around getters
-and setters for a property in an object for classes that conform
-to the JavaBeans naming standard.
-
-WWW: http://jakarta.apache.org/commons/beanutils/
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index e34f7467e25f..b2cc8e18f990 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scilab
PORTVERSION= 5.5.2
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= math cad java
MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/
DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
@@ -82,7 +82,7 @@ _GUI_DEPENDS+= ${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
# Code quality:
-_GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+_GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
${JAVALIBDIR}/antlr.jar:devel/antlr \
${JAVALIBDIR}/junit4.jar:java/junit \
${LOCALBASE}/bin/splint:devel/splint
diff --git a/textproc/apache-commons-digester/Makefile b/textproc/apache-commons-digester/Makefile
index 4bc7e818f472..2b747c41f7a5 100644
--- a/textproc/apache-commons-digester/Makefile
+++ b/textproc/apache-commons-digester/Makefile
@@ -3,7 +3,7 @@
PORTNAME= commons-digester
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc java devel
MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= apache-
@@ -24,7 +24,7 @@ NO_ARCH= yes
USE_JAVA= yes
JARFILE= ${PORTNAME}.jar
-PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES= ${JAVAJARDIR}/${JARFILE}
OPTIONS_DEFINE= DOCS
@@ -33,7 +33,7 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
-JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \
${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-01 00:30:19 +0000