From 4809de2a3544d2c111f085533116dc2b3be98ed3 Mon Sep 17 00:00:00 2001
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Thu, 5 Jun 2014 18:18:44 +0000
Subject: Upgrade to version 1.9.2.
- Add LICENSE
- Fix portlint warnings
- Use PORT_OPTIONS
---
java/jakarta-commons-beanutils/Makefile | 24 +++++++++++++---------
java/jakarta-commons-beanutils/distinfo | 4 ++--
.../files/patch-build.xml | 14 +++++++++++++
3 files changed, 30 insertions(+), 12 deletions(-)
create mode 100644 java/jakarta-commons-beanutils/files/patch-build.xml
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 6a130b178527..485ebbecc9b8 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= commons-beanutils
-PORTVERSION= 1.9.1
+PORTVERSION= 1.9.2
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_APACHE_COMMONS_SOURCE}
MASTER_SITE_SUBDIR= ${PORTNAME:S,commons-,,}
@@ -12,16 +12,18 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= olgeni@FreeBSD.org
COMMENT= JavaBeans utility library
-BUILD_DEPENDS= ${JAR_DEPENDS}
-RUN_DEPENDS= ${JAR_DEPENDS}
+LICENSE= APACHE20
-JAR_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
+BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
+ ${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+USES= dos2unix
USE_JAVA= yes
-JAVA_VERSION= 1.6+
-
USE_ANT= yes
+DOS2UNIX_FILES= build.xml
+JAVA_VERSION= 1.6+
ALL_TARGET= dist
MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
@@ -29,15 +31,17 @@ MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
JARFILE= ${PORTNAME}.jar
PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
APIDOCS= api
-OTHERDOCS= LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
+OTHERDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
PORTDOCS= ${APIDOCS} ${OTHERDOCS}
.endif
do-install:
- ${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
-.if !defined(NOPORTDOCS)
+ ${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}/{} \;
diff --git a/java/jakarta-commons-beanutils/distinfo b/java/jakarta-commons-beanutils/distinfo
index 4b56525deadd..3643d3caf32d 100644
--- a/java/jakarta-commons-beanutils/distinfo
+++ b/java/jakarta-commons-beanutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (commons-beanutils-1.9.1-src.tar.gz) = 4976daf0fd8c66d9f0ee180d28091a821a0a6a55975c25fa9990aba1a826a56f
-SIZE (commons-beanutils-1.9.1-src.tar.gz) = 393392
+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
new file mode 100644
index 000000000000..f0b270f56d93
--- /dev/null
+++ b/java/jakarta-commons-beanutils/files/patch-build.xml
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- 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>
+
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0