3 files changed, 31 insertions, 31 deletions

diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index 7e38271fec76..70522dc848a8 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -5,34 +5,33 @@
 # $FreeBSD$
 #
 
-PORTNAME=	spread-j
-PORTVERSION=	3.17.1
+PORTNAME=	spread
+PORTVERSION=	3.17.2
 CATEGORIES=	net java
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
-DISTNAME=	spread-src-${PORTVERSION}
+PKGNAMESUFFIX=	-j
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
 COMMENT=	Java client library for the Spread Group Communication System
 
 BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
-USE_JAVA=	1.2+
-JAVALIBDIR=	${PREFIX}/share/java/classes
+USE_JAVA=	YES
+JAVA_VERSION=	1.2+
 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
+PORTDOCS+=	java
 .endif
-ANT_PARAMS+=	-Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
+ANT_PARAMS+=	-Dlib.dir=${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/java
-PLIST_SUB+=	JAVALIBDIR=share/java/classes
+WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}/java
+PLIST_SUB+=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
 
 do-build:
 	@cd ${WRKSRC} && \
@@ -41,19 +40,19 @@ do-build:
 do-install:
 	@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}
-	${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
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread/class-use
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/html/spread
-	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/html/spread/class-use
+	${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR}/java
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java
+	${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/java
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html/spread
+	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html/spread/class-use
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/java/html
+	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/java/html
+	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/java/html/spread
+	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/java/html/spread/class-use
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net/spread-j/distinfo b/net/spread-j/distinfo
index 5c0534733595..091600afbf48 100644
--- a/net/spread-j/distinfo
+++ b/net/spread-j/distinfo
@@ -1,2 +1,2 @@
-MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4
-SIZE (spread-src-3.17.1.tar.gz) = 290861
+MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
+SIZE (spread-src-3.17.2.tar.gz) = 289180
diff --git a/net/spread-j/pkg-plist b/net/spread-j/pkg-plist
index 0ede388ef94b..a45877cac486 100644
--- a/net/spread-j/pkg-plist
+++ b/net/spread-j/pkg-plist
@@ -1,5 +1,6 @@
-%%JAVALIBDIR%%/spread-3.17.1.jar
-%%PORTDOCS%%%%EXAMPLESDIR%%/Flooder.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/recThread.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/User.java
-%%PORTDOCS%%@dirrm share/examples/spread-j
+%%JAVAJARDIR%%/%%PORTNAME%%-%%PORTVERSION%%.jar
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/Flooder.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java
+%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java
+%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true