From owner-freebsd-ports Thu Feb 28 7:50:26 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7891D37B417 for ; Thu, 28 Feb 2002 07:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g1SFo1h52924; Thu, 28 Feb 2002 07:50:01 -0800 (PST) (envelope-from gnats) Received: from green.shallow.net (c17927.smelb1.vic.optusnet.com.au [203.164.123.25]) by hub.freebsd.org (Postfix) with ESMTP id 3403037B41A for ; Thu, 28 Feb 2002 07:46:05 -0800 (PST) Received: by green.shallow.net (Postfix, from userid 1001) id E39D33EE2; Fri, 1 Mar 2002 02:46:01 +1100 (EST) Message-Id: <20020228154601.E39D33EE2@green.shallow.net> Date: Fri, 1 Mar 2002 02:46:01 +1100 (EST) From: Joshua Goodall Reply-To: Joshua Goodall To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/35407: Update of net/spread port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35407 >Category: ports >Synopsis: Update of net/spread port >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Feb 28 07:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Joshua Goodall >Release: FreeBSD 4.5-STABLE i386 >Organization: none >Environment: System: FreeBSD green.shallow.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Fri Feb 1 00:19:52 EST 2002 joshua@green.shallow.net:/usr/obj/usr/src/sys/GREEN i386 >Description: The net/spread port recently lost its maintainer whilst already lagging a few releases behind. I have substantially updated the port files and the diff is attached. In particular, the most recent release is used; PREFIX is properly respected; and problems preventing packaging have been overcome. The committer should upload the source to a MASTER_SITE_LOCAL since the authors original site (http://www.spread.org) requires a personal-details clickthrough. There should be no legal issue with this (there wasn't in the past). n.b. I am also willing to act as maintainer for this port. >How-To-Repeat: >Fix: --- ports::net::spread-patch starts here --- Index: ports/net/spread/Makefile =================================================================== RCS file: /cvs/ports/net/spread/Makefile,v retrieving revision 1.4 diff -u -3 -p -u -r1.4 Makefile --- ports/net/spread/Makefile 20 Jan 2002 16:15:05 -0000 1.4 +++ ports/net/spread/Makefile 28 Feb 2002 15:18:43 -0000 @@ -6,16 +6,17 @@ # PORTNAME= spread -PORTVERSION= 3.15.2 +PORTVERSION= 3.16.1 CATEGORIES= net perl5 java -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= sada +#MASTER_SITES= ${MASTER_SITE_LOCAL} +#MASTER_SITE_SUBDIR= sada +MASTER_SITES= http://www.roughtrade.net/spread/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org .if defined(WITH_JAVA_LIB) -BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk +BUILD_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/javac:${PORTSDIR}/java/jdk .endif MAKEFILE= FreeBSD_makefile @@ -27,16 +28,17 @@ MAN3= SP_connect.3 SP_disconnect.3 SP_eq SP_scat_multicast.3 SP_scat_receive.3 USE_PERL5= yes -NO_PACKAGE= "User and group needs to be created" INSTALLS_SHLIB= yes +PKGMESSAGE= ${WRKSRC}/license.txt -JAVASUBDIR= jdk1.1.8 +JDK_VERSION= 1.1.8 +JAVASUBDIR= jdk${JDK_VERSION} JAVADIR= ${PREFIX}/${JAVASUBDIR} -JAVALIBDIR= ${JAVADIR}/lib +JAVALIBDIR= ${PREFIX}/share/java/classes DOCDIR= ${PREFIX}/share/doc/${PORTNAME} .if defined(WITH_JAVA_LIB) -PLIST_SUB+= JAVALIB='' JAVALIBDIR=${JAVASUBDIR}/lib +PLIST_SUB+= JAVALIB='' JAVALIBDIR=share/java/classes .if defined(NOPORTDOCS) PLIST_SUB+= JAVALIB_DOCS='@comment ' .else @@ -51,25 +53,30 @@ MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFL .include post-build: - (cd ${WRKSRC}/perl/Spread-3.15.2-1.03; ${PERL} Makefile.PL; ${MAKE}) + (cd ${WRKSRC}/perl/Spread; ${PERL} Makefile.PL; ${MAKE}) .if defined(WITH_JAVA_LIB) (cd ${WRKSRC}/java; ${JAVADIR}/bin/javac \ splib_src/*.java -d ./) .endif +pre-install: + ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + do-install: - @${SH} ${SCRIPTDIR}/createusergroup ${INSTALL_PROGRAM} ${WRKSRC}/spread ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/flooder ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/monitor ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/user ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/tuser ${PREFIX}/bin + ${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 ${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${PREFIX}/etc/spread.conf.example + ${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_MAN} ${WRKSRC}/docs/spread.1 ${PREFIX}/man/man1 - (cd ${WRKSRC}/perl/Spread-3.15.2-1.03 && ${MAKE} install) + (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} @@ -81,12 +88,14 @@ do-install: .if !defined(NOPORTDOCS) ${INSTALL} -d -o root -g wheel -m 0755 ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCDIR}/LICENSE ${INSTALL} -d -o root -g wheel -m 0755 ${DOCDIR}/perl - ${INSTALL_DATA} ${WRKSRC}/perl/Spread-3.15.2-1.03/README ${DOCDIR}/perl - ${INSTALL_DATA} ${WRKSRC}/perl/Spread-3.15.2-1.03/test.pl ${DOCDIR}/perl + ${INSTALL_DATA} ${WRKSRC}/perl/Spread/README ${DOCDIR}/perl + ${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${DOCDIR}/perl .if defined(WITH_JAVA_LIB) ${INSTALL} -d -o root -g wheel -m 0755 ${DOCDIR}/java ${INSTALL_DATA} ${WRKSRC}/java/readme.txt ${DOCDIR}/java + ${INSTALL_DATA} ${WRKSRC}/java/recThread.java ${DOCDIR}/java ${INSTALL_DATA} ${WRKSRC}/java/Flooder.java ${DOCDIR}/java ${INSTALL_DATA} ${WRKSRC}/java/User.java ${DOCDIR}/java ${INSTALL} -d -o root -g wheel -m 0755 ${DOCDIR}/java/html @@ -96,9 +105,8 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/java/docs/spread/*.html ${DOCDIR}/java/html/spread .endif .endif - @${ECHO} "================================================================================" - @${ECHO} "NB: Create the directory /var/run/spread, with write permissions for the spread" - @${ECHO} "user/group. The spread daemon will chroot there, and fail if it can't." - @${ECHO} "================================================================================" + +post-install: + ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Index: ports/net/spread/distinfo =================================================================== RCS file: /cvs/ports/net/spread/distinfo,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 distinfo --- ports/net/spread/distinfo 25 Oct 2001 14:36:41 -0000 1.1 +++ ports/net/spread/distinfo 28 Feb 2002 12:18:10 -0000 @@ -1 +1 @@ -MD5 (spread-src-3.15.2.tar.gz) = 41a974ba00496362ce3bc733af41dc46 +MD5 (spread-src-3.16.1.tar.gz) = 198a3eeac1a4b66800f4c857f8f40faa Index: ports/net/spread/pkg-descr =================================================================== RCS file: /cvs/ports/net/spread/pkg-descr,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 pkg-descr --- ports/net/spread/pkg-descr 4 Nov 2001 16:06:58 -0000 1.2 +++ ports/net/spread/pkg-descr 28 Feb 2002 14:15:35 -0000 @@ -12,5 +12,3 @@ daemon which runs on each computer that various utility and demonstration programs. WWW: http://www.spread.org/ - -- Anders Nordby Index: ports/net/spread/pkg-install =================================================================== RCS file: ports/net/spread/pkg-install diff -N ports/net/spread/pkg-install --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/pkg-install 28 Feb 2002 15:22:51 -0000 @@ -0,0 +1,51 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +USER=spread +USER_HOMEDIR=/nonexistent +GROUP=spread +RUNDIR=/var/run/spread +NOLOGIN=/sbin/nologin + +case $2 in +PRE-INSTALL) + if pw group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if pw groupadd ${GROUP}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if pw user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + if pw usermod ${USER} -d ${USER_HOMEDIR} + then + echo "Changed home directory of \"${USER}\" to \"${USER_HOMEDIR}\"." + else + echo "Changing home directory of \"${USER}\" to \"${USER_HOMEDIR}\" failed." + exit 1 + fi + else + if pw useradd ${USER} -g ${GROUP} -h - \ + -d ${USER_HOMEDIR} -s ${NOLOGIN} -c "Spread User" + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi + ;; +POST-INSTALL) + if [ ! -d ${RUNDIR} ]; then + install -d -o ${USER} -g ${GROUP} -m 0750 ${RUNDIR} + fi + ;; +*) + echo 'unexpect argument to pkg-install' + ;; +esac Index: ports/net/spread/pkg-plist =================================================================== RCS file: /cvs/ports/net/spread/pkg-plist,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 pkg-plist --- ports/net/spread/pkg-plist 25 Oct 2001 14:36:41 -0000 1.1 +++ ports/net/spread/pkg-plist 28 Feb 2002 15:16:09 -0000 @@ -1,12 +1,16 @@ sbin/spread -bin/flooder -bin/monitor -bin/user -bin/tuser +bin/spflooder +bin/spmonitor +bin/spuser +bin/sptuser include/sp.h -etc/spread.conf.example +include/sp_func.h +include/sp_events.h +etc/spread.conf.sample +etc/spread.access_ip.sample lib/libsp.a lib/libtsp.a +@unexec rmdir /var/run/spread 2>/dev/null || true lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.so lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/Spread.bs lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix @@ -19,6 +23,8 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Spre %%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 @@ -27,10 +33,10 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Spre %%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/deprecated-list.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 @@ -44,6 +50,8 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Spre %%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 @@ -55,5 +63,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Spre %%PORTDOCS%%share/doc/spread/perl/README %%PORTDOCS%%share/doc/spread/perl/test.pl %%PORTDOCS%%share/doc/spread/Readme.txt +%%PORTDOCS%%share/doc/spread/LICENSE %%PORTDOCS%%@dirrm share/doc/spread/perl %%PORTDOCS%%@dirrm share/doc/spread Index: ports/net/spread/files/patch-FreeBSD_makefile =================================================================== RCS file: /cvs/ports/net/spread/files/patch-FreeBSD_makefile,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 patch-FreeBSD_makefile --- ports/net/spread/files/patch-FreeBSD_makefile 25 Oct 2001 14:36:41 -0000 1.1 +++ ports/net/spread/files/patch-FreeBSD_makefile 28 Feb 2002 12:37:12 -0000 @@ -1,5 +1,5 @@ ---- FreeBSD_makefile.orig Mon Oct 2 16:09:34 2000 -+++ FreeBSD_makefile Mon Jun 11 02:10:13 2001 +--- 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 @@ -11,22 +11,22 @@ #CFLAGS = -O does not always work on BSDI pc -CFLAGS = -ansi -c -Wall -O3 -TCFLAGS = $(CFLAGS) -pthread -+CFLAGS+= -ansi -c ++CFLAGS += -ansi -c +TCFLAGS = $(CFLAGS) $(PTHREAD_LIBS) - COBJS = lex.yy.o y.tab.o configuration.o skiplist.o - OBJS = alarm.o events.o memory.o membership.o data_link.o network.o status.o log.o flow_control.o message.o -@@ -28,7 +27,7 @@ - $(CC) -o user user.o libsp.a + 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 - tuser : user.to libtsp.a -- $(CC) -pthread -o tuser user.to libtsp.a -+ $(CC) $(PTHREAD_LIBS) -o tuser user.to libtsp.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 -@@ -64,7 +63,7 @@ - $(CC) $(CFLAGS) $*.c +@@ -78,7 +77,7 @@ + $(CC) $(TCFLAGS) -fPIC -D_REENTRANT $*.c -o $*.tlo .c.to: - $(CC) $(TCFLAGS) -D_THREAD_SAFE -D_REENTRANT $*.c -o $*.to Index: ports/net/spread/files/patch-auth-ip.c =================================================================== RCS file: ports/net/spread/files/patch-auth-ip.c diff -N ports/net/spread/files/patch-auth-ip.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/files/patch-auth-ip.c 28 Feb 2002 12:54:31 -0000 @@ -0,0 +1,13 @@ +--- auth-ip.c.orig Thu Feb 28 23:53:41 2002 ++++ auth-ip.c Thu Feb 28 23:54:21 2002 +@@ -93,8 +93,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("!!PREFIX!!/etc/spread.access_ip", "r")) ) ++ Alarm( PRINT, "ip_init: using file: !!PREFIX!!/etc/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"); Index: ports/net/spread/files/patch-configuration.c =================================================================== RCS file: ports/net/spread/files/patch-configuration.c diff -N ports/net/spread/files/patch-configuration.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/files/patch-configuration.c 28 Feb 2002 12:49:24 -0000 @@ -0,0 +1,13 @@ +--- configuration.c.orig Thu Feb 28 23:46:34 2002 ++++ configuration.c Thu Feb 28 23:47:32 2002 +@@ -113,8 +113,8 @@ + if (NULL != (yyin = fopen("./spread.conf", "r")) ) + Alarm( PRINT, "Conf_init: using file: ./spread.conf\n"); + if (yyin == NULL) +- if (NULL != (yyin = fopen("/etc/spread.conf", "r")) ) +- Alarm( PRINT, "Conf_init: using file: /etc/spread.conf\n"); ++ if (NULL != (yyin = fopen("!!PREFIX!!/etc/spread.conf", "r")) ) ++ Alarm( PRINT, "Conf_init: using file: !!PREFIX!!/etc/spread.conf\n"); + if (yyin == NULL) + Alarm( EXIT, "Conf_init: error opening config file %s\n", + file_name); Index: ports/net/spread/files/patch-docs::spmonitor.1 =================================================================== RCS file: ports/net/spread/files/patch-docs::spmonitor.1 diff -N ports/net/spread/files/patch-docs::spmonitor.1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/files/patch-docs::spmonitor.1 28 Feb 2002 12:51:00 -0000 @@ -0,0 +1,11 @@ +--- docs/spmonitor.1.orig Thu Feb 28 23:50:23 2002 ++++ docs/spmonitor.1 Thu Feb 28 23:48:30 2002 +@@ -32,7 +32,7 @@ + .I ./spread.conf + .RS + The default config file location. +-.I /etc/spread.conf ++.I !!PREFIX!!/etc/spread.conf + is also searched if a local file is not found. + .SH BUGS + The spmonitor works by sending UDP packets to the Spread daemon, so if network Index: ports/net/spread/files/patch-docs::spread.1 =================================================================== RCS file: ports/net/spread/files/patch-docs::spread.1 diff -N ports/net/spread/files/patch-docs::spread.1 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/files/patch-docs::spread.1 28 Feb 2002 12:50:45 -0000 @@ -0,0 +1,11 @@ +--- docs/spread.1.orig Thu Feb 28 23:50:13 2002 ++++ docs/spread.1 Thu Feb 28 23:48:17 2002 +@@ -25,7 +25,7 @@ + .I ./spread.conf + .RS + The default config file location. +-.I /etc/spread.conf ++.I !!PREFIX!!/etc/spread.conf + is also searched if a local file is not found. + .SH DIAGNOSTICS + The daemon will output some startup information to stdout Index: ports/net/spread/scripts/configure =================================================================== RCS file: ports/net/spread/scripts/configure diff -N ports/net/spread/scripts/configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ports/net/spread/scripts/configure 28 Feb 2002 12:48:47 -0000 @@ -0,0 +1,7 @@ +#!/bin/sh + +cd ${WRKSRC} && \ +for f in configuration.c auth-ip.c docs/spread.1 docs/spmonitor.1; do + mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && + rm $f.orig +done Index: ports/net/spread/scripts/createusergroup =================================================================== RCS file: ports/net/spread/scripts/createusergroup diff -N ports/net/spread/scripts/createusergroup --- ports/net/spread/scripts/createusergroup 25 Oct 2001 14:36:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin - -USER=spread -USER_HOMEDIR=/nonexistent -GROUP=spread - -if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." -else - if pw groupadd ${GROUP}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi -fi - -if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - if pw usermod ${USER} -d ${USER_HOMEDIR} - then - echo "Changed home directory of \"${USER}\" to \"${USER_HOMEDIR}\"." - else - echo "Changing home directory of \"${USER}\" to \"${USER_HOMEDIR}\" failed." - exit 1 - fi -else - if pw useradd ${USER} -g ${GROUP} -h - \ - -d ${USER_HOMEDIR} -s /sbin/nologin -c "Spread User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - fi -fi --- ports::net::spread-patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message