3 files changed, 13 insertions, 60 deletions

diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile
index 24ca86ad38cf..a041cb61c0aa 100644
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/jakarta-commons-dbutils/Makefile
@@ -2,44 +2,40 @@
 # $FreeBSD$
 
 PORTNAME=	commons-dbutils
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.6
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JDBC helper library
 
-BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_ANT=	yes
+NO_BUILD=	yes
 
-ALL_TARGET=	dist
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	LICENSE.txt api
-
-post-patch:
-	${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/build.xml
+PORTDOCS=	*
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/dist/commons-dbutils-1.1.jar \
+	${INSTALL_DATA} ${WRKSRC}/commons-dbutils-1.6.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [DONE]"
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/dist/docs && ${FIND} api \
+	@cd ${WRKSRC}/apidocs && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
-	@${INSTALL_DATA} ${WRKSRC}/dist/LICENSE.txt \
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt \
 		${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} " [DONE]"
 
diff --git a/databases/jakarta-commons-dbutils/distinfo b/databases/jakarta-commons-dbutils/distinfo
index f86b10f53cad..c1755a045ff5 100644
--- a/databases/jakarta-commons-dbutils/distinfo
+++ b/databases/jakarta-commons-dbutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (commons-dbutils-1.1-src.tar.gz) = 645f79936bb90c5ed02fd4d1ddbc15b23e22a468ab0df22771f2b78fe8d49a59
-SIZE (commons-dbutils-1.1-src.tar.gz) = 60062
+SHA256 (commons-dbutils-1.6-bin.tar.gz) = 9050f29ca14a8967f34360d06919a55e7a151e38502131fae492709d0bb93580
+SIZE (commons-dbutils-1.6-bin.tar.gz) = 567770
diff --git a/databases/jakarta-commons-dbutils/files/patch-build.xml b/databases/jakarta-commons-dbutils/files/patch-build.xml
deleted file mode 100644
index ce9260c3b4d0..000000000000
--- a/databases/jakarta-commons-dbutils/files/patch-build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
---- build.xml.orig	2008-09-10 14:27:27.000000000 +0200
-+++ build.xml	2008-09-10 14:28:28.000000000 +0200
-@@ -24,7 +24,7 @@
- <project default="jar" name="commons-dbutils" basedir=".">
-   <property name="defaulttargetdir" value="target">
-   </property>
--  <property name="libdir" value="target/lib">
-+  <property name="libdir" value="%%JAVALIBDIR%%">
-   </property>
-   <property name="classesdir" value="target/classes">
-   </property>
-@@ -39,14 +39,12 @@
-   <property name="final.name" value="commons-dbutils-1.1">
-   </property>
-   <target name="init" description="o Initializes some properties">
--    <mkdir dir="${libdir}">
--    </mkdir>
-     <condition property="noget">
-       <equals arg2="only" arg1="${build.sysclasspath}">
-       </equals>
-     </condition>
-   </target>
--  <target name="compile" description="o Compile the code" depends="get-deps">
-+  <target name="compile" description="o Compile the code">
-     <mkdir dir="${classesdir}">
-     </mkdir>
-     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -152,15 +150,4 @@
-       </classpath>
-     </javadoc>
-   </target>
--  <target name="get-deps" unless="noget" depends="init">
--    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
--    </get>
--    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
--    </get>
--    <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
--    </get>
--    <echo message="Pay no attention if there is a subsequent warning if building under JDK 1.4+"/>
--    <copy file="lib/jdbc2_0-stdext.jar" todir="${libdir}" failonerror="false">
--    </copy>
--  </target>
- </project>