Do not auto-fetch a FreeBSD copy of distfile, instead make fetch

interactive, as per PR/20424.
Work patches and changes in PR/19782.

8 files changed, 187 insertions, 44 deletions

diff --git a/net/spread/Makefile b/net/spread/Makefile
index 27fa1a99603..6fa6ed7ed17 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/22 23:37:13 mjl Exp $
 #
 
 DISTNAME=	${BASENAME}-src-${VER}
 PKGNAME=	${BASENAME}-${VER}
 CATEGORIES=	net
-MASTER_SITES=	http://www.roughtrade.net/distfiles/
-# Also available through manual download at
-# http://www.cnds.jhu.edu/download/download_spread.cgi
+MASTER_SITES=
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	marc@informatik.uni-bremen.de
 HOMEPAGE=	http://www.spread.org/
 COMMENT=	Group communication system providing a number of messaging services
 
+INTERACTIVE_STAGE=	fetch
+
+_FETCH_MESSAGE= \
+	${ECHO} '======================================================='; \
+	${ECHO} 'Distfile has to be manually fetched from'; \
+	${ECHO} '   http://www.cnds.jhu.edu/download/download_spread.cgi'; \
+	${ECHO} '======================================================='
+
 BASENAME=	spread
 VER=		3.17.0
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -21,21 +27,38 @@ GNU_CONFIGURE=	YES
 BUILD_DEPENDS+=        perl-[0-9]*:../../lang/perl5:build
 LDFLAGS	+=	-lutil
 
+SPREAD_USER=	spread
+SPREAD_GROUP=	spread
+
+FILES_SUBST+=	SPREAD_USER=${SPREAD_USER}
+FILES_SUBST+=	SPREAD_GROUP=${SPREAD_GROUP}
+
+BUILD_DEFS+=	SPREAD_USER SPREAD_GROUP
+
 INCLUDEDIR=	${PREFIX}/include/spread
 DOCSDIR=	${PREFIX}/share/doc/spread
 EXAMPLEDIR=	${PREFIX}/share/examples/spread
+RUNDIR=		/var/run/spread
 
-post-install:
+RCD_SCRIPTS=	spread
+PKG_GROUPS=	${SPREAD_USER}
+PKG_USERS=	${SPREAD_USER}:${SPREAD_GROUP}
+CONF_FILES=	${EXAMPLEDIR}/spread.access_ip.sample ${PKG_SYSCONFBASE}/spread.access_ip
+CONF_FILES+=	${EXAMPLEDIR}/spread.conf.sample ${PKG_SYSCONFBASE}/spread.conf
+
+pre-install:
 	${INSTALL_DATA_DIR} ${INCLUDEDIR}
+
+post-install:
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/sp.h		${INCLUDEDIR}/sp.h
-	${INSTALL_DATA} ${WRKSRC}/sp_func.h	${INCLUDEDIR}/sp_func.h
-	${INSTALL_DATA} ${WRKSRC}/sp_events.h	${INCLUDEDIR}/sp_events.h
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${EXAMPLEDIR}/spread.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${EXAMPLEDIR}/spread.access_ip.sample
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}/Readme.txt
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
+	${INSTALL_DATA} ${WRKSRC}/Short_Buffer_Handling.txt ${DOCSDIR}/Short_Buffer_Handling.txt
+	${INSTALL} -d -o ${SPREAD_USER} -g ${SPREAD_GROUP} -m 0750 ${RUNDIR}
 
 .include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/spread/PLIST b/net/spread/PLIST
index eaeb81a7582..d3a22a98eca 100644
--- a/net/spread/PLIST
+++ b/net/spread/PLIST
@@ -1,20 +1,22 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/02/22 23:37:14 mjl Exp $
+bin/spflooder
 bin/spmonitor
-bin/spuser
 bin/sptuser
-bin/spflooder
+bin/spuser
+include/spread/sp.h
+include/spread/sp_events.h
+include/spread/sp_func.h
 lib/libspread.a
-lib/libtspread.a
 lib/libspread.so
-lib/libtspread.so
 lib/libspread.so.1
+lib/libtspread.a
+lib/libtspread.so
 lib/libtspread.so.1
-man/man1/spread.1
-man/man1/spuser.1
-man/man1/sptuser.1
 man/man1/spflooder.1
 man/man1/spmonitor.1
-man/man3/libsp.3
+man/man1/spread.1
+man/man1/sptuser.1
+man/man1/spuser.1
 man/man3/SP_connect.3
 man/man3/SP_disconnect.3
 man/man3/SP_equal_group_ids.3
@@ -28,14 +30,14 @@ man/man3/SP_poll.3
 man/man3/SP_receive.3
 man/man3/SP_scat_multicast.3
 man/man3/SP_scat_receive.3
+man/man3/libsp.3
 sbin/spread
-include/spread/sp.h
-include/spread/sp_func.h
-include/spread/sp_events.h
-share/examples/spread/spread.conf.sample
-share/examples/spread/spread.access_ip.sample
-share/doc/spread/Readme.txt
 share/doc/spread/LICENSE
-@unexec ${RMDIR} %D/share/examples/spread 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/doc/spread 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/include/spread 2>/dev/null || ${TRUE}
+share/doc/spread/Readme.txt
+share/doc/spread/Short_Buffer_Handling.txt
+share/examples/spread/spread.access_ip.sample
+share/examples/spread/spread.conf.sample
+@dirrm share/examples/spread
+@dirrm share/doc/spread
+@dirrm include/spread
+@unexec ${RMDIR} %D/var/run/spread 2>/dev/null || ${TRUE}
diff --git a/net/spread/buildlink2.mk b/net/spread/buildlink2.mk
new file mode 100644
index 00000000000..dc237cf741f
--- /dev/null
+++ b/net/spread/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/02/22 23:37:14 mjl Exp $
+
+.if !defined(SPREAD_BUILDLINK2_MK)
+SPREAD_BUILDLINK2_MK=		# defined
+
+BUILDLINK_PACKAGES+=		spread
+BUILDLINK_DEPENDS.spread?=	spread>=3.17.0
+BUILDLINK_PKGSRCDIR.spread?=	../../net/spread
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.spread=spread
+BUILDLINK_PREFIX.spread_DEFAULT=${LOCALBASE}
+BUILDLINK_FILES.spread+=	include/spread/sp.h
+BUILDLINK_FILES.spread+=	include/spread/sp_events.h
+BUILDLINK_FILES.spread+=	include/spread/sp_func.h
+BUILDLINK_FILES.spread+=	lib/libspread.*
+BUILDLINK_FILES.spread+=	lib/libtspread.*
+
+BUILDLINK_TARGETS+=		spread-buildlink
+
+spread-buildlink: _BUILDLINK_USE
+
+.endif # SPREAD_BUILDLINK2_MK
+
diff --git a/net/spread/distinfo b/net/spread/distinfo
index 665fa5fd8c1..54c12398707 100644
--- a/net/spread/distinfo
+++ b/net/spread/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+$NetBSD: distinfo,v 1.2 2003/02/22 23:37:14 mjl Exp $
 
 SHA1 (spread-src-3.17.0.tar.gz) = 1d9d431583ae8692e07f871ae0f4d8f1cb3e4b41
 Size (spread-src-3.17.0.tar.gz) = 285740 bytes
-SHA1 (patch-aa) = f828aee668893b12a384eed3d762cbbc26093a59
+SHA1 (patch-aa) = 1463ac26917c044476e206eed87338fa422869d5
 SHA1 (patch-ba) = 90f2896dc62627772a05c06add99c59a55e91c88
 SHA1 (patch-bb) = efd9b08d775542622ce35265e2b72d655b5ca00f
 SHA1 (patch-bc) = d3b0e7e7841da86a8eae81eab691977c8d128743
-SHA1 (patch-bd) = 68b2958ddbd02814e857de19f958f8311ea546f1
+SHA1 (patch-bd) = 0972e0a683c53fa2ae3c16cd3cf468342ac4c4a2
+SHA1 (patch-be) = 43acfde2afea8485b6369bb96a104741d0735916
diff --git a/net/spread/files/spread.sh b/net/spread/files/spread.sh
new file mode 100644
index 00000000000..80973c9b3b6
--- /dev/null
+++ b/net/spread/files/spread.sh
@@ -0,0 +1,32 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: spread.sh,v 1.1 2003/02/22 23:37:14 mjl Exp $
+#
+# PROVIDE: spread
+# REQUIRE: DAEMON
+#
+# To start spread at startup, copy this script to /etc/rc.d and set
+# spread=YES in /etc/rc.conf.
+#
+# Addtionally you may set spread_log to a file where to log stuff.
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+rcd_dir=`@DIRNAME@ $0`
+
+name="spread"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+if [ X"${spread_log}" != "X" ] ; then
+   log=">${spread_log} 2>&1"
+else
+   log=">/dev/null 2>&1"
+fi
+required_files="@PKG_SYSCONFDIR@/spread.conf"
+
+command_args="${log} </dev/null &"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/spread/patches/patch-aa b/net/spread/patches/patch-aa
index 693b15e4be7..d113a89a3f3 100644
--- a/net/spread/patches/patch-aa
+++ b/net/spread/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/22 23:37:15 mjl Exp $
 
---- configure.orig	2002-09-25 18:35:26.000000000 +0200
-+++ configure	2003-02-18 21:46:00.000000000 +0100
+--- configure.orig	2003-02-19 09:56:29.000000000 +0100
++++ configure	2003-02-19 09:55:41.000000000 +0100
 @@ -1250,9 +1250,9 @@
  	{ echo "configure: error: *** 'ar' missing, please install or fix your \$PATH ***" 1>&2; exit 1; }
  fi
@@ -14,3 +14,19 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  	
  # C Compiler features
+@@ -3956,6 +3956,7 @@
+ G=`eval echo ${piddir}` ; G=`eval echo ${G}`
+ H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
+ I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
++J=`eval echo ${includedir}`; J=`eval echo ${J}`
+ 
+ echo ""
+ echo "Spread has been configured with the following options:"
+@@ -3965,6 +3966,7 @@
+ echo "                   User libraries: $E"
+ echo "            Shared Spread LIbrary: $H"
+ echo "Shared Thread-safe Spread LIbrary: $I"
++echo "                     Header files: $J"
+ echo "                     Manual pages: $F"
+ echo "                         PID file: $G"
+ echo "                   Manpage format: $MANTYPE"
diff --git a/net/spread/patches/patch-bd b/net/spread/patches/patch-bd
index ce96ef64fb0..f6caa0a7f58 100644
--- a/net/spread/patches/patch-bd
+++ b/net/spread/patches/patch-bd
@@ -1,8 +1,16 @@
-$NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
+$NetBSD: patch-bd,v 1.2 2003/02/22 23:37:15 mjl Exp $
 
---- Makefile.in.orig	2003-02-18 22:12:03.000000000 +0100
-+++ Makefile.in	2003-02-18 22:19:29.000000000 +0100
-@@ -25,7 +25,7 @@
+--- Makefile.in.orig	2003-02-19 09:53:03.000000000 +0100
++++ Makefile.in	2003-02-19 09:52:48.000000000 +0100
+@@ -5,6 +5,7 @@
+ bindir=@bindir@
+ sbindir=@sbindir@
+ libdir=@libdir@
++includedir=@includedir@
+ mandir=@mandir@
+ mansubdir=@mansubdir@
+ sysconfdir=@sysconfdir@
+@@ -25,7 +26,7 @@
  #Rules: major  -- inc for incompatible change
  #     : minor  -- inc for bugfix or forward compatible change
  
@@ -11,7 +19,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  PATHS= 
  
-@@ -33,8 +33,8 @@
+@@ -33,7 +34,7 @@
  LD=@LD@
  CFLAGS=@CFLAGS@
  CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
@@ -20,8 +28,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  LIBS=@LIBS@
  THLDFLAGS=@THLDFLAGS@
  THLIBS=@THLIBS@
- AR=@AR@
-@@ -51,8 +51,10 @@
+@@ -51,8 +52,10 @@
  PERL=@PERL@
  ENT=@ENT@
  EXEEXT=@EXEEXT@
@@ -33,7 +40,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  LIBSP_OBJS= alarm.o events.o memory.o sp.o
  
-@@ -123,8 +125,11 @@
+@@ -123,8 +126,11 @@
  	$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
  	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.$(LIBVERSION).dylib libspread.dylib)
  
@@ -47,7 +54,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  install-libspread.so:	libspread.so
  	$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
-@@ -142,8 +147,11 @@
+@@ -142,8 +148,11 @@
  	$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
  	(cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.$(LIBVERSION).dylib libtspread.dylib)
  
@@ -61,7 +68,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  install-libtspread.so:	libtspread.so
  	$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
-@@ -152,17 +160,17 @@
+@@ -152,17 +161,17 @@
  spread$(EXEEXT): $(SPREADOBJS)
  	$(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS)
  
@@ -85,7 +92,25 @@ $NetBSD: patch-bd,v 1.1.1.1 2003/02/18 22:11:55 mjl Exp $
  
  spsimple_user$(EXEEXT): simple_user.o libspread.a
  	$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) 
-@@ -235,11 +243,11 @@
+@@ -211,6 +220,7 @@
+ install-files:
+ 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sbindir)
++	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
+ 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)
+ 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
+ 	$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
+@@ -222,6 +232,9 @@
+ 	$(INSTALL) -m 0755 -s spread$(EXEEXT) $(DESTDIR)$(sbindir)/spread$(EXEEXT)
+ 	$(INSTALL) -m 644 libspread.a $(DESTDIR)$(libdir)/libspread.a
+ 	$(INSTALL) -m 644 libtspread.a $(DESTDIR)$(libdir)/libtspread.a
++	$(INSTALL) -m 644 sp.h $(DESTDIR)$(includedir)/spread/sp.h
++	$(INSTALL) -m 644 sp_func.h $(DESTDIR)$(includedir)/spread/sp_func.h
++	$(INSTALL) -m 644 sp_events.h $(DESTDIR)$(includedir)/spread/sp_events.h
+ 	$(INSTALL) -m 644 docs/spread.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
+ 	$(INSTALL) -m 644 docs/spuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spuser.1
+ 	$(INSTALL) -m 644 docs/sptuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sptuser.1
+@@ -235,11 +248,11 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  		$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
  	fi
diff --git a/net/spread/patches/patch-be b/net/spread/patches/patch-be
new file mode 100644
index 00000000000..e0723c6eef9
--- /dev/null
+++ b/net/spread/patches/patch-be
@@ -0,0 +1,21 @@
++$NetBSD: patch-be,v 1.1 2003/02/22 23:37:15 mjl Exp $
++
++Index: sp_func.h
++===================================================================
++RCS file: /storage/cvsroot/spread/daemon/sp_func.h,v
++retrieving revision 1.3
++diff -u -u -r1.3 sp_func.h
++--- sp_func.h	22 Sep 2002 02:56:52 -0000	1.3
+++++ sp_func.h	1 Oct 2002 15:43:22 -0000
++@@ -90,9 +90,9 @@
++ 			 scatter *scat_mess );
++ 
++ /* returns offset in memb. message of gid (group id), num_vs and vs_set */
++-int SP_get_gid_offset_memb_mess();
++-int SP_get_num_vs_offset_memb_mess();
++-int SP_get_vs_set_offset_memb_mess();
+++int SP_get_gid_offset_memb_mess(void);
+++int SP_get_num_vs_offset_memb_mess(void);
+++int SP_get_vs_set_offset_memb_mess(void);
++ 
++ int	SP_poll( mailbox mbox );