Date: Mon, 25 Dec 2006 12:31:02 -0700 (MST) From: Aaron Dalton <aaron@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/107196: [PATCH] net/spread: [SUMMARIZE CHANGES] Message-ID: <200612251931.kBPJV28J053887@moondance.itsy-bitsy.net> Resent-Message-ID: <200612251940.kBPJeGg5095180@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 107196
>Category: ports
>Synopsis: [PATCH] net/spread: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 25 19:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Aaron Dalton
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD moondance.itsy-bitsy.net 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun Jul 9 11:58:50 MDT
>Description:
General port cleanup, include RC_SUBR and PORTDOCS changes.
Added file(s):
- files/spread.sh.in
Removed file(s):
- files/spread.sh
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- spread-3.17.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/spread/Makefile,v
retrieving revision 1.20
diff -u -u -r1.20 Makefile
--- Makefile 5 Sep 2006 05:03:52 -0000 1.20
+++ Makefile 25 Dec 2006 19:31:19 -0000
@@ -17,15 +17,14 @@
GNU_CONFIGURE= yes
USE_PERL5= yes
-USE_RC_SUBR= yes
-INSTALLS_SHLIB= yes
+USE_RC_SUBR= spread.sh
+USE_LDCONFIG= yes
MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
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 \
@@ -52,15 +51,11 @@
@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}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh
pre-install:
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \
- ${PREFIX}/etc/rc.d/${PORTNAME}.sh
.for f in ${HEADERFILES}
${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include
.endfor
@@ -77,9 +72,9 @@
${PREFIX}/etc/spread.access_ip
.endif
(cd ${WRKSRC}/perl/Spread && ${MAKE} install)
+.if !defined(NOPORTDOCS)
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/spread/pkg-plist,v
retrieving revision 1.10
diff -u -u -r1.10 pkg-plist
--- pkg-plist 18 Apr 2006 08:51:11 -0000 1.10
+++ pkg-plist 25 Dec 2006 19:31:19 -0000
@@ -2,13 +2,10 @@
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
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
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
@@ -18,14 +15,15 @@
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
-%%EXAMPLESDIR%%/test.pl
-@exec mkdir -p /var/run/spread
-@unexec rmdir /var/run/spread 2>/dev/null || true
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
-@dirrmtry %%EXAMPLESDIR%%
+sbin/spread
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread
Index: files/spread.sh
===================================================================
RCS file: files/spread.sh
diff -N files/spread.sh
--- files/spread.sh 20 Feb 2006 20:47:30 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/spread/files/spread.sh,v 1.3 2006/02/20 20:47:30 dougb Exp $
-#
-
-# PROVIDE: spread
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable spread:
-#
-#spread_enable="YES"
-#
-# See spread(1) for flags
-#
-
-. %%RC_SUBR%%
-
-name=spread
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/sbin/spread"
-command_args=""
-pidfile=/var/run/${name}.pid
-required_files=%%PREFIX%%/etc/${name}.conf
-
-# set defaults
-
-spread_enable=${spread_enable:-"NO"}
-spread_flags=${spread_flags:-""}
-
-load_rc_config ${name}
-run_rc_command "$1"
Index: files/spread.sh.in
===================================================================
RCS file: files/spread.sh.in
diff -N files/spread.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/spread.sh.in 25 Dec 2006 19:31:19 -0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: spread
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable spread:
+#
+#spread_enable="YES"
+#
+# See spread(1) for flags
+#
+
+. %%RC_SUBR%%
+
+name=spread
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/spread"
+command_args=""
+pidfile=/var/run/${name}.pid
+required_files=%%PREFIX%%/etc/${name}.conf
+
+# set defaults
+
+spread_enable=${spread_enable:-"NO"}
+spread_flags=${spread_flags:-""}
+
+load_rc_config ${name}
+run_rc_command "$1"
--- spread-3.17.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200612251931.kBPJV28J053887>