net/spread4

- update spread4 to 4.2.0
 - the port has a dedicated user/group, so use them in the rc script (instead root)
 - use dedicated log directory
 - assign port to ports@

devel/pecl-spread
 - bump PORTREVISION

PR:		175510
Submitted by:	Javier Martin Rueda <jmrueda@diatel.upm.es>
This commit is contained in:
Olli Hauer 2013-03-03 18:12:06 +00:00
parent 4d5eec6a61
commit f5e450a425
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=313372
9 changed files with 73 additions and 35 deletions

View File

@ -1,13 +1,9 @@
# New ports collection makefile for: pecl-spread
# Date created: 10 June 2008
# Whom: Wen Heping <wenheping@gmail.com>
#
# Created by: Wen Heping <wenheping@gmail.com>
# $FreeBSD$
#
PORTNAME= spread
PORTVERSION= 2.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-

View File

@ -1,18 +1,13 @@
# New ports collection makefile for: spread
# Date created: 11 June 2001
# Whom: Anders Nordby <anders@fix.no>
#
# Created by: Anders Nordby <anders@fix.no>
# $FreeBSD$
#
PORTNAME= spread4
PORTVERSION= 4.1.0
PORTREVISION= 1
PORTVERSION= 4.2.0
CATEGORIES= net perl5
MASTER_SITES= LOCAL/wen
MASTER_SITES= LOCAL/ohauer
DISTNAME= spread-src-${PORTVERSION}
MAINTAINER= apache@FreeBSD.org
MAINTAINER= ports@FreeBSD.org
COMMENT= The Spread Group Communication System, a network toolkit
GNU_CONFIGURE= yes
@ -26,6 +21,7 @@ GROUPS= spread
RUNDIR= /var/run/spread
PLIST_SUB+= USERS=${USERS} GROUPS=${GROUPS} RUNDIR=${RUNDIR}
SUB_LIST+= USERS=${USERS} GROUPS=${GROUPS}
WRKSRC= ${WRKDIR}/spread-src-${PORTVERSION}
@ -51,18 +47,18 @@ post-extract:
${WRKSRC}/Makefile.in
post-install:
${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.conf \
${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.conf \
${PREFIX}/etc/spread.conf.sample
${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.access_ip \
${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip.sample
.if !exists(${PREFIX}/etc/spread.conf)
${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.conf \
${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.conf \
${PREFIX}/etc/spread.conf
.endif
.if !exists(${PREFIX}/etc/spread.access_ip)
${INSTALL_DATA} ${WRKSRC}/docs/sample.spread.access_ip \
${INSTALL_DATA} -m 644 ${WRKSRC}/docs/sample.spread.access_ip \
${PREFIX}/etc/spread.access_ip
.endif

View File

@ -1,2 +1,2 @@
SHA256 (spread-src-4.1.0.tar.gz) = 764d84ecf06877802c805efc1e84bbb362f14c791829e88d62fcba9951a68cdd
SIZE (spread-src-4.1.0.tar.gz) = 641060
SHA256 (spread-src-4.2.0.tar.gz) = 0f234c211eadc26002e31343bdd1e343f4956f5665edd4db92751ef1d595bb5c
SIZE (spread-src-4.2.0.tar.gz) = 736189

View File

@ -0,0 +1,11 @@
--- daemon/Makefile.in.orig 2012-03-21 00:26:01.000000000 +0100
+++ daemon/Makefile.in 2013-01-22 12:02:35.000000000 +0100
@@ -30,7 +30,7 @@
LIBSPREADUTIL_DIR=../libspread-util
LIBSPREADUTIL_PATHS=-I$(LIBSPREADUTIL_DIR)/include -I$(top_srcdir)/libspread-util/include
LIBSPREADUTIL_LDFLAGS=-rdynamic
-LIBSPREADUTIL_LIBS=-ldl
+LIBSPREADUTIL_LIBS=
CC=@CC@
LD=@LD@

View File

@ -0,0 +1,10 @@
--- daemon/monitor.c.orig 2012-03-21 04:17:52.000000000 +0100
+++ daemon/monitor.c 2013-01-22 12:21:25.000000000 +0100
@@ -39,6 +39,7 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
+#include <sys/stdint.h>
#include "arch.h"
#include "mutex.h"

View File

@ -4,7 +4,7 @@
# "spreadlog_machine2.mydomain.com.log" respectively.
#EventLogFile = testlog.out
+EventLogFile = /var/log/spread.log
+EventLogFile = /var/log/spread/spread.log
#Set whether to add a timestamp in front of all logged events or not.
# Default is no timestamps. Default format is "[%a %d %b %Y %H:%M:%S]".

View File

@ -0,0 +1,11 @@
--- examples/Makefile.in.orig 2012-03-21 00:26:01.000000000 +0100
+++ examples/Makefile.in 2013-01-22 12:02:41.000000000 +0100
@@ -30,7 +30,7 @@
LIBSPREADUTIL_DIR=../libspread-util
LIBSPREADUTIL_PATHS=-I$(LIBSPREADUTIL_DIR)/include -I$(top_srcdir)/libspread-util/include
LIBSPREADUTIL_LDFLAGS=-rdynamic
-LIBSPREADUTIL_LIBS=-ldl
+LIBSPREADUTIL_LIBS=
CC=@CC@
LD=@LD@

View File

@ -19,15 +19,29 @@
name=spread
rcvar=spread_enable
command="%%PREFIX%%/sbin/spread"
pidfile=/var/run/${name}.pid
required_files=%%PREFIX%%/etc/${name}.conf
load_rc_config ${name}
# set defaults
spread_enable=${spread_enable:-"NO"}
spread_user=%%USERS%%
spread_group=%%GROUPS%%
command="%%PREFIX%%/sbin/spread"
required_files=%%PREFIX%%/etc/${name}.conf
pidfile=/var/run/${name}.pid
start_cmd=spread_start
stop_postcmd=spread_cleanup
spread_start() {
echo "Starting spread."
/usr/bin/install -o ${spread_user} -g ${spread_group} -d /var/log/spread
/usr/bin/touch ${pidfile} && /usr/sbin/chown ${spread_user}:${spread_group} ${pidfile}
/usr/sbin/daemon -cf -p ${pidfile} -u ${spread_user} ${command} ${spread_flags}
}
spread_cleanup() {
[ -f ${pidfile} ] && rm -f ${pidfile}
}
load_rc_config ${name}
run_rc_command "$1"

View File

@ -17,14 +17,14 @@ lib/libspread.a
lib/libspread-core.a
lib/libtspread-core.a
lib/libspread.so
lib/libspread.so.2
lib/libspread.so.2.0.1
lib/libspread.so.3
lib/libspread.so.3.0.0
lib/libspread-core.so
lib/libspread-core.so.2
lib/libspread-core.so.2.0.1
lib/libspread-core.so.3
lib/libspread-core.so.3.0.0
lib/libtspread-core.so
lib/libtspread-core.so.2
lib/libtspread-core.so.2.0.1
lib/libtspread-core.so.3
lib/libtspread-core.so.3.0.0
sbin/spread
%%PORTDOCS%%%%DOCSDIR%%/DynamicConfiguration.txt
%%PORTDOCS%%%%DOCSDIR%%/Flush_or_SpreadAPI.txt