svn commit: r524655 - in head: . databases/jasperreports devel/apache-commons-configuration java java/apache-commons-beanutils java/apache-commons-beanutils/files java/jakarta-commons-beanutils mat...

Thu Jan 30 17:53:29 UTC 2020

Author: olgeni
Date: Thu Jan 30 17:53:26 2020
New Revision: 524655
URL: https://svnweb.freebsd.org/changeset/ports/524655

Log:
  Finish migration of java/jakarta-commons-beanutils to apache-commons-beanutils.
  
  - Update to version 1.9.4
  - Pet portlint
  - Bump PORTREVISION for related dependencies
  
  PR:		243719
  Submitted by:	pfg
  Security:	CESA-2020:0194

Deleted:
  head/java/apache-commons-beanutils/files/
  head/java/jakarta-commons-beanutils/
Modified:
  head/MOVED
  head/databases/jasperreports/Makefile
  head/devel/apache-commons-configuration/Makefile
  head/java/Makefile
  head/java/apache-commons-beanutils/Makefile
  head/java/apache-commons-beanutils/distinfo   (contents, props changed)
  head/java/apache-commons-beanutils/pkg-descr
  head/math/scilab/Makefile
  head/textproc/apache-commons-digester/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/MOVED	Thu Jan 30 17:53:26 2020	(r524655)
@@ -14003,3 +14003,4 @@ x11-wm/plwm||2020-01-27|Has expired: Unmaintained, use
 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

Modified: head/databases/jasperreports/Makefile
==============================================================================
--- head/databases/jasperreports/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/databases/jasperreports/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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

Modified: head/devel/apache-commons-configuration/Makefile
==============================================================================
--- head/devel/apache-commons-configuration/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/devel/apache-commons-configuration/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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
 
 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
 

Modified: head/java/Makefile
==============================================================================
--- head/java/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/java/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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

Modified: head/java/apache-commons-beanutils/Makefile
==============================================================================
--- head/java/apache-commons-beanutils/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/java/apache-commons-beanutils/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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 at FreeBSD.org
@@ -28,7 +27,7 @@ MAKE_ARGS+=	-Dcommons-collections.jar=${JAVALIBDIR}/co
 		-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}

Modified: head/java/apache-commons-beanutils/distinfo
==============================================================================
--- head/java/apache-commons-beanutils/distinfo	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/java/apache-commons-beanutils/distinfo	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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

Modified: head/java/apache-commons-beanutils/pkg-descr
==============================================================================
--- head/java/apache-commons-beanutils/pkg-descr	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/java/apache-commons-beanutils/pkg-descr	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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/

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/math/scilab/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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.j
 		${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

Modified: head/textproc/apache-commons-digester/Makefile
==============================================================================
--- head/textproc/apache-commons-digester/Makefile	Thu Jan 30 17:01:51 2020	(r524654)
+++ head/textproc/apache-commons-digester/Makefile	Thu Jan 30 17:53:26 2020	(r524655)
@@ -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
