diff -ruN moosefs-master.orig/Makefile moosefs-master/Makefile
--- moosefs-master.orig/Makefile	2015-06-10 19:33:58.000000000 +0200
+++ moosefs-master/Makefile	2015-07-20 00:07:28.112023000 +0200
@@ -1,43 +1,107 @@
-# Created by: Chifeng Qu <chifeng@gmail.com>
-# $FreeBSD: head/sysutils/moosefs-master/Makefile 389104 2015-06-10 17:33:58Z amdmi3 $
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
 
-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=	ports@FreeBSD.org
-COMMENT=	Managing the whole filesystem and storing metadata
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-WRKSRC=		${WRKDIR}/mfs-1.6.27
-USERS=		mfs
-GROUPS=		mfs
-GNU_CONFIGURE=	yes
-USES=		python
-
-USE_RC_SUBR=	mfsmaster mfsmetalogger mfscgiserv
-SUB_FILES=	pkg-message
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
-
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-mfsmaster \
-		--enable-mfscgiserv \
-		--enable-mfscgi \
-		--disable-mfschunkserver \
-		--disable-mfsmount \
-		--with-default-user=mfs \
-		--with-default-group=mfs \
-		--with-mfscgiserv-dir=${PREFIX}/sbin \
-		--with-mfscgi-dir=${PREFIX}/share/mfscgi
-
-post-patch:
-	${REINPLACE_CMD} -e 's|#\!/usr/bin/env python|#\!${PYTHON_CMD}|' \
-		${WRKSRC}/mfscgi/cgiserv.py.in
+PORTNAME=		moosefs
+PORTVERSION=		2.0.72
+CATEGORIES=		sysutils
+MASTER_SITES=		http://ppa.moosefs.com/src/
+PKGNAMESUFFIX?=		-master
+DISTNAME=		${PORTNAME}-${PORTVERSION}-1
+
+MAINTAINER=		freebsd@moosefs.com
+COMMENT?=		Managing the whole filesystem and storing metadata
+
+LICENSE=		GPLv2
+
+USES=			python:build
+GNU_CONFIGURE=		yes
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PLIST=			${.CURDIR}/pkg-plist
+DESCR=			${.CURDIR}/pkg-descr
+
+MFS_COMPONENT?=		master
+MFS_USER=		mfs
+MFS_GROUP=		mfs
+MFS_WORKDIR=		/var
+
+USERS=			${MFS_USER}
+GROUPS=			${MFS_GROUP}
+
+CONFIGURE_ARGS+=	--localstatedir=${MFS_WORKDIR} \
+			--with-default-user=${MFS_USER} \
+			--with-default-group=${MFS_GROUP} \
+
+.if ${MFS_COMPONENT} == cgi
+MFS_CGIDIR=		${PREFIX}/share/mfscgi
+USES=			python:2.5+
+CONFIGURE_ARGS+=	--enable-mfscgi \
+			--with-mfscgi-dir=${MFS_CGIDIR}
+.else
+CONFIGURE_ARGS+=	--disable-mfscgi
+.endif
+
+.if ${MFS_COMPONENT} == cgiserv
+MFS_CGISERVDIR=		${PREFIX}/sbin
+USES=			python:2.5+
+USE_RC_SUBR=		mfscgiserv
+SUB_FILES+=		pkg-message-cgiserv
+PKGMESSAGE=		${WRKDIR}/pkg-message-cgiserv
+PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
+CONFIGURE_ARGS+=	--enable-mfscgiserv \
+			--with-mfscgiserv-dir=${MFS_CGISERVDIR}
+RUN_DEPENDS=		moosefs-cgi>0:${PORTSDIR}/sysutils/moosefs-cgi
+.else
+CONFIGURE_ARGS+=	--disable-mfscgiserv
+.endif
+
+.if ${MFS_COMPONENT} == chunkserver
+USE_RC_SUBR=		mfschunkserver
+SUB_FILES+=		pkg-message-chunkserver
+PKGMESSAGE=		${WRKDIR}/pkg-message-chunkserver
+PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
+CONFIGURE_ARGS+=	--enable-mfschunkserver
+.else
+CONFIGURE_ARGS+=	--disable-mfschunkserver
+.endif
+
+.if ${MFS_COMPONENT} == cli
+USES=			python:2.5+
+CONFIGURE_ARGS+=	--enable-mfscli
+.else
+CONFIGURE_ARGS+=	--disable-mfscli
+.endif
+
+.if ${MFS_COMPONENT} == client
+USES=			fuse pkgconfig
+CONFIGURE_ARGS+=	--enable-mfsmount
+.else
+CONFIGURE_ARGS+=	--disable-mfsmount
+.endif
+
+.if ${MFS_COMPONENT} == master
+USE_RC_SUBR=		mfsmaster
+PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
+SUB_FILES+=		pkg-message-master
+PKGMESSAGE=		${WRKDIR}/pkg-message-master
+CONFIGURE_ARGS+=	--enable-mfsmaster
+.else
+CONFIGURE_ARGS+=	--disable-mfsmaster
+.endif
+
+.if ${MFS_COMPONENT} == metalogger
+USE_RC_SUBR=		mfsmetalogger
+SUB_FILES+=		pkg-message-metalogger
+PKGMESSAGE=		${WRKDIR}/pkg-message-metalogger
+PLIST_SUB+=		MFS_WORKDIR="${MFS_WORKDIR}"
+CONFIGURE_ARGS+=	--enable-mfsmetalogger
+.else
+CONFIGURE_ARGS+=	--disable-mfsmetalogger
+.endif
+
+.if ${MFS_COMPONENT} == netdump
+CONFIGURE_ARGS+=	--enable-mfsnetdump
+.else
+CONFIGURE_ARGS+=	--disable-mfsnetdump
+.endif
 
 .include <bsd.port.mk>
diff -ruN moosefs-master.orig/distinfo moosefs-master/distinfo
--- moosefs-master.orig/distinfo	2014-07-12 12:16:57.000000000 +0200
+++ moosefs-master/distinfo	2015-07-19 23:18:45.443117000 +0200
@@ -1,2 +1,2 @@
-SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
-SIZE (mfs-1.6.27-5.tar.gz) = 784507
+SHA256 (moosefs-2.0.72-1.tar.gz) = 70811a91d11c9a29b45f83a797acddb15573d7adecfc1ddc991b4e9fe8e97f7b
+SIZE (moosefs-2.0.72-1.tar.gz) = 958217
diff -ruN moosefs-master.orig/files/mfscgiserv.in moosefs-master/files/mfscgiserv.in
--- moosefs-master.orig/files/mfscgiserv.in	2014-07-12 12:16:57.000000000 +0200
+++ moosefs-master/files/mfscgiserv.in	2015-07-09 16:36:24.273261000 +0200
@@ -1,19 +1,12 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/moosefs-master/files/mfscgiserv.in 361607 2014-07-12 10:16:57Z marino $
-#
 
 # PROVIDE: mfscgiserv
-# REQUIRE: LOGIN 
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
-
 #
-# Add the following lines to /etc/rc.conf or /etc/rc.conf.local to enable mfscgiserv:
+# Add the following lines to /etc/rc.conf to enable mfscgiserv:
 #
-# 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.
+# mfscgiserv_enable="YES"
 #
 
 . /etc/rc.subr
@@ -21,12 +14,16 @@
 name=mfscgiserv
 rcvar=mfscgiserv_enable
 
-load_rc_config $name
-: ${mfscgiserv_enable=NO}
+command=%%PREFIX%%/sbin/${name}
+pid_file=%%MFS_WORKDIR%%/mfs/.${name}.lock
+procname="python"
+
+stop_cmd="$command stop"
+status_cmd="$command test"
 
-mfscgiserv_user=mfs
+load_rc_config $name
 
-command_interpreter=%%PYTHON_CMD%%
-command=%%PREFIX%%/sbin/mfscgiserv
+# set defaults
+: ${mfscgiserv_enable="NO"}
 
 run_rc_command "$1"
diff -ruN moosefs-master.orig/files/mfschunkserver.in moosefs-master/files/mfschunkserver.in
--- moosefs-master.orig/files/mfschunkserver.in	1970-01-01 01:00:00.000000000 +0100
+++ moosefs-master/files/mfschunkserver.in	2015-07-09 16:36:24.273261000 +0200
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# PROVIDE: mfschunkserver
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfschunkserver:
+#
+# mfschunkserver_enable="YES"
+#
+
+. /etc/rc.subr
+
+name=mfschunkserver
+rcvar=mfschunkserver_enable
+
+config_file=%%PREFIX%%/etc/mfs/${name}.cfg
+
+required_files=${config_file}
+
+command=%%PREFIX%%/sbin/${name}
+pid_file=%%MFS_WORKDIR%%/mfs/.${name}.lock
+command_args="-c $config_file"
+
+load_rc_config $name
+
+# set defaults
+: ${mfschunkserver_enable="NO"}
+
+run_rc_command "$1"
diff -ruN moosefs-master.orig/files/mfsmaster.in moosefs-master/files/mfsmaster.in
--- moosefs-master.orig/files/mfsmaster.in	2014-07-12 12:16:57.000000000 +0200
+++ moosefs-master/files/mfsmaster.in	2015-07-09 16:36:24.273261000 +0200
@@ -1,21 +1,12 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/moosefs-master/files/mfsmaster.in 361607 2014-07-12 10:16:57Z marino $
-#
 
 # PROVIDE: mfsmaster
-# REQUIRE: LOGIN 
-# KEYWORD: shutdown
-
+# REQUIRE: DAEMON
+# KEYWORD: nostart shutdown
 #
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfsmaster:
+# Add the following lines to /etc/rc.conf to enable mfsmaster:
 #
-# 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.
+# mfsmaster_enable="YES"
 #
 
 . /etc/rc.subr
@@ -23,13 +14,17 @@
 name=mfsmaster
 rcvar=mfsmaster_enable
 
-load_rc_config $name
+config_file=%%PREFIX%%/etc/mfs/${name}.cfg
 
-: ${mfsmaster_enable=NO}
-: ${mfsmaster_config=%%PREFIX%%/etc/mfs/mfsmaster.cfg}
+required_files=${config_file}
 
-extra_commands=reload
 command=%%PREFIX%%/sbin/${name}
-command_args="-c ${mfsmaster_config}"
+pid_file=%%MFS_WORKDIR%%/mfs/.${name}.lock
+command_args="-c $config_file"
+
+load_rc_config $name
+
+# set defaults
+: ${mfsmaster_enable="NO"}
 
 run_rc_command "$1"
diff -ruN moosefs-master.orig/files/mfsmetalogger.in moosefs-master/files/mfsmetalogger.in
--- moosefs-master.orig/files/mfsmetalogger.in	2014-07-12 12:16:57.000000000 +0200
+++ moosefs-master/files/mfsmetalogger.in	2015-07-09 16:36:24.273261000 +0200
@@ -1,21 +1,12 @@
 #!/bin/sh
-#
-# $FreeBSD: head/sysutils/moosefs-master/files/mfsmetalogger.in 361607 2014-07-12 10:16:57Z marino $
-#
 
 # PROVIDE: mfsmetalogger
-# REQUIRE: LOGIN
+# REQUIRE: DAEMON
 # KEYWORD: shutdown
-
 #
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfsmetalogger:
+# Add the following lines to /etc/rc.conf to enable mfsmetalogger:
 #
-# mfsmetalogger_enable (bool):   Set to NO 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.
+# mfsmetalogger_enable="YES"
 #
 
 . /etc/rc.subr
@@ -23,13 +14,17 @@
 name=mfsmetalogger
 rcvar=mfsmetalogger_enable
 
-load_rc_config $name
+config_file=%%PREFIX%%/etc/mfs/${name}.cfg
 
-: ${mfsmetalogger_enable=NO}
-: ${mfsmetalogger_config=%%PREFIX%%/etc/mfs/mfsmetalogger.cfg}
+required_files=${config_file}
 
-extra_commands=reload
 command=%%PREFIX%%/sbin/${name}
-command_args="-c ${mfsmetalogger_config}"
+pid_file=%%MFS_WORKDIR%%/mfs/.${name}.lock
+command_args="-c $config_file"
+
+load_rc_config $name
+
+# set defaults
+: ${mfsmetalogger_enable="NO"}
 
 run_rc_command "$1"
diff -ruN moosefs-master.orig/files/patch-mfsdata_Makefile.in moosefs-master/files/patch-mfsdata_Makefile.in
--- moosefs-master.orig/files/patch-mfsdata_Makefile.in	2014-07-12 12:16:57.000000000 +0200
+++ moosefs-master/files/patch-mfsdata_Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
---- mfsdata/Makefile.in.orig	2013-11-26 11:22:48.000000000 +0000
-+++ mfsdata/Makefile.in
-@@ -470,26 +470,20 @@ install-data-hook:
- 	if [ ! -d $(DESTDIR)$(sysconfdir)"/mfs" ]; then \
- 		$(MKDIR_P) $(DESTDIR)$(sysconfdir)"/mfs" ; \
- 	fi
--@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(builddir)/mfschunkserver.cfg $(DESTDIR)$(sysconfdir)/mfs/mfschunkserver.cfg.dist
--@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(srcdir)/mfshdd.cfg $(DESTDIR)$(sysconfdir)/mfs/mfshdd.cfg.dist
-+@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(builddir)/mfschunkserver.cfg $(DESTDIR)$(sysconfdir)/mfs/mfschunkserver.cfg.sample
-+@BUILD_CHUNKSERVER_TRUE@	$(INSTALL_DATA) $(srcdir)/mfshdd.cfg $(DESTDIR)$(sysconfdir)/mfs/mfshdd.cfg.sample
- @BUILD_CHUNKSERVER_TRUE@	if [ ! -d $(DESTDIR)$(DATA_PATH) ]; then \
- @BUILD_CHUNKSERVER_TRUE@		$(MKDIR_P) $(DESTDIR)$(DATA_PATH) ; \
--@BUILD_CHUNKSERVER_TRUE@		if [ "`id -u`" = "0" ]; then \
--@BUILD_CHUNKSERVER_TRUE@			chown $(DEFAULT_USER):$(DEFAULT_GROUP) $(DESTDIR)$(DATA_PATH) ; \
--@BUILD_CHUNKSERVER_TRUE@		fi ; \
- @BUILD_CHUNKSERVER_TRUE@	fi
--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.cfg.dist
--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmaster.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmaster.cfg.dist
--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsexports.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsexports.cfg.dist
--@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfstopology.cfg $(DESTDIR)$(sysconfdir)/mfs/mfstopology.cfg.dist
-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.cfg.sample
-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmaster.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmaster.cfg.sample
-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsexports.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsexports.cfg.sample
-+@BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(builddir)/mfstopology.cfg $(DESTDIR)$(sysconfdir)/mfs/mfstopology.cfg.sample
- @BUILD_MASTER_TRUE@	if [ ! -d $(DESTDIR)$(DATA_PATH) ]; then \
- @BUILD_MASTER_TRUE@		$(MKDIR_P) $(DESTDIR)$(DATA_PATH) ; \
--@BUILD_MASTER_TRUE@		if [ "`id -u`" = "0" ]; then \
--@BUILD_MASTER_TRUE@			chown $(DEFAULT_USER):$(DEFAULT_GROUP) $(DESTDIR)$(DATA_PATH) ; \
--@BUILD_MASTER_TRUE@		fi ; \
- @BUILD_MASTER_TRUE@	fi
- @BUILD_MASTER_TRUE@	$(INSTALL_DATA) $(srcdir)/metadata.mfs $(DESTDIR)$(DATA_PATH)/metadata.mfs.empty
--@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.dist
-+@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.sample
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff -ruN moosefs-master.orig/files/pkg-message-cgiserv.in moosefs-master/files/pkg-message-cgiserv.in
--- moosefs-master.orig/files/pkg-message-cgiserv.in	1970-01-01 01:00:00.000000000 +0100
+++ moosefs-master/files/pkg-message-cgiserv.in	2015-07-09 16:36:24.273261000 +0200
@@ -0,0 +1,12 @@
+************************************************************************
+
+A startup script has been installed as:
+
+%%PREFIX%%/etc/rc.d/mfscgiserv
+
+Use it to start/stop the mfscgiserv service after you have added
+the following line to your rc.conf file:
+
+mfscgiserv_enable="YES"
+
+************************************************************************
diff -ruN moosefs-master.orig/files/pkg-message-chunkserver.in moosefs-master/files/pkg-message-chunkserver.in
--- moosefs-master.orig/files/pkg-message-chunkserver.in	1970-01-01 01:00:00.000000000 +0100
+++ moosefs-master/files/pkg-message-chunkserver.in	2015-07-09 16:36:24.273261000 +0200
@@ -0,0 +1,12 @@
+************************************************************************
+
+A startup script has been installed as:
+
+%%PREFIX%%/etc/rc.d/mfschunkserver
+
+Use it to start/stop the mfschunkserver service after you have added
+the following line to your rc.conf file:
+
+mfschunkserver_enable="YES"
+
+************************************************************************
diff -ruN moosefs-master.orig/files/pkg-message-master.in moosefs-master/files/pkg-message-master.in
--- moosefs-master.orig/files/pkg-message-master.in	1970-01-01 01:00:00.000000000 +0100
+++ moosefs-master/files/pkg-message-master.in	2015-07-09 16:36:24.273261000 +0200
@@ -0,0 +1,12 @@
+************************************************************************
+
+A startup script has been installed as:
+
+%%PREFIX%%/etc/rc.d/mfsmaster
+
+Use it to start/stop the mfsmaster service after you have added
+the following line to your rc.conf file:
+
+mfsmaster_enable="YES"
+
+************************************************************************
diff -ruN moosefs-master.orig/files/pkg-message-metalogger.in moosefs-master/files/pkg-message-metalogger.in
--- moosefs-master.orig/files/pkg-message-metalogger.in	1970-01-01 01:00:00.000000000 +0100
+++ moosefs-master/files/pkg-message-metalogger.in	2015-07-09 16:36:24.273261000 +0200
@@ -0,0 +1,12 @@
+************************************************************************
+
+A startup script has been installed as:
+
+%%PREFIX%%/etc/rc.d/mfsmetalogger
+
+Use it to start/stop the mfsmetalogger service after you have added
+the following line to your rc.conf file:
+
+mfsmetalogger_enable="YES"
+
+************************************************************************
diff -ruN moosefs-master.orig/files/pkg-message.in moosefs-master/files/pkg-message.in
--- moosefs-master.orig/files/pkg-message.in	2014-01-22 16:52:06.000000000 +0100
+++ moosefs-master/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-************************************************************************
-
-Three startup scripts have been installed as: 
-
-%%PREFIX%%/etc/rc.d/mfsmaster
-%%PREFIX%%/etc/rc.d/mfsmetalogger
-%%PREFIX%%/etc/rc.d/mfscgiserv
-
-Use them to start/stop the mfsmaster, mfsmetalogger and mfscgiserv
-services after you have added the following lines to your rc.conf
-file respectively:
-
-mfsmaster_enable="YES"
-mfsmetalogger_enable="YES"
-mfscgiserv_enable="YES"
-
-************************************************************************
diff -ruN moosefs-master.orig/pkg-descr moosefs-master/pkg-descr
--- moosefs-master.orig/pkg-descr	2013-05-17 22:09:11.000000000 +0200
+++ moosefs-master/pkg-descr	2015-07-09 16:36:24.273261000 +0200
@@ -1,9 +1,9 @@
-MooseFS is a fault tolerant, network distributed file system.
+MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out,
+network distributed file system. It spreads data over several physical commodity
+servers, which are visible to the user as one resource.
 
-mfsmaster is a single machine managing the whole filesystem,
-storing metadata for every file (information on size,
-attributes and file location(s), including all information
-about non-regular files, i.e. directories, sockets, pipes and
-devices).
+For standard file operations MooseFS acts like any other Unix-like file system.
 
-WWW: http://www.moosefs.org/
+This port provides: MooseFS master (metadata) server.
+
+WWW: https://moosefs.com/
diff -ruN moosefs-master.orig/pkg-plist moosefs-master/pkg-plist
--- moosefs-master.orig/pkg-plist	2015-06-10 19:33:58.000000000 +0200
+++ moosefs-master/pkg-plist	2015-07-19 23:19:36.862078000 +0200
@@ -1,34 +1,21 @@
-@owner mfs
-@group mfs
-@sample etc/mfs/mfsexports.cfg.sample
-@sample etc/mfs/mfsmaster.cfg.sample
-@sample etc/mfs/mfsmetalogger.cfg.sample
-@sample etc/mfs/mfstopology.cfg.sample
-@owner
-@group
+@unexec if cmp -s %D/etc/mfs/mfsmaster.cfg.dist %D/etc/mfs/mfsmaster.cfg; then rm -f %D/etc/mfs/mfsmaster.cfg; fi
+@unexec if cmp -s %D/etc/mfs/mfsexports.cfg.dist %D/etc/mfs/mfsexports.cfg; then rm -f %D/etc/mfs/mfsexports.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/mfsmaster.cfg.dist
+etc/mfs/mfsexports.cfg.dist
+etc/mfs/mfstopology.cfg.dist
+sbin/mfsmaster
+sbin/mfsmetadump
+sbin/mfsmetarestore
 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/mfsmetadump
-sbin/mfsmetalogger
-sbin/mfsmetarestore
-share/mfscgi/chart.cgi
-share/mfscgi/err.gif
-share/mfscgi/favicon.ico
-share/mfscgi/index.html
-share/mfscgi/logomini.png
-share/mfscgi/mfs.cgi
-share/mfscgi/mfs.css
+@exec  if [ ! -f %D/etc/mfs/mfsmaster.cfg ]; then /bin/cp %D/etc/mfs/mfsmaster.cfg.dist %D/etc/mfs/mfsmaster.cfg; fi
+@exec  if [ ! -f %D/etc/mfs/mfsexports.cfg ]; then /bin/cp %D/etc/mfs/mfsexports.cfg.dist %D/etc/mfs/mfsexports.cfg; fi
+@exec  if [ ! -f %D/etc/mfs/mfstopology.cfg ]; then /bin/cp %D/etc/mfs/mfstopology.cfg.dist %D/etc/mfs/mfstopology.cfg; fi
 @owner mfs
 @group mfs
-/var/mfs/metadata.mfs.empty
-@unexec rmdir "/var/mfs" >/dev/null 2>&1 || :
+@dir %%MFS_WORKDIR%%/mfs
+%%MFS_WORKDIR%%/mfs/metadata.mfs.empty