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