3 files changed, 16 insertions, 57 deletions

diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index bab75f8b5dfe..387866e35f2a 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	spread-j
-PORTVERSION=	3.17.0
-PORTREVISION=	1
+PORTVERSION=	3.17.1
 CATEGORIES=	net java
-MASTER_SITES=	http://www.roughtrade.net/distfiles/
+MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 DISTNAME=	spread-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
@@ -21,26 +20,30 @@ USE_JAVA=	1.2+
 JAVALIBDIR=	${PREFIX}/share/java/classes
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
+ANT?=		${LOCALBASE}/bin/ant
 .if defined(NOPORTDOCS)
 PLIST_SUB+=	JAVALIB_DOCS='@comment '
+ANT_TARGET=	jar
 .else
 PLIST_SUB+=	JAVALIB_DOCS=''
+ANT_TARGET=	javadocs jar
+PORTDOCS+=	html readme.txt
 .endif
+ANT_PARAMS+=	-Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/java
 PLIST_SUB+=	JAVALIBDIR=share/java/classes
-ANT?=		${LOCALBASE}/bin/ant
 
 do-build:
-	@cd ${WRKSRC} && ${ANT} javadocs jar -Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs
+	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET} ${ANT_PARAMS}
 
 do-install:
-	@cd ${WRKSRC} && ${ANT} install -Dlib.dir=${JAVALIBDIR}
+	@cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}
+.if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html
diff --git a/net/spread-j/distinfo b/net/spread-j/distinfo
index 7d7007f4bf86..46ba65c5312c 100644
--- a/net/spread-j/distinfo
+++ b/net/spread-j/distinfo
@@ -1 +1 @@
-MD5 (spread-src-3.17.0.tar.gz) = 77d927584e66cb09472f5e9a1613e274
+MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index 04f3131dbd87..0ede388ef94b 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -1,49 +1,5 @@
-%%JAVALIBDIR%%/spread-3.17.0.jar
-%%JAVALIB_DOCS%%share/doc/spread-j/html/allclasses-frame.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/deprecated-list.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/help-doc.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/index-all.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/index.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/overview-tree.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/packages.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/serialized-form.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/AdvancedMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/BasicMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/GroupID.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/MembershipInfo.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/MessageFactory.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/NULLAuth.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadAuthInterface.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadConnection.Listener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadConnection.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadException.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadGroup.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadMessage.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/SpreadVersion.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/AdvancedMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/BasicMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/GroupID.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/MembershipInfo.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/MessageFactory.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/NULLAuth.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadAuthInterface.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadConnection.Listener.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadConnection.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadException.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadGroup.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadMessage.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/class-use/SpreadVersion.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/package-frame.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/package-summary.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/package-tree.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/spread/package-use.html
-%%JAVALIB_DOCS%%share/doc/spread-j/html/stylesheet.css
-%%JAVALIB_DOCS%%share/doc/spread-j/readme.txt
-%%JAVALIB_DOCS%%@dirrm share/doc/spread-j/html/spread/class-use
-%%JAVALIB_DOCS%%@dirrm share/doc/spread-j/html/spread
-%%JAVALIB_DOCS%%@dirrm share/doc/spread-j/html
-%%JAVALIB_DOCS%%@dirrm share/doc/spread-j
-share/examples/spread-j/Flooder.java
-share/examples/spread-j/recThread.java
-share/examples/spread-j/User.java
-@dirrm share/examples/spread-j
+%%JAVALIBDIR%%/spread-3.17.1.jar
+%%PORTDOCS%%%%EXAMPLESDIR%%/Flooder.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/recThread.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/User.java
+%%PORTDOCS%%@dirrm share/examples/spread-j