From c8da5a0b2918365027727005debae1e12e2dabdd Mon Sep 17 00:00:00 2001
From: olgeni <olgeni@FreeBSD.org>
Date: Mon, 27 Jan 2014 15:37:33 +0000
Subject: Upgrade to version 1.9.1, with staging support.

---
 java/jakarta-commons-beanutils/Makefile | 18 +++++++-----------
 java/jakarta-commons-beanutils/distinfo |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'java')

diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 2716a4fdf7cd..6a130b178527 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	commons-beanutils
-PORTVERSION=	1.8.3
+PORTVERSION=	1.9.1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
@@ -28,24 +28,20 @@ MAKE_ARGS+=	-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
+
 .if !defined(NOPORTDOCS)
 APIDOCS=	api
 OTHERDOCS=	LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
 PORTDOCS=	${APIDOCS} ${OTHERDOCS}
 .endif
 
-NO_STAGE=	yes
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${JARFILE}
-	@${ECHO_MSG} " [ DONE ]"
+	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/dist/docs \
-	  && ${FIND} ${APIDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} ${APIDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
+	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
index f2650305e911..4b56525deadd 100644
--- a/java/jakarta-commons-beanutils/distinfo
+++ b/java/jakarta-commons-beanutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (commons-beanutils-1.8.3-src.tar.gz) = df6d6a625db8da38b33d018030715130a258c0b493ea39f20c5e8d075b21b4ed
-SIZE (commons-beanutils-1.8.3-src.tar.gz) = 383126
+SHA256 (commons-beanutils-1.9.1-src.tar.gz) = 4976daf0fd8c66d9f0ee180d28091a821a0a6a55975c25fa9990aba1a826a56f
+SIZE (commons-beanutils-1.9.1-src.tar.gz) = 393392
-- 
cgit