14 files changed, 233 insertions, 192 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index fae76fd953e1..debaef0669d7 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	spread
-PORTVERSION=	3.16.2
-CATEGORIES=	net perl5 java
-MASTER_SITES=	http://www.roughtrade.net/distfiles/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+PORTVERSION=	3.17.0
+PORTREVISION=	1
+CATEGORIES=	net perl5
+MASTER_SITES=	# fetch manually
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	joshua@roughtrade.net
 
-MAKEFILE=	FreeBSD_makefile
+GNU_CONFIGURE=	yes
 
 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 \
@@ -24,59 +22,31 @@ MAN3=	libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 SP_error.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+
-NEED_JAVAC=	YES
-.endif
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 PKGMESSAGE=	${WRKSRC}/license.txt
 
-JAVALIBDIR=	${PREFIX}/share/java/classes
-
-.if defined(WITH_JAVA_LIB)
-PLIST_SUB+=	JAVALIB='' JAVALIBDIR=share/java/classes
-.if defined(NOPORTDOCS)
-PLIST_SUB+=	JAVALIB_DOCS='@comment '
-.else
-PLIST_SUB+=	JAVALIB_DOCS=''
-.endif
-.else
-PLIST_SUB+=	JAVALIB='@comment ' JAVALIB_DOCS='@comment ' JAVALIBDIR=''
-.endif
-
 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 Readme.txt
-	@${PERL} -pi -e 's,/etc/spread,${PREFIX}/etc/spread,g' ${WRKSRC}/${f}
-.endfor
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+IGNORE=         May not be automatically fetched due to licensin restrictions.\
+		You MUST manually fetch the version after reading\
+		and agreeing to the license at:\
+		http://www.cnds.jhu.edu/download/download_spread.cgi\
+		Once it has been downloaded, move it to ${DISTDIR}\
+		and restart this build.
+.endif
 
 post-build:
 	(cd ${WRKSRC}/perl/Spread; ${PERL} Makefile.PL; ${MAKE})
-.if defined(WITH_JAVA_LIB)
-	(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:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/spread ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/spflooder ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/spmonitor ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/spuser ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/sptuser ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libsp.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/libtsp.a ${PREFIX}/lib
+post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh.sample
 	${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/sp_events.h ${PREFIX}/include
@@ -84,16 +54,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${PREFIX}/etc/spread.access_ip.sample
 	(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
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
@@ -101,22 +61,8 @@ do-install:
 	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/perl
 	${INSTALL_DATA} ${WRKSRC}/perl/Spread/README ${DOCSDIR}/perl
 	${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${DOCSDIR}/perl
-.if defined(WITH_JAVA_LIB)
-	${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java
-	${INSTALL_DATA} ${WRKSRC}/java/readme.txt ${DOCSDIR}/java
-	${INSTALL_DATA} ${WRKSRC}/java/recThread.java ${DOCSDIR}/java
-	${INSTALL_DATA} ${WRKSRC}/java/Flooder.java ${DOCSDIR}/java
-	${INSTALL_DATA} ${WRKSRC}/java/User.java ${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_DATA} ${WRKSRC}/java/docs/*.html ${DOCSDIR}/java/html
-	${INSTALL_DATA} ${WRKSRC}/java/docs/stylesheet.css ${DOCSDIR}/java/html
-	${INSTALL_DATA} ${WRKSRC}/java/docs/spread/*.html ${DOCSDIR}/java/html/spread
-.endif
 .endif
 	@${CAT} ${PKGMESSAGE}
-
-post-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 3f99c804ac8b..7d7007f4bf86 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1 +1 @@
-MD5 (spread-src-3.16.2.tar.gz) = b90f0b5b3ac76f20a7c09b1e0d36b3b6
+MD5 (spread-src-3.17.0.tar.gz) = 77d927584e66cb09472f5e9a1613e274
diff --git a/net/spread/files/patch-FreeBSD_makefile b/net/spread/files/patch-FreeBSD_makefile
deleted file mode 100644
index cbc4f76a9964..000000000000
--- a/net/spread/files/patch-FreeBSD_makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- FreeBSD_makefile.orig	Wed Aug 22 00:28:21 2001
-+++ FreeBSD_makefile	Thu Feb 28 23:27:26 2002
-@@ -1,4 +1,3 @@
--CC=gcc
- MAKEFILE=FreeBSD_makefile
- YACC = bison -y
- LEX = flex
-@@ -8,8 +7,8 @@
- #SRCDIRS= dir1 dir2
- #INCL=$(SRCDIRS:%=-I%)
- #CFLAGS =  -O does not always work on BSDI pc
--CFLAGS = -ansi -c -Wall -O3
--TCFLAGS = $(CFLAGS) -pthread
-+CFLAGS += -ansi -c
-+TCFLAGS = $(CFLAGS) $(PTHREAD_LIBS)
- 
- COBJS = lex.yy.o y.tab.o configuration.o skiplist.o acm.o 
- OBJS =  alarm.o events.o memory.o membership.o data_link.o network.o status.o log.o flow_control.o message.o acp-permit.o auth-null.o auth-ip.o
-@@ -30,7 +29,7 @@
- 	$(CC) -o spuser user.o libsp.a
- 
- sptuser : user.to libtsp.a 
--	$(CC) -pthread -o sptuser user.to libtsp.a
-+	$(CC) $(PTHREAD_LIBS) -o sptuser user.to libtsp.a
- 
- simple_user : simple_user.o libsp.a
- 	$(CC) -o simple_user simple_user.o libsp.a 
-@@ -78,7 +77,7 @@
- 	$(CC) $(TCFLAGS) -fPIC -D_REENTRANT $*.c -o $*.tlo
- 
- .c.to:	
--	$(CC) $(TCFLAGS) -D_THREAD_SAFE -D_REENTRANT $*.c -o $*.to
-+	$(CC) $(TCFLAGS) $(PTHREAD_CFLAGS) -D_REENTRANT $*.c -o $*.to
- 
- depend:
- 	cp $(MAKEFILE) $(MAKEFILE).bak \
diff --git a/net/spread/files/patch-Makefile.in b/net/spread/files/patch-Makefile.in
new file mode 100644
index 000000000000..bf659c926b1c
--- /dev/null
+++ b/net/spread/files/patch-Makefile.in
@@ -0,0 +1,96 @@
+--- Makefile.in.orig	Sat Sep 28 08:38:59 2002
++++ Makefile.in	Wed Nov  6 07:41:33 2002
+@@ -25,7 +25,7 @@
+ #Rules: major  -- inc for incompatible change
+ #     : minor  -- inc for bugfix or forward compatible change
+ 
+-LIBVERSION=1.0
++LIBVERSION=1
+ 
+ PATHS= 
+ 
+@@ -34,7 +34,7 @@
+ CFLAGS=@CFLAGS@
+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
+ LDFLAGS=@LDFLAGS@
+-LIBS=@LIBS@
++LIBS=-L. @LIBS@
+ THLDFLAGS=@THLDFLAGS@
+ THLIBS=@THLIBS@
+ AR=@AR@
+@@ -51,8 +51,10 @@
+ PERL=@PERL@
+ ENT=@ENT@
+ EXEEXT=@EXEEXT@
++SHLDSONAME=-Wl,-soname,libspread.so.$(LIBVERSION)
++TSHLDSONAME=-Wl,-soname,libtspread.so.$(LIBVERSION)
+ 
+-TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@
++TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@ libspread.a libtspread.a
+ 
+ LIBSP_OBJS= alarm.o events.o memory.o sp.o
+ 
+@@ -123,8 +125,11 @@
+ 	$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
+ 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.$(LIBVERSION).dylib libspread.dylib)
+ 
+-libspread.so:	$(LIBSP_SHOBJS)
+-	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
++libspread.so:	$@.$(LIBVERSION)
++	$(SOFTLINK) $@.$(LIBVERSION) $@
++
++libspread.so.$(LIBVERSION):	$(LIBSP_SHOBJS)
++	$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDSONAME) $(SHLDFLAGS) $(SHLIBS)
+ 
+ install-libspread.so:	libspread.so
+ 	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
+@@ -142,8 +147,11 @@
+ 	$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
+ 	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.$(LIBVERSION).dylib libtspread.dylib)
+ 
+-libtspread.so:	$(LIBTSP_SHOBJS)
+-	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
++libtspread.so:	$@.$(LIBVERSION)
++	$(SOFTLINK) $@.$(LIBVERSION) $@
++
++libtspread.so.$(LIBVERSION):	$(LIBTSP_SHOBJS)
++	$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(TSHLDSONAME) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
+ 
+ install-libtspread.so:	libtspread.so
+ 	$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
+@@ -152,17 +160,17 @@
+ spread$(EXEEXT): $(SPREADOBJS)
+ 	$(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS)
+ 
+-spuser$(EXEEXT): libspread.a	user.o
+-	$(LD) -o $@ user.o $(LDFLAGS) libspread.a $(LIBS)
++spuser$(EXEEXT): libspread.so	user.o
++	$(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS)
+ 
+-spflooder$(EXEEXT): libspread.a flooder.o
+-	$(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS)
++spflooder$(EXEEXT): libspread.so flooder.o
++	$(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(LIBS)
+ 
+ spmonitor$(EXEEXT): $(MONITOROBJS)
+ 	$(LD) -o $@ $(MONITOROBJS) $(LDFLAGS) $(LIBS) 
+ 
+-sptuser$(EXEEXT): user.to libtspread.a
+-	$(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS)
++sptuser$(EXEEXT): user.to libtspread.so
++	$(LD) $(THLDFLAGS) -o $@ user.to -ltspread $(LDFLAGS) $(LIBS) $(THLIBS)
+ 
+ spsimple_user$(EXEEXT): simple_user.o libspread.a
+ 	$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) 
+@@ -234,11 +242,6 @@
+ 	done
+ 	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
+ 		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
+-	fi
+-	if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
+-		$(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
+-	else \
+-		echo "$(DESTDIR)$(sysconfdir)/spread.conf already exists, install will not overwrite"; \
+ 	fi
+ 
+ uninstallall:	uninstall
diff --git a/net/spread/files/patch-arch.h b/net/spread/files/patch-arch.h
deleted file mode 100644
index bd666af1d22f..000000000000
--- a/net/spread/files/patch-arch.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- arch.h.orig	Thu Sep  5 01:04:40 2002
-+++ arch.h	Thu Sep  5 01:05:15 2002
-@@ -83,7 +83,7 @@
- #endif
- 
- #ifdef __FreeBSD__
--#if __FreeBSD__ == 4
-+#if __FreeBSD__ >= 4
- #define ARCH_PC_FREEBSD4
- #else
- #define ARCH_PC_FREEBSD3
diff --git a/net/spread/files/patch-auth-ip.c b/net/spread/files/patch-auth-ip.c
new file mode 100644
index 000000000000..4c49b4278833
--- /dev/null
+++ b/net/spread/files/patch-auth-ip.c
@@ -0,0 +1,13 @@
+--- auth-ip.c	Sun Sep 22 12:56:52 2002
++++ auth-ip.c	Wed Nov  6 02:39:28 2002
+@@ -94,8 +94,8 @@
+         if (NULL != (fp = fopen("./spread.access_ip", "r")) )
+             Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n");
+     if (fp == NULL)
+-        if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) )
+-            Alarm( PRINT, "ip_init: using file: /etc/spread.access_ip\n");
++        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) )
++            Alarm( PRINT, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n");
+     if (fp == NULL)
+     {
+         Alarm( PRINT, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n");
diff --git a/net/spread/files/patch-auth-pword.c b/net/spread/files/patch-auth-pword.c
new file mode 100644
index 000000000000..09a8e44cf372
--- /dev/null
+++ b/net/spread/files/patch-auth-pword.c
@@ -0,0 +1,13 @@
+--- auth-pword.c	Sun Sep 22 12:56:52 2002
++++ auth-pword.c	Wed Nov  6 02:40:23 2002
+@@ -122,8 +122,8 @@
+         if (NULL != (fp = fopen("./spread.access_pword", "r")) )
+             Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n");
+     if (fp == NULL)
+-        if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) )
+-            Alarm( PRINT, "pword_init: using file: /etc/spread.access_pword\n");
++        if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) )
++            Alarm( PRINT, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n");
+     if (fp == NULL)
+         Alarm( EXIT, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name);
+ 
diff --git a/net/spread/files/patch-data_link.c b/net/spread/files/patch-data_link.c
deleted file mode 100644
index 1fc8a9e1a1d7..000000000000
--- a/net/spread/files/patch-data_link.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 102709d6a9f4..000000000000
--- a/net/spread/files/patch-session.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/files/patch-spread.c b/net/spread/files/patch-spread.c
new file mode 100644
index 000000000000..1ab2708b1f90
--- /dev/null
+++ b/net/spread/files/patch-spread.c
@@ -0,0 +1,40 @@
+--- spread.c	Sun Nov 10 00:17:59 2002
++++ spread.c	Sun Nov 10 00:18:42 2002
+@@ -65,6 +65,7 @@
+ 
+ static	void	Invalid_privilege_decrease(char *user, char *group);
+ static	void	Usage(int argc, char *argv[]);
++static	void	writepidfile();
+ 
+ /* auth-null.c: */
+ void null_init(void);
+@@ -144,6 +145,8 @@
+ 
+ #endif	/* ARCH_PC_WIN95 */
+ 
++	writepidfile();
++
+         /* initialize each valid authentication protocol */
+         null_init();
+         ip_init();
+@@ -193,6 +196,20 @@
+ 	E_handle_events();
+ 
+ 	return 0;
++}
++
++static void
++writepidfile()
++{
++	char pidbuf[11];
++	int pidfd;
++
++	if ((pidfd = open(_PATH_SPREAD_PIDDIR "/spread.pid", O_RDWR | O_CREAT, 0644)) == -1)
++		Alarm( EXIT, "Spread: couldn't open pidfile for writing" );
++
++	snprintf(pidbuf, sizeof(pidbuf), "%ld\n", (long)getpid());
++	write(pidfd, pidbuf, strlen(pidbuf));
++	close(pidfd);
+ }
+ 
+ static  void    Print_help(void)
diff --git a/net/spread/files/spread.sh b/net/spread/files/spread.sh
new file mode 100644
index 000000000000..ebeb5adf697f
--- /dev/null
+++ b/net/spread/files/spread.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+if ! prefix=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the prefix" >&2
+    exit 1
+fi
+spread=${prefix}/sbin/spread
+pidfile=/var/run/spread.pid
+out=/var/log/spread.out
+daemon=/usr/sbin/daemon
+
+case "$1" in
+start)
+	if [ -x ${spread} ]; then
+		echo -n ' spread'
+		${daemon} -c ${spread} >${out} 2>&1 <&-
+	fi
+	;;
+stop)
+	if [ -f ${pidfile} ]; then
+		kill `cat ${pidfile}`
+		echo -n ' spread'
+		rm ${pidfile}
+	else
+		echo ' spread: not running'
+	fi
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/net/spread/pkg-comment b/net/spread/pkg-comment
index 51bf80b78bd6..4d62c07a7151 100644
--- a/net/spread/pkg-comment
+++ b/net/spread/pkg-comment
@@ -1 +1 @@
-The Spread Wide Area Group Communication System, a network toolkit
+The Spread Group Communication System, a network toolkit
diff --git a/net/spread/pkg-descr b/net/spread/pkg-descr
index 1408d4e03b4a..43fac02d21a6 100644
--- a/net/spread/pkg-descr
+++ b/net/spread/pkg-descr
@@ -1,6 +1,6 @@
-Copyright (c) 1993-2001 Spread Concepts LLC. All rights reserved.
+Copyright (c) 1993-2002 Spread Concepts LLC. All rights reserved.
 This product uses software developed by Spread Concepts LLC for use in the
-Spread toolkit. For more information about Spread see http://www.spread.org .
+Spread toolkit. For more information about Spread see http://www.spread.org/
 
 Spread is a toolkit and daemon that provide multicast and group communications
 support to applications across local and wide area networks. Spread is designed
diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist
index 0804b37b7049..b7ea631d841f 100644
--- a/net/spread/pkg-plist
+++ b/net/spread/pkg-plist
@@ -1,62 +1,26 @@
-sbin/spread
 bin/spflooder
 bin/spmonitor
-bin/spuser
 bin/sptuser
+bin/spuser
+etc/rc.d/spread.sh.sample
+etc/spread.access_ip.sample
+etc/spread.conf.sample
 include/sp.h
-include/sp_func.h
 include/sp_events.h
-etc/spread.conf.sample
-etc/spread.access_ip.sample
-lib/libsp.a
-lib/libtsp.a
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
+include/sp_func.h
+lib/libspread.a
+lib/libspread.so
+lib/libspread.so.1
+lib/libtspread.a
+lib/libtspread.so
+lib/libtspread.so.1
+lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Spread.pm
-lib/perl5/%%PERL_VERSION%%/man/man3/Spread.3.gz
-%%JAVALIB%%%%JAVALIBDIR%%/spread/AdvancedMessageListener.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/BasicMessageListener.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/GroupID.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/MembershipInfo.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/MessageFactory.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/NULLAuth.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadAuthInterface.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadConnection$Listener.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadConnection.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadException.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadGroup.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadMessage.class
-%%JAVALIB%%%%JAVALIBDIR%%/spread/SpreadVersion.class
-%%JAVALIB%%@dirrm %%JAVALIBDIR%%/spread
-%%JAVALIB_DOCS%%share/doc/spread/java/readme.txt
-%%JAVALIB_DOCS%%share/doc/spread/java/recThread.java
-%%JAVALIB_DOCS%%share/doc/spread/java/Flooder.java
-%%JAVALIB_DOCS%%share/doc/spread/java/User.java
-%%JAVALIB_DOCS%%share/doc/spread/java/html/allclasses-frame.html
-%%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/overview-tree.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/packages.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/serialized-form.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/stylesheet.css
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/AdvancedMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/BasicMessageListener.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/GroupID.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/MembershipInfo.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/MessageFactory.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/NULLAuth.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadAuthInterface.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadConnection.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadException.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadGroup.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadMessage.html
-%%JAVALIB_DOCS%%share/doc/spread/java/html/spread/SpreadVersion.html
-%%JAVALIB_DOCS%%@dirrm share/doc/spread/java/html/spread
-%%JAVALIB_DOCS%%@dirrm share/doc/spread/java/html
-%%JAVALIB_DOCS%%@dirrm share/doc/spread/java
+sbin/spread
 %%PORTDOCS%%share/doc/spread/perl/README
 %%PORTDOCS%%share/doc/spread/perl/test.pl
 %%PORTDOCS%%share/doc/spread/LICENSE