Index: head/net/spread/Makefile =================================================================== --- head/net/spread/Makefile (revision 114424) +++ head/net/spread/Makefile (revision 114425) @@ -1,82 +1,83 @@ # New ports collection makefile for: spread # Date created: 11 June 2001 # Whom: Anders Nordby # # $FreeBSD$ # PORTNAME= spread -PORTVERSION= 3.17.1 +PORTVERSION= 3.17.2 CATEGORIES= net perl5 MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ 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} .include # 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" _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 post-build: @cd ${WRKSRC}/perl/Spread && \ ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS} @cd ${WRKSRC}/perl/Spread && \ ${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 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 (cd ${WRKSRC}/perl/Spread && ${MAKE} install) .if !defined(NOPORTDOCS) ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR} ${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR} ${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 .include Property changes on: head/net/spread/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/net/spread/distinfo =================================================================== --- head/net/spread/distinfo (revision 114424) +++ head/net/spread/distinfo (revision 114425) @@ -1,2 +1,2 @@ -MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4 -SIZE (spread-src-3.17.1.tar.gz) = 290861 +MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1 +SIZE (spread-src-3.17.2.tar.gz) = 289180 Property changes on: head/net/spread/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/spread/files/patch-Makefile.in =================================================================== --- head/net/spread/files/patch-Makefile.in (revision 114424) +++ head/net/spread/files/patch-Makefile.in (revision 114425) @@ -1,105 +1,105 @@ ---- Makefile.in Wed Jun 18 05:00:10 2003 -+++ Makefile.in Tue Aug 5 21:26:23 2003 +--- Makefile.in Thu Nov 13 08:42:54 2003 ++++ Makefile.in Thu Jul 15 21:42:27 2004 @@ -26,7 +26,7 @@ #Rules: major -- inc for incompatible change # : minor -- inc for bugfix or forward compatible change -LIBVERSION=1.0 +LIBVERSION=1 PATHS= @@ -35,7 +35,7 @@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ LDFLAGS=@LDFLAGS@ -LIBS=@LIBS@ +LIBS=-L. @LIBS@ THLDFLAGS=@THLDFLAGS@ THLIBS=@THLIBS@ AR=@AR@ @@ -52,8 +52,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 @@ -124,8 +126,11 @@ $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f 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) @@ -143,8 +148,11 @@ $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f 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) @@ -153,17 +161,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) @@ -192,7 +200,7 @@ fi clean: - rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user + rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user *.so.$(LIBVERSION) rm -f config.cache config.log docs/*.out core rm -rf autom4te.cache -@@ -247,11 +255,6 @@ +@@ -248,11 +256,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 Property changes on: head/net/spread/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread/files/patch-auth-ip.c =================================================================== --- head/net/spread/files/patch-auth-ip.c (revision 114424) +++ head/net/spread/files/patch-auth-ip.c (revision 114425) @@ -1,17 +1,17 @@ ---- auth-ip.c Sun Sep 22 12:56:52 2002 -+++ auth-ip.c Tue Aug 5 21:27:40 2003 +--- auth-ip.c Fri Mar 5 11:32:46 2004 ++++ auth-ip.c Thu Jul 15 21:38:09 2004 @@ -90,12 +90,9 @@ /* load spread.access_ip file */ if (NULL != (fp = fopen(file_name,"r")) ) - Alarm( PRINT, "ip_init: using file: %s\n", file_name); + Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name); - if (fp == NULL) - if (NULL != (fp = fopen("./spread.access_ip", "r")) ) -- Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n"); +- Alarmp( SPLOG_INFO, ACM, "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"); +- Alarmp( SPLOG_INFO, ACM, "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"); ++ Alarmp( SPLOG_INFO, ACM, "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"); + Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n"); Property changes on: head/net/spread/files/patch-auth-ip.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread/files/patch-auth-pword.c =================================================================== --- head/net/spread/files/patch-auth-pword.c (revision 114424) +++ head/net/spread/files/patch-auth-pword.c (revision 114425) @@ -1,17 +1,17 @@ ---- auth-pword.c Sun Sep 22 12:56:52 2002 -+++ auth-pword.c Tue Aug 5 21:28:50 2003 +--- auth-pword.c Fri Mar 5 11:32:46 2004 ++++ auth-pword.c Thu Jul 15 21:40:16 2004 @@ -118,12 +118,9 @@ /* load spread.access_ip file */ if (NULL != (fp = fopen(file_name,"r")) ) - Alarm( PRINT, "pword_init: using file: %s\n", file_name); + Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name); - if (fp == NULL) - if (NULL != (fp = fopen("./spread.access_pword", "r")) ) -- Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n"); +- Alarmp( SPLOG_INFO,ACM, "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"); +- Alarmp( SPLOG_INFO, ACM, "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"); ++ Alarmp( SPLOG_INFO, ACM, "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); + Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name); Property changes on: head/net/spread/files/patch-auth-pword.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread/pkg-plist =================================================================== --- head/net/spread/pkg-plist (revision 114424) +++ head/net/spread/pkg-plist (revision 114425) @@ -1,26 +1,26 @@ bin/spflooder bin/spmonitor bin/sptuser bin/spuser etc/rc.d/spread.sh etc/spread.access_ip.sample etc/spread.conf.sample include/sp.h include/sp_events.h include/sp_func.h lib/libspread.a lib/libspread.so lib/libspread.so.1 lib/libtspread.a lib/libtspread.so lib/libtspread.so.1 %%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 @unexec rmdir /var/run/spread 2>/dev/null || true @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true Property changes on: head/net/spread/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/spread-j/Makefile =================================================================== --- head/net/spread-j/Makefile (revision 114424) +++ head/net/spread-j/Makefile (revision 114425) @@ -1,60 +1,59 @@ # New ports collection makefile for: spread-j # Date created: 06 November 2002 # Whom: Joshua Goodall # # $FreeBSD$ # -PORTNAME= spread-j -PORTVERSION= 3.17.1 +PORTNAME= spread +PORTVERSION= 3.17.2 CATEGORIES= net java MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ -DISTNAME= spread-src-${PORTVERSION} +PKGNAMESUFFIX= -j +DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= joshua@roughtrade.net COMMENT= Java client library for the Spread Group Communication System BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/apache-ant -USE_JAVA= 1.2+ -JAVALIBDIR= ${PREFIX}/share/java/classes +USE_JAVA= YES +JAVA_VERSION= 1.2+ PKGMESSAGE= ${WRKSRC}/../license.txt ANT?= ${LOCALBASE}/bin/ant .if defined(NOPORTDOCS) -PLIST_SUB+= JAVALIB_DOCS='@comment ' ANT_TARGET= jar .else -PLIST_SUB+= JAVALIB_DOCS='' ANT_TARGET= javadocs jar -PORTDOCS+= html readme.txt +PORTDOCS+= java .endif -ANT_PARAMS+= -Dlib.dir=${JAVALIBDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION} +ANT_PARAMS+= -Dlib.dir=${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION} -WRKSRC= ${WRKDIR}/${DISTNAME}/java -PLIST_SUB+= JAVALIBDIR=share/java/classes +WRKSRC= ${WRKDIR}/${PORTNAME}_src-${PORTVERSION}/java +PLIST_SUB+= PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}" do-build: @cd ${WRKSRC} && \ ${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS} do-install: @cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS} .if !defined(NOPORTDOCS) - ${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR} - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/html/spread/class-use - ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/html - ${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/html - ${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/html/spread - ${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/html/spread/class-use + ${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR}/java + ${INSTALL_DATA} ${WRKSRC}/recThread.java ${EXAMPLESDIR}/java + ${INSTALL_DATA} ${WRKSRC}/Flooder.java ${EXAMPLESDIR}/java + ${INSTALL_DATA} ${WRKSRC}/User.java ${EXAMPLESDIR}/java + ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}/java + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${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} -d -o root -g wheel -m 0755 ${DOCSDIR}/java/html/spread/class-use + ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}/java/html + ${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${DOCSDIR}/java/html + ${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${DOCSDIR}/java/html/spread + ${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${DOCSDIR}/java/html/spread/class-use .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/net/spread-j/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/net/spread-j/distinfo =================================================================== --- head/net/spread-j/distinfo (revision 114424) +++ head/net/spread-j/distinfo (revision 114425) @@ -1,2 +1,2 @@ -MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4 -SIZE (spread-src-3.17.1.tar.gz) = 290861 +MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1 +SIZE (spread-src-3.17.2.tar.gz) = 289180 Property changes on: head/net/spread-j/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/net/spread-j/pkg-plist =================================================================== --- head/net/spread-j/pkg-plist (revision 114424) +++ head/net/spread-j/pkg-plist (revision 114425) @@ -1,5 +1,6 @@ -%%JAVALIBDIR%%/spread-3.17.1.jar -%%PORTDOCS%%%%EXAMPLESDIR%%/Flooder.java -%%PORTDOCS%%%%EXAMPLESDIR%%/recThread.java -%%PORTDOCS%%%%EXAMPLESDIR%%/User.java -%%PORTDOCS%%@dirrm share/examples/spread-j +%%JAVAJARDIR%%/%%PORTNAME%%-%%PORTVERSION%%.jar +%%PORTDOCS%%%%EXAMPLESDIR%%/java/Flooder.java +%%PORTDOCS%%%%EXAMPLESDIR%%/java/recThread.java +%%PORTDOCS%%%%EXAMPLESDIR%%/java/User.java +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/java +%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true Property changes on: head/net/spread-j/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread4/Makefile =================================================================== --- head/net/spread4/Makefile (revision 114424) +++ head/net/spread4/Makefile (revision 114425) @@ -1,82 +1,83 @@ # New ports collection makefile for: spread # Date created: 11 June 2001 # Whom: Anders Nordby # # $FreeBSD$ # PORTNAME= spread -PORTVERSION= 3.17.1 +PORTVERSION= 3.17.2 CATEGORIES= net perl5 MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ 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} .include # 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" _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 post-build: @cd ${WRKSRC}/perl/Spread && \ ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS} @cd ${WRKSRC}/perl/Spread && \ ${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 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 (cd ${WRKSRC}/perl/Spread && ${MAKE} install) .if !defined(NOPORTDOCS) ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR} ${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR} ${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 .include Property changes on: head/net/spread4/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/net/spread4/distinfo =================================================================== --- head/net/spread4/distinfo (revision 114424) +++ head/net/spread4/distinfo (revision 114425) @@ -1,2 +1,2 @@ -MD5 (spread-src-3.17.1.tar.gz) = b423da7012f0237a877b604ebd80cfc4 -SIZE (spread-src-3.17.1.tar.gz) = 290861 +MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1 +SIZE (spread-src-3.17.2.tar.gz) = 289180 Property changes on: head/net/spread4/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/net/spread4/files/patch-Makefile.in =================================================================== --- head/net/spread4/files/patch-Makefile.in (revision 114424) +++ head/net/spread4/files/patch-Makefile.in (revision 114425) @@ -1,105 +1,105 @@ ---- Makefile.in Wed Jun 18 05:00:10 2003 -+++ Makefile.in Tue Aug 5 21:26:23 2003 +--- Makefile.in Thu Nov 13 08:42:54 2003 ++++ Makefile.in Thu Jul 15 21:42:27 2004 @@ -26,7 +26,7 @@ #Rules: major -- inc for incompatible change # : minor -- inc for bugfix or forward compatible change -LIBVERSION=1.0 +LIBVERSION=1 PATHS= @@ -35,7 +35,7 @@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ LDFLAGS=@LDFLAGS@ -LIBS=@LIBS@ +LIBS=-L. @LIBS@ THLDFLAGS=@THLDFLAGS@ THLIBS=@THLIBS@ AR=@AR@ @@ -52,8 +52,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 @@ -124,8 +126,11 @@ $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f 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) @@ -143,8 +148,11 @@ $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f 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) @@ -153,17 +161,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) @@ -192,7 +200,7 @@ fi clean: - rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user + rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user *.so.$(LIBVERSION) rm -f config.cache config.log docs/*.out core rm -rf autom4te.cache -@@ -247,11 +255,6 @@ +@@ -248,11 +256,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 Property changes on: head/net/spread4/files/patch-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread4/files/patch-auth-ip.c =================================================================== --- head/net/spread4/files/patch-auth-ip.c (revision 114424) +++ head/net/spread4/files/patch-auth-ip.c (revision 114425) @@ -1,17 +1,17 @@ ---- auth-ip.c Sun Sep 22 12:56:52 2002 -+++ auth-ip.c Tue Aug 5 21:27:40 2003 +--- auth-ip.c Fri Mar 5 11:32:46 2004 ++++ auth-ip.c Thu Jul 15 21:38:09 2004 @@ -90,12 +90,9 @@ /* load spread.access_ip file */ if (NULL != (fp = fopen(file_name,"r")) ) - Alarm( PRINT, "ip_init: using file: %s\n", file_name); + Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name); - if (fp == NULL) - if (NULL != (fp = fopen("./spread.access_ip", "r")) ) -- Alarm( PRINT, "ip_init: using file: ./spread.access_ip\n"); +- Alarmp( SPLOG_INFO, ACM, "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"); +- Alarmp( SPLOG_INFO, ACM, "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"); ++ Alarmp( SPLOG_INFO, ACM, "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"); + Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n"); Property changes on: head/net/spread4/files/patch-auth-ip.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread4/files/patch-auth-pword.c =================================================================== --- head/net/spread4/files/patch-auth-pword.c (revision 114424) +++ head/net/spread4/files/patch-auth-pword.c (revision 114425) @@ -1,17 +1,17 @@ ---- auth-pword.c Sun Sep 22 12:56:52 2002 -+++ auth-pword.c Tue Aug 5 21:28:50 2003 +--- auth-pword.c Fri Mar 5 11:32:46 2004 ++++ auth-pword.c Thu Jul 15 21:40:16 2004 @@ -118,12 +118,9 @@ /* load spread.access_ip file */ if (NULL != (fp = fopen(file_name,"r")) ) - Alarm( PRINT, "pword_init: using file: %s\n", file_name); + Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name); - if (fp == NULL) - if (NULL != (fp = fopen("./spread.access_pword", "r")) ) -- Alarm( PRINT, "pword_init: using file: ./spread.access_pword\n"); +- Alarmp( SPLOG_INFO,ACM, "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"); +- Alarmp( SPLOG_INFO, ACM, "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"); ++ Alarmp( SPLOG_INFO, ACM, "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); + Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name); Property changes on: head/net/spread4/files/patch-auth-pword.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/spread4/pkg-plist =================================================================== --- head/net/spread4/pkg-plist (revision 114424) +++ head/net/spread4/pkg-plist (revision 114425) @@ -1,26 +1,26 @@ bin/spflooder bin/spmonitor bin/sptuser bin/spuser etc/rc.d/spread.sh etc/spread.access_ip.sample etc/spread.conf.sample include/sp.h include/sp_events.h include/sp_func.h lib/libspread.a lib/libspread.so lib/libspread.so.1 lib/libtspread.a lib/libtspread.so lib/libtspread.so.1 %%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 @unexec rmdir /var/run/spread 2>/dev/null || true @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true Property changes on: head/net/spread4/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property