svn commit: r509484 - head/java/jakarta-commons-dbcp

[Greg Lewis]

Author: glewis
Date: Wed Aug 21 02:01:15 2019
New Revision: 509484
URL: https://svnweb.freebsd.org/changeset/ports/509484

Log:
  Update to Apache Commons DBCP 2.7.0
  
  PR:		239984
  Approved by:	ale@ (maintainer)

Modified:
  head/java/jakarta-commons-dbcp/Makefile
  head/java/jakarta-commons-dbcp/distinfo

Modified: head/java/jakarta-commons-dbcp/Makefile
==============================================================================
--- head/java/jakarta-commons-dbcp/Makefile	Wed Aug 21 01:59:57 2019	(r509483)
+++ head/java/jakarta-commons-dbcp/Makefile	Wed Aug 21 02:01:15 2019	(r509484)
@@ -2,51 +2,46 @@
 # $FreeBSD$
 
 PORTNAME=	commons-dbcp
-PORTVERSION=	1.4
+PORTVERSION=	2.7.0
 CATEGORIES=	java databases
-MASTER_SITES=	APACHE_COMMONS_SOURCE
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}2-${PORTVERSION}-bin
 
 MAINTAINER=	ale at FreeBSD.org
-COMMENT=	The DBCP Component
+COMMENT=	Apache Commons Database Connection Pool
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:java/jakarta-commons-pool \
-		${JAVALIBDIR}/jta.jar:java/jta
-RUN_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:java/jakarta-commons-pool \
-		${JAVALIBDIR}/jta.jar:java/jta
+RUN_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:java/jakarta-commons-pool
 
 OPTIONS_DEFINE=	DOCS
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6
+JAVA_VERSION=	8
+NO_BUILD=	yes
 
-USE_ANT=	yes
-MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
-ALL_TARGET=	build-jar
+WRKSRC=		${WRKDIR}/${PORTNAME}2-${PORTVERSION}
+JARFILE=	${PORTNAME}2-${PORTVERSION}.jar
+DOCFILES=	LICENSE.txt \
+		NOTICE.txt \
+		README.txt \
+		RELEASE-NOTES.txt
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-
 PORTDOCS=	*
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
+		${JAVAJARDIR}/${JARFILE}
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+=	javadoc
-.endif
-
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
-	@${ECHO} " [ DONE ]"
+	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
+	${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 .if ${PORT_OPTIONS:MDOCS}
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/dist/docs && ${FIND} api \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
-	@${ECHO} " [ DONE ]"
+	cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}
+.for FILE in ${DOCFILES}
+	${INSTALL_MAN} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>

Modified: head/java/jakarta-commons-dbcp/distinfo
==============================================================================
--- head/java/jakarta-commons-dbcp/distinfo	Wed Aug 21 01:59:57 2019	(r509483)
+++ head/java/jakarta-commons-dbcp/distinfo	Wed Aug 21 02:01:15 2019	(r509484)
@@ -1,2 +1,3 @@
-SHA256 (commons-dbcp-1.4-src.tar.gz) = f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
-SIZE (commons-dbcp-1.4-src.tar.gz) = 932507
+TIMESTAMP = 1566283829
+SHA256 (commons-dbcp2-2.7.0-bin.tar.gz) = 35a4b7c41382a643dcfe07592f93cf58b537abdddd0778c229b7e77d0bb5053f
+SIZE (commons-dbcp2-2.7.0-bin.tar.gz) = 1869315