From joshua@green.shallow.net  Sat Apr  6 06:58:33 2002
Return-Path: <joshua@green.shallow.net>
Received: from green.shallow.net (c16486.smelb1.vic.optusnet.com.au [210.49.224.105])
	by hub.freebsd.org (Postfix) with ESMTP id 8379A37B419
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  6 Apr 2002 06:58:31 -0800 (PST)
Received: by green.shallow.net (Postfix, from userid 1001)
	id D7CB73EAB; Sun,  7 Apr 2002 00:37:54 +1000 (EST)
Message-Id: <20020406143754.D7CB73EAB@green.shallow.net>
Date: Sun,  7 Apr 2002 00:37:54 +1000 (EST)
From: Joshua Goodall <joshua@roughtrade.net>
Reply-To: Joshua Goodall <joshua@roughtrade.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Maintainer update: net/spread
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36814
>Category:       ports
>Synopsis:       Maintainer update: net/spread
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    znerd
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 06 07:00:05 PST 2002
>Closed-Date:    Sat Apr 13 03:03:22 PDT 2002
>Last-Modified:  Sat Apr 13 03:03:22 PDT 2002
>Originator:     Joshua Goodall
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD green.shallow.net 4.5-STABLE FreeBSD 4.5-STABLE #3: Sat Apr 6 23:01:47 EST 2002 joshua@green.shallow.net:/usr/obj/usr/src/sys/GREEN i386

>Description:
Update the net/spread port following upstream release 3.16.2

. stability fixes
. updated manpages
. use USE_JAVA
. handle jikes properly
. dtrt wrt javadoc

Committer please note: two new patchfiles (files/*.c) and need
for MASTER_SITE_LOCAL.

Joshua

>How-To-Repeat:
>Fix:


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/spread/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2 Mar 2002 16:59:29 -0000	1.5
+++ Makefile	6 Apr 2002 06:38:35 -0000
@@ -6,33 +6,30 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.16.1
+PORTVERSION=	3.16.2
 CATEGORIES=	net perl5 java
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://www.roughtrade.net/distfiles/
+#MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	petef
 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 +48,20 @@
 .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 +80,15 @@
 	${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
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/spread/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	2 Mar 2002 16:59:29 -0000	1.2
+++ distinfo	5 Apr 2002 23:45:49 -0000
@@ -1 +1 @@
-MD5 (spread-src-3.16.1.tar.gz) = 198a3eeac1a4b66800f4c857f8f40faa
+MD5 (spread-src-3.16.2.tar.gz) = b90f0b5b3ac76f20a7c09b1e0d36b3b6
Index: pkg-plist
===================================================================
RCS file: /cvs/ports/net/spread/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	2 Mar 2002 16:59:29 -0000	1.2
+++ pkg-plist	6 Apr 2002 04:52:26 -0000
@@ -38,7 +38,6 @@
 %%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
Index: files/patch-data_link.c
===================================================================
RCS file: files/patch-data_link.c
diff -N files/patch-data_link.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-data_link.c	6 Apr 2002 12:48:30 -0000
@@ -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 
Index: files/patch-session.c
===================================================================
RCS file: files/patch-session.c
diff -N files/patch-session.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-session.c	6 Apr 2002 12:48:47 -0000
@@ -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;
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->znerd 
Responsible-Changed-By: znerd 
Responsible-Changed-When: Mon Apr 8 15:31:14 PDT 2002 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36814 
State-Changed-From-To: open->closed 
State-Changed-By: znerd 
State-Changed-When: Sat Apr 13 02:46:36 PDT 2002 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36814 
>Unformatted:
