View | Details | Raw Unified | Return to bug 191046 | Differences between
and this patch

Collapse All | Expand All

(-)moosefs-master/Makefile (-39 / +31 lines)
Lines 1-49 Link Here
1
# Created by: Chifeng Qu <chifeng@gmail.com>
1
# Created by: Chifeng Qu <chifeng@gmail.com>
2
# $FreeBSD: head/sysutils/moosefs-master/Makefile 339634 2014-01-13 21:00:02Z rene $
2
# $FreeBSD: head/sysutils/moosefs-master/Makefile 339634 2014-01-13 21:00:02Z rene $
3
3
4
PORTNAME=	moosefs
4
PORTNAME=		moosefs
5
PORTVERSION=	#set via include
5
DISTVERSION=		1.6.27-5
6
CATEGORIES=	sysutils
6
CATEGORIES=		sysutils
7
PKGNAMESUFFIX=	-master
7
MASTER_SITES=		http://www.moosefs.org/tl_files/mfscode/ \
8
NO_STAGE=	yes
8
			http://ports.quxingwen.com/dist/mfs/
9
.include "bsd.port.moosefs.mk"
9
PKGNAMESUFFIX=		-master
10
10
DISTNAME=		mfs-${DISTVERSION}
11
MAINTAINER=	chifeng@gmail.com
11
12
COMMENT=	Managing the whole filesystem and storing metadata
12
MAINTAINER=		chifeng@gmail.com
13
13
COMMENT=		Managing the whole filesystem and storing metadata
14
USE_PYTHON=	yes
14
15
15
LICENSE=		GPLv3
16
USE_RC_SUBR=	mfsmaster mfsmetalogger mfscgiserv
16
17
MFS_CGIDIR=	${PREFIX}/share/mfscgi
17
WRKSRC=			${WRKDIR}/mfs-1.6.27
18
SUB_FILES+=	pkg-install pkg-message pkg-deinstall
18
USERS=			mfs
19
SUB_LIST+=	MFS_WORKDIR="${MFS_WORKDIR}"
19
GROUPS=			mfs
20
GNU_CONFIGURE=		yes
21
USE_PYTHON=		yes
22
23
USE_RC_SUBR=		mfsmaster mfsmetalogger mfscgiserv
24
SUB_FILES=		pkg-message
25
SUB_LIST=		PYTHON_CMD=${PYTHON_CMD}
20
26
21
CONFIGURE_ARGS+=	--localstatedir=${MFS_WORKDIR} \
27
CONFIGURE_ARGS+=	--localstatedir=/var \
22
			--enable-mfsmaster \
28
			--enable-mfsmaster \
23
			--with-mfscgiserv-dir=${PREFIX}/sbin \
24
			--enable-mfscgiserv \
29
			--enable-mfscgiserv \
25
			--enable-mfscgi \
30
			--enable-mfscgi \
26
			--with-mfscgi-dir=${MFS_CGIDIR} \
27
			--disable-mfschunkserver \
31
			--disable-mfschunkserver \
28
			--disable-mfsmount
32
			--disable-mfsmount \
29
33
			--with-default-user=mfs \
30
MAN5=		mfsmaster.cfg.5 mfsexports.cfg.5 mfsmetalogger.cfg.5 mfstopology.cfg.5
34
			--with-default-group=mfs \
31
MAN7=		moosefs.7 mfs.7
35
			--with-mfscgiserv-dir=${PREFIX}/sbin \
32
MAN8=		mfscgiserv.8 mfsmaster.8 mfsmetarestore.8 mfsmetalogger.8
36
			--with-mfscgi-dir=${PREFIX}/share/mfscgi
33
34
.include <bsd.port.pre.mk>
35
36
pre-install:
37
	${MKDIR} ${MFS_CGIDIR}
38
39
post-install:
40
.for FILE in mfsmaster mfsexports mfsmetalogger mfstopology
41
	@if [ ! -f ${PREFIX}/etc/${FILE}.cfg ]; then \
42
		${CP} ${PREFIX}/etc/mfs/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
43
	fi
44
.endfor
45
37
46
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
38
post-patch:
47
	@${CAT} ${PKGMESSAGE}
39
	${REINPLACE_CMD} -e 's|#\!/usr/bin/env python|#\!${PYTHON_CMD}|' ${WRKSRC}/mfscgi/cgiserv.py.in
48
40
49
.include <bsd.port.post.mk>
41
.include <bsd.port.mk>
(-)moosefs-master/bsd.port.moosefs.mk (-14 lines)
Lines 1-14 Link Here
1
PORTVERSION=	1.6.27
2
PORTREVISION?=	0
3
MASTER_SITES=	http://www.moosefs.org/tl_files/mfscode/ \
4
		http://ports.quxingwen.com/dist/mfs/
5
6
DISTNAME=	mfs-${PORTVERSION}-1
7
WRKSRC=		${WRKDIR}/mfs-${PORTVERSION}
8
9
LICENSE=	GPLv3
10
11
USERS=		mfs
12
GROUPS=		mfs
13
GNU_CONFIGURE=	yes
14
MFS_WORKDIR=	/var
(-)moosefs-master/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (mfs-1.6.27-1.tar.gz) = dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28
1
SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
2
SIZE (mfs-1.6.27-1.tar.gz) = 771983
2
SIZE (mfs-1.6.27-5.tar.gz) = 784507
(-)moosefs-master/files/mfscgiserv.in (-12 / +11 lines)
Lines 10-16 Link Here
10
#
10
#
11
# Add the following lines to /etc/rc.conf or /etc/rc.conf.local to enable mfscgiserv:
11
# Add the following lines to /etc/rc.conf or /etc/rc.conf.local to enable mfscgiserv:
12
#
12
#
13
# mfscgiserv_enable="YES"
13
# mfscgiserv_enable (bool):    Set to NO by default.
14
#                              Set it to YES to enable mfscgiserv.
15
# mfscgiserv_flags (str):      Set to "" by default.
16
#                              Extra flags passed to mfscgiserv.
14
#
17
#
15
18
16
. /etc/rc.subr
19
. /etc/rc.subr
Lines 18-35 Link Here
18
name=mfscgiserv
21
name=mfscgiserv
19
rcvar=mfscgiserv_enable
22
rcvar=mfscgiserv_enable
20
23
21
command=%%PREFIX%%/sbin/mfscgiserv
24
load_rc_config $name
25
: ${mfscgiserv_enable=NO}
22
26
23
stop_postcmd=stop_postcmd
27
mfscgiserv_user=mfs
24
28
25
stop_postcmd()
29
command_interpreter=%%PYTHON_CMD%%
26
{
30
command=%%PREFIX%%/sbin/mfscgiserv
27
  rm -f $pidfile
31
28
}
32
#procname=%%PYTHON_CMD%%
29
30
# set defaults
31
mfscgiserv_enable=${mfscgiserv_enable:-"NO"}
32
procname="python"
33
33
34
load_rc_config $name
35
run_rc_command "$1"
34
run_rc_command "$1"
(-)moosefs-master/files/mfsmaster.in (-13 / +13 lines)
Lines 8-16 Link Here
8
# KEYWORD: shutdown
8
# KEYWORD: shutdown
9
9
10
#
10
#
11
# Add the following lines to /etc/rc.conf to enable mfsmaster:
11
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfsmaster:
12
#
12
#
13
# mfsmaster_enable="YES"
13
# mfsmaster_enable (bool):   Set to NO by default.
14
#                            Set it to YES to enable mfsmaster.
15
# mfsmaster_config (path):   Set to %%PREFIX%%/etc/mfs/mfsmaster.cfg
16
#                            by default.
17
# mfsmaster_flags (str):     Set to ""  by default.
18
#                            Extra flags passed to mfsmaster.
14
#
19
#
15
20
16
. /etc/rc.subr
21
. /etc/rc.subr
Lines 18-35 Link Here
18
name=mfsmaster
23
name=mfsmaster
19
rcvar=mfsmaster_enable
24
rcvar=mfsmaster_enable
20
25
21
command=%%PREFIX%%/sbin/${name}
26
load_rc_config $name
22
27
23
stop_postcmd=stop_postcmd
28
: ${mfsmaster_enable=NO}
29
: ${mfsmaster_config=%%PREFIX%%/etc/mfs/mfsmaster.cfg}
24
30
25
stop_postcmd()
31
extra_commands=reload
26
{
32
command=%%PREFIX%%/sbin/${name}
27
  rm -f $pidfile
33
command_args="-c ${mfsmaster_config}"
28
}
29
30
# set defaults
31
mfsmaster_enable=${mfsmaster_enable:-"NO"}
32
mfsmaster_flags=${mfsmaster_flags:-"-c %%PREFIX%%/etc/mfsmaster.cfg"}
33
34
34
load_rc_config $name
35
run_rc_command "$1"
35
run_rc_command "$1"
(-)moosefs-master/files/mfsmetalogger.in (-16 / +15 lines)
Lines 1-36 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
#
3
# $FreeBSD: head/sysutils/moosefs-master/files/mfsmetalogger.in 340872 2014-01-24 00:14:07Z mat $
3
# $FreeBSD: head/sysutils/moosefs-master/files/mfsmetalogger.in 340872 2014-01-24 00:14:07Z mat $
4
#
4
#
5
5
# PROVIDE: mfsmetalogger
6
# PROVIDE: mfsmetalogger
6
# REQUIRE: LOGIN
7
# REQUIRE: LOGIN
7
# KEYWORD: shutdown
8
# KEYWORD: shutdown
9
8
#
10
#
9
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
11
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfsmetalogger:
10
# to enable this service:
11
#
12
#
12
# mfsmetalogger_enable (bool):   Set to NO by default.
13
# mfsmetalogger_enable (bool):   Set to NO by default.
13
#               Set it to YES to enable doormand.
14
#                                Set it to YES to enable mfsmetalogger.
14
# mfsmetalogger_config (path):   Set to %%PREFIX%%/etc/mfsmetalogger.cfg
15
# mfsmetalogger_config (path):   Set to %%PREFIX%%/etc/mfs/mfsmetalogger.cfg
15
#               by default.
16
#                                by default.
17
# mfsmetalogger_flags (str):     Set to "" by default.
18
#                                Extra flags passed to mfsmetalogger.
16
#
19
#
17
20
18
. /etc/rc.subr
21
. /etc/rc.subr
19
22
20
name="mfsmetalogger"
23
name=mfsmetalogger
21
rcvar=mfsmetalogger_enable
24
rcvar=mfsmetalogger_enable
22
25
23
command=%%PREFIX%%/sbin/${name}
24
#pidfile=/var/run/${name}.pid
25
config_file=%%PREFIX%%/etc/${name}.cfg
26
27
load_rc_config $name
26
load_rc_config $name
28
27
29
: ${mfsmetalogger_enable="NO"}
28
: ${mfsmetalogger_enable=NO}
30
: ${mfsmetalogger_config="%%PREFIX%%/etcaster"}
29
: ${mfsmetalogger_config=%%PREFIX%%/etc/mfs/mfsmetalogger.cfg}
31
30
32
#command_args="-p $pidfile -f $doormand_config"
31
extra_commands=reload
33
command_args="-c $config_file"
32
command=%%PREFIX%%/sbin/${name}
33
command_args="-c ${mfsmetalogger_config}"
34
34
35
run_rc_command "$1"
35
run_rc_command "$1"
36
(-)moosefs-master/files/pkg-deinstall.in (-14 lines)
Lines 1-14 Link Here
1
#!/bin/sh
2
# $FreeBSD: head/sysutils/moosefs-master/files/pkg-deinstall.in 340719 2014-01-22 15:52:06Z mat $
3
4
PATH="/bin:/sbin:/usr/bin:/usr/sbin"
5
6
WORKFILE=%%MFS_WORKDIR%%/mfs/metadata.mfs.empty
7
WORKDIR=%%MFS_WORKDIR%%/mfs
8
9
if [ "$2" = "POST-DEINSTALL" ]; then
10
	echo "=> Deleting ${WORKFILE} if empty..."
11
	rm -f ${WORKFILE} 2>/dev/null || true
12
	echo "=> Deleting ${WORKDIR} if empty..."
13
	rm -d ${WORKDIR} 2>/dev/null || true
14
fi
(-)moosefs-master/files/pkg-install.in (-37 lines)
Lines 1-37 Link Here
1
#!/bin/sh
2
3
PATH=/bin:/usr/sbin
4
5
if [ "$2" != "PRE-INSTALL" ]; then
6
	exit 0
7
fi
8
9
	USER=mfs
10
	GROUP=${USER}
11
	UID=925
12
	GID=${UID}
13
14
	if pw group show "${GROUP}" 2>/dev/null; then
15
		echo "You already have a group \"${GROUP}\", so I will use it."
16
	else
17
		if pw groupadd ${GROUP} -g ${GID}; then
18
			echo "Added group \"${GROUP}\"."
19
		else
20
			echo "Adding group \"${GROUP}\" failed..."
21
			exit 1
22
		fi
23
	fi
24
25
	if pw user show "${USER}" 2>/dev/null; then
26
		echo "You already have a user \"${USER}\", so I will use it."
27
	else
28
		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
29
			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
30
		then
31
			echo "Added user \"${USER}\"."
32
		else
33
			echo "Adding user \"${USER}\" failed..."
34
			exit 1
35
		fi
36
	fi
37
exit 0
(-)moosefs-master/pkg-plist (-16 / +30 lines)
Lines 1-26 Link Here
1
@exec  if [ ! -f %D/etc/mfsmaster.cfg ]; then /bin/cp %D/%F %D/etc/mfsmaster.cfg; fi
1
@unexec if cmp -s %D/etc/mfs/mfsexports.cfg.dist %D/etc/mfs/mfsexports.cfg; then rm -f %D/etc/mfs/mfsexports.cfg; fi
2
@exec  if [ ! -f %D/etc/mfsexports.cfg ]; then /bin/cp %D/%F %D/etc/mfsexports.cfg; fi
3
@exec  if [ ! -f %D/etc/mfsmetalogger.cfg ]; then /bin/cp %D/%F %D/etc/mfsmetalogger.cfg; fi
4
@exec  if [ ! -f %D/etc/mfstopology.cfg ]; then /bin/cp %D/%F %D/etc/mfstopology.cfg; fi
5
@unexec if cmp -s %D/etc/mfs/mfsmaster.cfg.dist %D/etc/mfsmaster.cfg; then rm -f %D/etc/mfsmaster.cfg; fi
6
@unexec if cmp -s %D/etc/mfs/mfsexports.cfg.dist %D/etc/mfsexports.cfg; then rm -f %D/etc/mfsexports.cfg; fi
7
@unexec if cmp -s %D/etc/mfs/mfsmetalogger.cfg.dist %D/etc/mfsmetalogger.cfg; then rm -f %D/etc/mfsmetalogger.cfg; fi
8
@unexec if cmp -s %D/etc/mfs/mfstopology.cfg.dist %D/etc/mfstopology.cfg; then rm -f %D/etc/mfstopology.cfg; fi
9
etc/mfs/mfsmaster.cfg.dist
10
etc/mfs/mfsexports.cfg.dist
2
etc/mfs/mfsexports.cfg.dist
3
@exec if [ ! -f %D/etc/mfs/mfsexports.cfg ]; then /bin/cp %D/%F %D/etc/mfs/mfsexports.cfg; chmod u+w %D/etc/mfs/mfsexports.cfg; fi
4
@unexec if cmp -s %D/etc/mfs/mfsmaster.cfg.dist %D/etc/mfs/mfsmaster.cfg; then rm -f %D/etc/mfs/mfsmaster.cfg; fi
5
etc/mfs/mfsmaster.cfg.dist
6
@exec if [ ! -f %D/etc/mfs/mfsmaster.cfg ]; then /bin/cp -p %D/%F %D/etc/mfs/mfsmaster.cfg; chmod u+w %D/etc/mfs/mfsmaster.cfg; fi
7
@unexec if cmp -s %D/etc/mfs/mfsmetalogger.cfg.dist %D/etc/mfs/mfsmetalogger.cfg; then rm -f %D/etc/mfs/mfsmetalogger.cfg; fi
11
etc/mfs/mfsmetalogger.cfg.dist
8
etc/mfs/mfsmetalogger.cfg.dist
9
@exec if [ ! -f %D/etc/mfs/mfsmetalogger.cfg ]; then /bin/cp %D/%F %D/etc/mfs/mfsmetalogger.cfg; chmod u+w %D/etc/mfs/mfsmetalogger.cfg; fi
10
@unexec if cmp -s %D/etc/mfs/mfstopology.cfg.dist %D/etc/mfs/mfstopology.cfg; then rm -f %D/etc/mfs/mfstopology.cfg; fi
12
etc/mfs/mfstopology.cfg.dist
11
etc/mfs/mfstopology.cfg.dist
12
@exec if [ ! -f %D/etc/mfs/mfstopology.cfg ]; then /bin/cp %D/%F %D/etc/mfs/mfstopology.cfg; chmod u+w %D/etc/mfs/mfstopology.cfg; fi
13
@dirrm etc/mfs
14
man/man5/mfsexports.cfg.5.gz
15
man/man5/mfsmaster.cfg.5.gz
16
man/man5/mfsmetalogger.cfg.5.gz
17
man/man5/mfstopology.cfg.5.gz
18
man/man7/mfs.7.gz
19
man/man7/moosefs.7.gz
20
man/man8/mfscgiserv.8.gz
21
man/man8/mfsmaster.8.gz
22
man/man8/mfsmetalogger.8.gz
23
man/man8/mfsmetarestore.8.gz
13
sbin/mfscgiserv
24
sbin/mfscgiserv
14
sbin/mfsmaster
25
sbin/mfsmaster
15
sbin/mfsmetarestore
16
sbin/mfsmetadump
26
sbin/mfsmetadump
17
sbin/mfsmetalogger
27
sbin/mfsmetalogger
18
share/mfscgi/mfs.cgi
28
sbin/mfsmetarestore
19
share/mfscgi/mfs.css
20
share/mfscgi/logomini.png
21
share/mfscgi/index.html
22
share/mfscgi/err.gif
23
share/mfscgi/chart.cgi
29
share/mfscgi/chart.cgi
30
share/mfscgi/err.gif
24
share/mfscgi/favicon.ico
31
share/mfscgi/favicon.ico
25
@dirrm etc/mfs
32
share/mfscgi/index.html
33
share/mfscgi/logomini.png
34
share/mfscgi/mfs.cgi
35
share/mfscgi/mfs.css
26
@dirrm share/mfscgi
36
@dirrm share/mfscgi
37
@owner mfs
38
@group mfs
39
/var/mfs/metadata.mfs.empty
40
@unexec rmdir "/var/mfs" >/dev/null 2>&1 || :

Return to bug 191046