Update to release 3.16.2. Added stability fixes. Updated manpages.

Use USE_JAVA. Handle jikes properly. Dtrt wrt javadoc.

PR:		36814
Submitted by:	maintainer

5 files changed, 39 insertions, 18 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index cd49299de0c2..00127b0781b2 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -6,33 +6,28 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.16.1
+PORTVERSION=	3.16.2
 CATEGORIES=	net perl5 java
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	petef
+MASTER_SITES=	http://www.roughtrade.net/distfiles/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
 
-.if defined(WITH_JAVA_LIB)
-BUILD_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/javac:${PORTSDIR}/java/jdk
-.endif
-
 MAKEFILE=	FreeBSD_makefile
 
-MAN1=	spread.1
-MAN3=	SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 \
+MAN1=	spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1
+MAN3=	libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.3 \
 	SP_join.3 SP_leave.3 SP_multicast.3 SP_multigroup_multicast.3 \
 	SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 \
 	SP_scat_multicast.3 SP_scat_receive.3
 
+.if defined(WITH_JAVA_LIB)
+USE_JAVA=	1.2+
+.endif
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 PKGMESSAGE=	${WRKSRC}/license.txt
 
-JDK_VERSION?=    1.1.8
-JAVASUBDIR=	jdk${JDK_VERSION}
-JAVADIR=	${PREFIX}/${JAVASUBDIR}
 JAVALIBDIR=	${PREFIX}/share/java/classes
 
 .if defined(WITH_JAVA_LIB)
@@ -51,15 +46,20 @@ MAKE_ARGS+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 .include <bsd.port.pre.mk>
 
 post-patch:
-.for f in configuration.c auth-ip.c auth-pword.c docs/spread.1 docs/spmonitor.1
+.for f in configuration.c auth-ip.c auth-pword.c docs/spread.1 \
+	docs/spmonitor.1 Readme.txt
 	@${PERL} -pi -e 's,/etc/spread,${PREFIX}/etc/spread,g' ${WRKSRC}/${f}
 .endfor
 
 post-build:
 	(cd ${WRKSRC}/perl/Spread; ${PERL} Makefile.PL; ${MAKE})
 .if defined(WITH_JAVA_LIB)
-	(cd ${WRKSRC}/java; ${JAVADIR}/bin/javac \
-	splib_src/*.java -d ./)
+	(cd ${WRKSRC}/java; CLASSPATH=${JAVA_CLASSES} ${JAVAC} spread/*.java -d ./)
+.if !defined(NOPORTDOCS)
+	(cd ${WRKSRC}/java; ${MKDIR} docs; \
+	${JAVADOC} -sourcepath spread/ -verbose -windowtitle 'Spread for Java' \
+		-nodeprecated -d docs/ spread/*.java)
+.endif
 .endif
 
 pre-install:
@@ -78,13 +78,15 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sp_events.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${PREFIX}/etc/spread.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${PREFIX}/etc/spread.access_ip.sample
-	${INSTALL_MAN} ${WRKSRC}/docs/spread.1 ${PREFIX}/man/man1
 	(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
 	${GZIP_CMD} ${GZIP} ${LOCALBASE}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
 .if defined(WITH_JAVA_LIB)
 	${INSTALL} -d -o root -g wheel -m 0755 ${JAVALIBDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/java/spread/*.class ${JAVALIBDIR}/${PORTNAME}
 .endif
+.for f in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${PREFIX}/man/man1
+.endfor
 .for f in ${MAN3}
 	${INSTALL_MAN} ${WRKSRC}/docs/${f} ${PREFIX}/man/man3
 .endfor
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 9ecb870013ad..3f99c804ac8b 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1 +1 @@
-MD5 (spread-src-3.16.1.tar.gz) = 198a3eeac1a4b66800f4c857f8f40faa
+MD5 (spread-src-3.16.2.tar.gz) = b90f0b5b3ac76f20a7c09b1e0d36b3b6
diff --git a/net/spread/files/patch-data_link.c b/net/spread/files/patch-data_link.c
new file mode 100644
index 000000000000..1fc8a9e1a1d7
--- /dev/null
+++ b/net/spread/files/patch-data_link.c
@@ -0,0 +1,10 @@
+--- data_link.c.orig	Sat Apr  6 22:45:23 2002
++++ data_link.c	Sat Apr  6 22:48:01 2002
+@@ -93,6 +93,7 @@
+ 	{
+         	soc_addr.sin_family    	= AF_INET;
+         	soc_addr.sin_port	= htons(port);
++		bzero(&soc_addr.sin_zero, sizeof(soc_addr.sin_zero));
+                 if (interface_address == 0)
+                         soc_addr.sin_addr.s_addr= INADDR_ANY;
+                 else 
diff --git a/net/spread/files/patch-session.c b/net/spread/files/patch-session.c
new file mode 100644
index 000000000000..102709d6a9f4
--- /dev/null
+++ b/net/spread/files/patch-session.c
@@ -0,0 +1,10 @@
+--- session.c.orig	Sat Apr  6 22:47:26 2002
++++ session.c	Sat Apr  6 22:47:42 2002
+@@ -347,6 +347,7 @@
+ 
+ 	/* Initiation of the INET socket */
+ 
++	bzero(&inet_addr.sin_zero, sizeof(inet_addr.sin_zero));
+ 	inet_addr.sin_family	= AF_INET;
+ 	inet_addr.sin_port	= htons(port);
+         Accept_inet_mbox_num = 0;
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index f6d3a8d273ac..0804b37b7049 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -38,7 +38,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
 %%JAVALIB_DOCS%%share/doc/spread/java/html/help-doc.html
 %%JAVALIB_DOCS%%share/doc/spread/java/html/index-all.html
 %%JAVALIB_DOCS%%share/doc/spread/java/html/index.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/java.html
 %%JAVALIB_DOCS%%share/doc/spread/java/html/overview-tree.html
 %%JAVALIB_DOCS%%share/doc/spread/java/html/packages.html
 %%JAVALIB_DOCS%%share/doc/spread/java/html/serialized-form.html