- Update to 1.8.0 [1]

- Release maintainership

Reported by:	portscout [1]

4 files changed, 8 insertions, 52 deletions

diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index a6f6a326e00c..a55db5dfa972 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	commons-beanutils
-PORTVERSION=	1.7.0
-PORTREVISION=	2
+PORTVERSION=	1.8.0
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
@@ -24,41 +23,24 @@ JAR_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-
 		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.2+
+JAVA_VERSION=	1.3+
 
 USE_ANT=	yes
 ALL_TARGET=	dist
-MAKE_ARGS+=	-Dcommons-collections.api=${COMMONS_COLLECTIONS_API} \
-		-Dcommons-logging.api=${COMMONS_LOGGING_API} \
-		-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
+MAKE_ARGS+=	-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
 		-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 .if !defined(NOPORTDOCS)
-APIDOCS=	api bean-collections
+APIDOCS=	api
 OTHERDOCS=	LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
 PORTDOCS=	${APIDOCS} ${OTHERDOCS}
 .endif
 
-COMMONS_COLLECTIONS_API=${LOCALBASE}/share/doc/commons-collections/apidocs
-COMMONS_LOGGING_API=	${LOCALBASE}/share/doc/commons-logging/api
-
-.if !defined(NOPORTDOCS)
-do-configure:
-	@if [ -d "${COMMONS_COLLECTIONS_API}" ] ; \
-	then \
-	  ${REINPLACE_CMD} -e 's,http://jakarta.apache.org/commons/collections/api/,${COMMONS_COLLECTIONS_API},' ${WRKSRC}/build.xml ; \
-	fi
-	@if [ -d "${COMMONS_LOGGING_API}" ] ; \
-	then \
-	  ${REINPLACE_CMD} -e 's,http://jakarta.apache.org/commons/logging/api/,${COMMONS_LOGGING_API},' ${WRKSRC}/build.xml ; \
-	fi
-.endif
-
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${JARFILE}
+	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${JARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
diff --git a/java/jakarta-commons-beanutils/distinfo b/java/jakarta-commons-beanutils/distinfo
index 32bac05846e8..8bb7b0d1b0fe 100644
--- a/java/jakarta-commons-beanutils/distinfo
+++ b/java/jakarta-commons-beanutils/distinfo
@@ -1,3 +1,3 @@
-MD5 (commons-beanutils-1.7.0-src.tar.gz) = 3fd5cbdf70363b151de5cd538f726e67
-SHA256 (commons-beanutils-1.7.0-src.tar.gz) = ffe3ff9208c3eb8a9c393ee244445fc1e70bb42213bee97dc86e71704fa40076
-SIZE (commons-beanutils-1.7.0-src.tar.gz) = 258835
+MD5 (commons-beanutils-1.8.0-src.tar.gz) = 1bce3cfa4ae33c94686422e78abc0792
+SHA256 (commons-beanutils-1.8.0-src.tar.gz) = aff3c8c772e4ff32f2d9a37a727a488583372e45535a3d5aad09662691851dcf
+SIZE (commons-beanutils-1.8.0-src.tar.gz) = 379586
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 2c5f3ff35b91..000000000000
--- a/java/jakarta-commons-beanutils/files/patch-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- build.xml.orig	Mon Nov 29 03:07:46 2004
-+++ build.xml	Mon Nov 29 03:09:59 2004
-@@ -214,6 +215,8 @@
-                doctitle="<h1>${component.title} (Version ${component.version})</h1>"
-             windowtitle="${component.title} (Version ${component.version})"
-                  bottom="Copyright (c) 2001-2004 - Apache Software Foundation">
-+                 <link offline="true" packagelistLoc="${commons-collections.api}" href="http://jakarta.apache.org/commons/collections/api/"/>
-+                 <link offline="true" packagelistLoc="${commons-logging.api}" href="http://jakarta.apache.org/commons/logging/api/"/>
-       <classpath refid="compile.classpath"/>
-     </javadoc>
-   </target>
diff --git a/java/jakarta-commons-beanutils/files/patch-optional-build.xml b/java/jakarta-commons-beanutils/files/patch-optional-build.xml
deleted file mode 100644
index fd1c42dce2cf..000000000000
--- a/java/jakarta-commons-beanutils/files/patch-optional-build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
---- optional/bean-collections/build.xml.orig	Mon Nov 29 03:19:19 2004
-+++ optional/bean-collections/build.xml	Mon Nov 29 03:22:15 2004
-@@ -257,6 +257,8 @@
-                doctitle="&lt;h1&gt;${component.title} (Version ${component.version})&lt;/h1&gt;"
-             windowtitle="${component.title} (Version ${component.version})"
-                  bottom="Copyright (c) 2001-2004 - Apache Software Foundation">
-+                 <link offline="true" packagelistLoc="${commons-collections.api}" href="http://jakarta.apache.org/commons/collections/api/"/>
-+                 <link offline="true" packagelistLoc="${commons-logging.api}" href="http://jakarta.apache.org/commons/logging/api/"/>
-       <classpath refid="compile.classpath"/>
-     </javadoc>
-     <copy