sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 3.17.3

Browse source 
- Provide pkg-deinstall
- Cleanup

PR:		86901
Submitted by:	Chris Mikkelson <cmikk@qwest.net>
Approved by:	maintainer timeout (16 days after postponement)
This commit is contained in:
Emanuel Haupt 2005-10-28 18:30:58 +00:00
parent c23d3562ac
commit 9466619af6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=146591
14 changed files with 200 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
net/spread/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= spread
PORTVERSION= 3.17.2
PORTVERSION= 3.17.3
CATEGORIES= net perl5
MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@ -14,41 +14,37 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= joshua@roughtrade.net
COMMENT= The Spread Group Communication System, a network toolkit
WRKSRC= ${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
USE_REINPLACE= yes
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 \
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
USE_PERL5= yes
USE_RC_SUBR= yes
INSTALLS_SHLIB= yes
PKGMESSAGE= ${WRKSRC}/license.txt
MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
PORTDOCS+= Readme.txt LICENSE
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
PKGMESSAGE= ${WRKSRC}/license.txt
PORTDOCS= Readme.txt LICENSE
HEADERFILES= sp_func.h sp_func.h sp_events.h
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
.include <bsd.port.pre.mk>
# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together.
PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
post-configure:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/docs/spread.1 ${WRKSRC}/docs/spmonitor.1
${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/docs/spmonitor.1
post-build:
@cd ${WRKSRC}/perl/Spread && \
@ -57,27 +53,38 @@ post-build:
${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
@cd ${WRKSRC}/perl/Spread && ${MAKE}
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/spread.sh > ${WRKDIR}/spread.sh
${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
pre-install:
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh
${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include
${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_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
${PREFIX}/etc/rc.d/${PORTNAME}.sh
.for f in ${HEADERFILES}
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
.endfor
${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \
${PREFIX}/etc/spread.conf.sample
.if !exists(${PREFIX}/etc/${PORTNAME}.conf)
${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \
${PREFIX}/etc/${PORTNAME}.conf
.endif
${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip.sample
.if !exists(${PREFIX}/etc/spread.access_ip)
${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip
.endif
(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
${INSTALL_SCRIPT} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>

4
net/spread/distinfo
View file

@ -1,2 +1,2 @@
MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
SIZE (spread-src-3.17.2.tar.gz) = 289180
MD5 (spread-src-3.17.3.tar.gz) = 2eec25b5adc96fd840aa251e44325f9f
SIZE (spread-src-3.17.3.tar.gz) = 299975

30
net/spread/files/patch-Makefile.in
View file

@ -1,5 +1,5 @@
--- Makefile.in Thu Nov 13 08:42:54 2003
+++ Makefile.in Thu Jul 15 21:42:27 2004
--- Makefile.in Thu Sep 23 12:12:52 2004
+++ Makefile.in Tue Oct 4 14:49:56 2005
@@ -26,7 +26,7 @@
#Rules: major -- inc for incompatible change
# : minor -- inc for bugfix or forward compatible change
@ -30,7 +30,7 @@
LIBSP_OBJS= alarm.o events.o memory.o sp.o
@@ -124,8 +126,11 @@
@@ -127,8 +129,11 @@
$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
@ -44,7 +44,7 @@
install-libspread.so: libspread.so
$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
@@ -143,8 +148,11 @@
@@ -146,8 +151,11 @@
$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
@ -58,31 +58,31 @@
install-libtspread.so: libtspread.so
$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
@@ -153,17 +161,17 @@
@@ -156,11 +164,11 @@
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
+spuser$(EXEEXT): libspread.a user.o
+ $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS)
-spflooder$(EXEEXT): libspread.a flooder.o
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)
spmonitor$(EXEEXT): $(MONITOR_OBJS)
$(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS)
@@ -169,7 +177,7 @@
$(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(LDFLAGS) $(LIBS) $(THLIBS)
-sptuser$(EXEEXT): user.to libtspread.a
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)
+ $(LD) $(THLDFLAGS) -o $@ user.to -lspread $(LDFLAGS) $(LIBS) $(THLIBS)
spsimple_user$(EXEEXT): simple_user.o libspread.a
$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS)
@@ -192,7 +200,7 @@
@@ -198,7 +206,7 @@
fi
clean:
@ -91,7 +91,7 @@
rm -f config.cache config.log docs/*.out core
rm -rf autom4te.cache
@@ -248,11 +256,6 @@
@@ -254,11 +262,6 @@
done
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \

6
net/spread/files/patch-configuration.c
View file

@ -1,6 +1,6 @@
--- configuration.c Sun Sep 22 12:56:52 2002
+++ configuration.c Tue Aug 5 21:24:19 2003
@@ -128,9 +128,6 @@
--- configuration.c Mon Sep 27 00:15:48 2004
+++ configuration.c Tue Oct 4 14:40:51 2005
@@ -130,9 +130,6 @@
if (NULL != (yyin = fopen(file_name,"r")) )
Alarm( PRINT, "Conf_init: using file: %s\n", file_name);

14
net/spread/files/patch-sp.c
View file

@ -1,11 +1,11 @@
--- sp.c Tue Aug 5 21:35:28 2003
+++ sp.c Tue Aug 5 21:24:19 2003
@@ -551,7 +551,7 @@
Alarm( SESSION, "SP_connect: set sndbuf/rcvbuf to %d\n", 1024*(i-5) );
--- sp.c Tue Oct 5 09:08:10 2004
+++ sp.c Tue Oct 4 14:44:27 2005
@@ -591,7 +591,7 @@
set_large_socket_buffers(s);
unix_addr.sun_family = AF_UNIX;
- sprintf( unix_addr.sun_path, "/tmp/%d", port );
+ sprintf( unix_addr.sun_path, "%s/spread.sock", _PATH_SPREAD_PIDDIR );
while( ((ret = connect( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr) )) == -1)
&& ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) )
{
ret = connect_nointr_timeout( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr), &time_out);
#endif /* !ARCH_PC_WIN95 */
}

29
net/spread/pkg-deinstall Normal file
View file

@ -0,0 +1,29 @@
#!/bin/sh
#
# $FreeBSD$
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
USER=spread
GROUP=spread
echo "===> deinstall note:"
echo " Please note that user ${USER} and group ${GROUP} was not removed"
echo " from this system:"
echo ""
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo " To delete spread user permanently"
echo " $ pw userdel ${USER}"
echo ""
fi
if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
echo " To delete spread group permanently"
echo " $ pw groupdel ${GROUP}"
echo ""
fi
exit 0

11
net/spread/pkg-plist
View file

@ -3,8 +3,12 @@ bin/spmonitor
bin/sptuser
bin/spuser
etc/rc.d/spread.sh
@unexec if cmp -s %D/etc/spread.access_ip %D/etc/spread.access_ip.sample; then rm -f %D/etc/spread.access_ip; fi
etc/spread.access_ip.sample
@exec [ -f %B/spread.access_ip ] || cp %B/%f %B/spread.access_ip
@unexec if cmp -s %D/etc/spread.conf %D/etc/spread.conf.sample; then rm -f %D/etc/spread.conf; fi
etc/spread.conf.sample
@exec [ -f %B/spread.conf ] || cp %B/%f %B/spread.conf
include/sp.h
include/sp_events.h
include/sp_func.h
@ -14,13 +18,14 @@ lib/libspread.so.1
lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
sbin/spread
%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
%%EXAMPLESDIR%%/test.pl
@exec mkdir -p /var/run/spread %B/var/run
@unexec rmdir /var/run/spread 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true

65
net/spread4/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= spread
PORTVERSION= 3.17.2
PORTVERSION= 3.17.3
CATEGORIES= net perl5
MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@ -14,41 +14,37 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= joshua@roughtrade.net
COMMENT= The Spread Group Communication System, a network toolkit
WRKSRC= ${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
USE_REINPLACE= yes
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 \
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
USE_PERL5= yes
USE_RC_SUBR= yes
INSTALLS_SHLIB= yes
PKGMESSAGE= ${WRKSRC}/license.txt
MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
.if !defined(NOPORTDOCS)
PORTDOCS+= Readme.txt LICENSE
.endif
RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
PKGMESSAGE= ${WRKSRC}/license.txt
PORTDOCS= Readme.txt LICENSE
HEADERFILES= sp_func.h sp_func.h sp_events.h
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
.include <bsd.port.pre.mk>
# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together.
PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"
_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3
post-configure:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/docs/spread.1 ${WRKSRC}/docs/spmonitor.1
${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/docs/spmonitor.1
post-build:
@cd ${WRKSRC}/perl/Spread && \
@ -57,27 +53,38 @@ post-build:
${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
@cd ${WRKSRC}/perl/Spread && ${MAKE}
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/spread.sh > ${WRKDIR}/spread.sh
${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
pre-install:
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh
${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include
${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include
${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_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
${PREFIX}/etc/rc.d/${PORTNAME}.sh
.for f in ${HEADERFILES}
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
.endfor
${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \
${PREFIX}/etc/spread.conf.sample
.if !exists(${PREFIX}/etc/${PORTNAME}.conf)
${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \
${PREFIX}/etc/${PORTNAME}.conf
.endif
${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip.sample
.if !exists(${PREFIX}/etc/spread.access_ip)
${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip
.endif
(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
.if !defined(NOPORTDOCS)
${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
${INSTALL_SCRIPT} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.include <bsd.port.post.mk>

4
net/spread4/distinfo
View file

@ -1,2 +1,2 @@
MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1
SIZE (spread-src-3.17.2.tar.gz) = 289180
MD5 (spread-src-3.17.3.tar.gz) = 2eec25b5adc96fd840aa251e44325f9f
SIZE (spread-src-3.17.3.tar.gz) = 299975

30
net/spread4/files/patch-Makefile.in
View file

@ -1,5 +1,5 @@
--- Makefile.in Thu Nov 13 08:42:54 2003
+++ Makefile.in Thu Jul 15 21:42:27 2004
--- Makefile.in Thu Sep 23 12:12:52 2004
+++ Makefile.in Tue Oct 4 14:49:56 2005
@@ -26,7 +26,7 @@
#Rules: major -- inc for incompatible change
# : minor -- inc for bugfix or forward compatible change
@ -30,7 +30,7 @@
LIBSP_OBJS= alarm.o events.o memory.o sp.o
@@ -124,8 +126,11 @@
@@ -127,8 +129,11 @@
$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
@ -44,7 +44,7 @@
install-libspread.so: libspread.so
$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
@@ -143,8 +148,11 @@
@@ -146,8 +151,11 @@
$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
@ -58,31 +58,31 @@
install-libtspread.so: libtspread.so
$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
@@ -153,17 +161,17 @@
@@ -156,11 +164,11 @@
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
+spuser$(EXEEXT): libspread.a user.o
+ $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS)
-spflooder$(EXEEXT): libspread.a flooder.o
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)
spmonitor$(EXEEXT): $(MONITOR_OBJS)
$(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS)
@@ -169,7 +177,7 @@
$(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(LDFLAGS) $(LIBS) $(THLIBS)
-sptuser$(EXEEXT): user.to libtspread.a
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)
+ $(LD) $(THLDFLAGS) -o $@ user.to -lspread $(LDFLAGS) $(LIBS) $(THLIBS)
spsimple_user$(EXEEXT): simple_user.o libspread.a
$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS)
@@ -192,7 +200,7 @@
@@ -198,7 +206,7 @@
fi
clean:
@ -91,7 +91,7 @@
rm -f config.cache config.log docs/*.out core
rm -rf autom4te.cache
@@ -248,11 +256,6 @@
@@ -254,11 +262,6 @@
done
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \

6
net/spread4/files/patch-configuration.c
View file

@ -1,6 +1,6 @@
--- configuration.c Sun Sep 22 12:56:52 2002
+++ configuration.c Tue Aug 5 21:24:19 2003
@@ -128,9 +128,6 @@
--- configuration.c Mon Sep 27 00:15:48 2004
+++ configuration.c Tue Oct 4 14:40:51 2005
@@ -130,9 +130,6 @@
if (NULL != (yyin = fopen(file_name,"r")) )
Alarm( PRINT, "Conf_init: using file: %s\n", file_name);

14
net/spread4/files/patch-sp.c
View file

@ -1,11 +1,11 @@
--- sp.c Tue Aug 5 21:35:28 2003
+++ sp.c Tue Aug 5 21:24:19 2003
@@ -551,7 +551,7 @@
Alarm( SESSION, "SP_connect: set sndbuf/rcvbuf to %d\n", 1024*(i-5) );
--- sp.c Tue Oct 5 09:08:10 2004
+++ sp.c Tue Oct 4 14:44:27 2005
@@ -591,7 +591,7 @@
set_large_socket_buffers(s);
unix_addr.sun_family = AF_UNIX;
- sprintf( unix_addr.sun_path, "/tmp/%d", port );
+ sprintf( unix_addr.sun_path, "%s/spread.sock", _PATH_SPREAD_PIDDIR );
while( ((ret = connect( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr) )) == -1)
&& ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) )
{
ret = connect_nointr_timeout( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr), &time_out);
#endif /* !ARCH_PC_WIN95 */
}

29
net/spread4/pkg-deinstall Normal file
View file

@ -0,0 +1,29 @@
#!/bin/sh
#
# $FreeBSD$
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
USER=spread
GROUP=spread
echo "===> deinstall note:"
echo " Please note that user ${USER} and group ${GROUP} was not removed"
echo " from this system:"
echo ""
if pw usershow "${USER}" 2>/dev/null 1>&2; then
echo " To delete spread user permanently"
echo " $ pw userdel ${USER}"
echo ""
fi
if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
echo " To delete spread group permanently"
echo " $ pw groupdel ${GROUP}"
echo ""
fi
exit 0

11
net/spread4/pkg-plist
View file

@ -3,8 +3,12 @@ bin/spmonitor
bin/sptuser
bin/spuser
etc/rc.d/spread.sh
@unexec if cmp -s %D/etc/spread.access_ip %D/etc/spread.access_ip.sample; then rm -f %D/etc/spread.access_ip; fi
etc/spread.access_ip.sample
@exec [ -f %B/spread.access_ip ] || cp %B/%f %B/spread.access_ip
@unexec if cmp -s %D/etc/spread.conf %D/etc/spread.conf.sample; then rm -f %D/etc/spread.conf; fi
etc/spread.conf.sample
@exec [ -f %B/spread.conf ] || cp %B/%f %B/spread.conf
include/sp.h
include/sp_events.h
include/sp_func.h
@ -14,13 +18,14 @@ lib/libspread.so.1
lib/libtspread.a
lib/libtspread.so
lib/libtspread.so.1
sbin/spread
%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix
sbin/spread
%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
%%EXAMPLESDIR%%/test.pl
@exec mkdir -p /var/run/spread %B/var/run
@unexec rmdir /var/run/spread 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true
%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true
@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true