diff options
| -rw-r--r-- | net/jakarta-commons-net/Makefile | 53 | ||||
| -rw-r--r-- | net/jakarta-commons-net/distinfo | 4 | ||||
| -rw-r--r-- | net/jakarta-commons-net/files/patch-TelnetClientTest.java | 18 | ||||
| -rw-r--r-- | net/jakarta-commons-net/files/patch-build.xml | 11 |
4 files changed, 16 insertions, 70 deletions
diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile index ee6e8e29df08..85806a1f818f 100644 --- a/net/jakarta-commons-net/Makefile +++ b/net/jakarta-commons-net/Makefile @@ -2,59 +2,34 @@ # $FreeBSD$ PORTNAME= commons-net -PORTVERSION= 1.4.1 -PORTREVISION= 3 +PORTVERSION= 3.4 CATEGORIES= net java -MASTER_SITES= APACHE_COMMONS_SOURCE +MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}-${PORTVERSION}-bin MAINTAINER= ports@FreeBSD.org COMMENT= Collection of network protocol implementations for Java -BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ - ${JAVAJARDIR}/jakarta-oro.jar:${PORTSDIR}/java/jakarta-oro -RUN_DEPENDS= ${JAVAJARDIR}/jakarta-oro.jar:${PORTSDIR}/java/jakarta-oro - USE_JAVA= yes JAVA_VERSION= 1.6+ -USE_ANT= yes +NO_BUILD= yes OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_ARGS= -cp ${JAVALIBDIR}/junit.jar -Dlibdir=${JAVALIBDIR} -Dnoget="" -MAKE_ENV+= LANG=C -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -.if defined(PACKAGE_BUILDING) -ALL_TARGET= dist -.else -ALL_TARGET= compile test jar dist -.endif - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= LICENSE.txt NOTICE.txt api -ALL_TARGET+= javadoc -.endif -do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar +JARFILE= ${PORTNAME}-${PORTVERSION}.jar +DESTJARFILE= ${PORTNAME}.jar +PLIST_FILES= %%JAVAJARDIR%%/${DESTJARFILE} +PORTDOCS= * - @${ECHO_MSG} " [DONE]" -.if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} -n ">> Installing documentation..." +do-install: + ${INSTALL_DATA} ${WRKSRC}/${JARFILE} \ + ${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE} @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/dist/docs && ${FIND} api \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 - @${INSTALL_DATA} ${WRKSRC}/LICENSE.txt \ - ${STAGEDIR}${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/NOTICE.txt \ - ${STAGEDIR}${DOCSDIR}/ - @${ECHO_MSG} " [DONE]" -.endif + (cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \ + RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> diff --git a/net/jakarta-commons-net/distinfo b/net/jakarta-commons-net/distinfo index ba74c007cfb9..3a17a0fd96ad 100644 --- a/net/jakarta-commons-net/distinfo +++ b/net/jakarta-commons-net/distinfo @@ -1,2 +1,2 @@ -SHA256 (commons-net-1.4.1-src.tar.gz) = fdea779f261f70b9bbec40121c830b11e3e63b6188f662f95505045ff8d44add -SIZE (commons-net-1.4.1-src.tar.gz) = 229198 +SHA256 (commons-net-3.4-bin.tar.gz) = 4c7c20ce39d4d78a05e78d76adf65c68d76e8a50fbd19d196b70d62298088c5a +SIZE (commons-net-3.4-bin.tar.gz) = 1388203 diff --git a/net/jakarta-commons-net/files/patch-TelnetClientTest.java b/net/jakarta-commons-net/files/patch-TelnetClientTest.java deleted file mode 100644 index 00446eddecdb..000000000000 --- a/net/jakarta-commons-net/files/patch-TelnetClientTest.java +++ /dev/null @@ -1,18 +0,0 @@ ---- src/test/org/apache/commons/net/telnet/TelnetClientTest.java.orig Sat Sep 30 23:40:24 2006 -+++ src/test/org/apache/commons/net/telnet/TelnetClientTest.java Sat Sep 30 23:40:36 2006 -@@ -784,7 +784,7 @@ - os1.flush(); - os1.write("A".getBytes()); - os1.flush(); -- Thread.sleep(1000); -+// Thread.sleep(1000); - InputStream instr = NOREAD.client.getInputStream(); - byte[] buff = new byte[4]; - int ret_read = 0; -@@ -879,4 +879,4 @@ - } - } - --} -\ No newline at end of file -+} diff --git a/net/jakarta-commons-net/files/patch-build.xml b/net/jakarta-commons-net/files/patch-build.xml deleted file mode 100644 index d20eae4b6931..000000000000 --- a/net/jakarta-commons-net/files/patch-build.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig Sat Nov 11 17:57:29 2006 -+++ build.xml Sat Nov 11 17:58:32 2006 -@@ -58,7 +58,7 @@ - </fileset> - </copy> - </target> -- <target name="jar" description="o Create the jar" depends="compile,test"> -+ <target name="jar" description="o Create the jar" depends="compile"> - <jar jarfile="${defaulttargetdir}/${final.name}.jar"> - <fileset dir="${classesdir}"> - <exclude name="**/examples/**"/> |