diff -ruN /usr/ports//math/jakarta-commons-math/Makefile ./Makefile
--- /usr/ports//math/jakarta-commons-math/Makefile	2014-01-22 23:00:46.000000000 +0600
+++ ./Makefile	2014-04-20 13:42:24.162100096 +0600
@@ -3,76 +3,67 @@
 
 PORTNAME=	commons-math
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	math java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}/:source1 \
+		http://repo1.maven.org/maven2/junit/junit/4.8.2/:source2
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-math,math,}/:source1
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz:source1 \
+		junit-4.8.2.jar:source2
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tar.gz
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Java library of self-contained mathematics and statistics components
 
-BUILD_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVAJARDIR}/junit.jar:${PORTSDIR}/java/junit \
-		${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery
-RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
-		${JAVAJARDIR}/commons-discovery.jar:${PORTSDIR}/java/jakarta-commons-discovery
+LICENSE=	APACHE20
+
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
 ALL_TARGET=	jar
-MAKE_ARGS=	-Dlibdir=${WRKDIR} -Dnoget=true \
-		-Dcommons-logging.jar="file://${JAVAJARDIR}/commons-logging.jar" \
-		-Dcommons-discovery.jar="file://${JAVAJARDIR}/commons-discovery.jar"
-
-COMMONS_LOGGING_API=	${LOCALBASE}/share/doc/commons-logging/api
-.if exists(${COMMONS_LOGGING_API})
-MAKE_ARGS+=	-Dcommons-logging.api=${COMMONS_LOGGING_API}
-.endif
+MAKE_ARGS=	-Dlibdir=${WRKDIR} -Dnoget=true
 
-COMMONS_DISCOVERY_API=	${LOCALBASE}/share/doc/commons-discovery/api
-.if exists(${COMMONS_DISCOVERY_API})
-MAKE_ARGS+=	-Dcommons-logging.api=${COMMONS_DISCOVERY_API}
-.endif
+JARFILE=	${PORTNAME:S,3,,}-${PORTVERSION}.jar
+DESTJARFILE=	${PORTNAME}.jar
+PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+=	javadoc
 OTHERDOCS=	LICENSE.txt NOTICE.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 .endif
-JARFILE=	${PORTNAME}-${PORTVERSION}.jar
-DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
+JDK_API=	${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD} | ${TAIL} -n 1
 .if ${JDK_API} != ""
-MAKE_ARGS+=	-Djdk.api=${JDK_API}
+MAKE_ARGS+=	-Djdk.api=$$(${JDK_API})
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e 's#junit-#junit#g' \
-			-e 's#/usr/share/junit#${JAVAJARDIR}#g' \
-			${WRKSRC}/build.xml
+post-extract:
+	${MKDIR} ${WRKSRC}/lib
+	${CP} ${DISTDIR}/junit-4.8.2.jar ${WRKSRC}/lib/
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
 	@${ECHO_MSG} " [ DONE ]"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/target \
-	  && ${FIND} -s apidocs -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	  && ${FIND} -s apidocs -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+	  && ${FIND} -s apidocs -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
+	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports//math/jakarta-commons-math/distinfo ./distinfo
--- /usr/ports//math/jakarta-commons-math/distinfo	2014-01-22 21:30:13.000000000 +0600
+++ ./distinfo	2014-04-20 02:03:23.447989986 +0600
@@ -1,2 +1,4 @@
 SHA256 (commons-math-2.2-src.tar.gz) = a7624c3a3e2581d9905f1f1090c78c25448678bddcec2a48a4dc8a80f16ed1b8
 SIZE (commons-math-2.2-src.tar.gz) = 1321209
+SHA256 (junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e
+SIZE (junit-4.8.2.jar) = 237344
diff -ruN /usr/ports//math/jakarta-commons-math/files/patch-build.xml ./files/patch-build.xml
--- /usr/ports//math/jakarta-commons-math/files/patch-build.xml	2014-01-22 23:40:44.000000000 +0600
+++ ./files/patch-build.xml	2014-04-20 02:08:00.960970978 +0600
@@ -1,11 +1,39 @@
---- build.xml.orig	2012-03-26 01:38:37.000000000 +0600
-+++ build.xml	2012-03-26 01:38:56.000000000 +0600
-@@ -36,7 +36,7 @@
-   <!-- Junit -->
-   <property name="junit.version"           value="4.8.2"/>
-   <property name="junit.home"              value="/usr/share/junit"/>
--  <property name="junit.jar"               value="${junit.home}/junit-${junit.version}.jar"/>
-+  <property name="junit.jar"               value="${junit.home}/junit.jar"/>
+--- build.xml.bak	2014-04-19 21:14:45.345201138 +0600
++++ build.xml	2014-04-19 21:17:15.132174422 +0600
+@@ -167,7 +167,7 @@
  
+ <!-- ========== Unit Test Targets ========================================= -->
+ 
+-    <target name="compile.tests" depends="compile, download-dependencies" description="Compile unit tests.">
++    <target name="compile.tests" depends="compile" description="Compile unit tests.">
+ 
+       <javac srcdir="${test.home}"
+              destdir="${build.home}/test-classes"
+@@ -332,27 +332,5 @@
+ 
+   <target name="gump" depends="clean,test,javadoc,jar" description="Gump Target - clean,test,javadoc,jar"/>
+ 
+-
+-<!-- ========== Download Dependencies =========================================== -->
+-
+-    <target name="download-dependencies" 
+-           depends="check-availability" unless="skip.download">
+-        <echo message="doing download-dependencies..." />
+-        <antcall target="download-junit" />
+-    </target>
+-
+-    <target name="check-availability">
+-        <echo message="doing check-availability..." />
+-        <available file="${junit.jar}" property="junit.found"/>
+-    </target>
+-
+-    <target name="download-junit" unless="junit.found">
+-        <echo message="Downloading junit..."/>
+-        <mkdir dir="${download.lib.dir}" />
+-        <get dest="${download.lib.dir}/junit-${junit.version}.jar"
+-            usetimestamp="true" ignoreerrors="true"
+-            src="http://repo1.maven.org/maven2/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
+-    </target>
+-      
+ </project>
  
- <!-- ========== Component Declarations ==================================== -->