sysutils/moosefs-* update to 2.0.72-1

The update to 2.0.72-1 includes splitting the sysutils/moosefs-master
port into several new ports to achieve better modularization. This
matches the approach upstream has taken with their own FreeBSD packages
which they were distributing via their own pkgng repository.

Further details are provided in the UPDATING entry.

Upstream MooseFS team is now taking maintainership of these ports.

PR:		199342
PR:		199343
PR:		199344
PR:		199345
PR:		199346
PR:		199347
PR:		199348
PR:		199349

39 files changed, 428 insertions, 352 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index f72a49a841f3..9ea11afaf448 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -551,8 +551,13 @@
     SUBDIR += monitorix
     SUBDIR += mono-kmod
     SUBDIR += moosefs-chunkserver
+    SUBDIR += moosefs-cgi
+    SUBDIR += moosefs-cgiserv
+    SUBDIR += moosefs-cli
     SUBDIR += moosefs-client
     SUBDIR += moosefs-master
+    SUBDIR += moosefs-metalogger
+    SUBDIR += moosefs-netdump
     SUBDIR += moreutils
     SUBDIR += most
     SUBDIR += mount.app
diff --git a/sysutils/moosefs-cgi/Makefile b/sysutils/moosefs-cgi/Makefile
new file mode 100644
index 000000000000..e702129fc120
--- /dev/null
+++ b/sysutils/moosefs-cgi/Makefile
@@ -0,0 +1,14 @@
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-cgi
+
+COMMENT=	MooseFS CGI interface
+
+LICENSE=	GPLv2
+
+MFS_COMPONENT=	cgi
+
+MASTERDIR=	${.CURDIR}/../moosefs-master
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cgi/pkg-descr b/sysutils/moosefs-cgi/pkg-descr
new file mode 100644
index 000000000000..03b667fc5c63
--- /dev/null
+++ b/sysutils/moosefs-cgi/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+For standard file operations MooseFS acts like any other Unix-like file system.
+
+This port provides: MooseFS CGI monitor.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-cgi/pkg-plist b/sysutils/moosefs-cgi/pkg-plist
new file mode 100644
index 000000000000..d601df00caac
--- /dev/null
+++ b/sysutils/moosefs-cgi/pkg-plist
@@ -0,0 +1,8 @@
+share/mfscgi/mfs.cgi
+share/mfscgi/mfs.css
+share/mfscgi/logomini.png
+share/mfscgi/index.html
+share/mfscgi/err.gif
+share/mfscgi/chart.cgi
+share/mfscgi/favicon.ico
+share/mfscgi/acidtab.js
diff --git a/sysutils/moosefs-cgiserv/Makefile b/sysutils/moosefs-cgiserv/Makefile
new file mode 100644
index 000000000000..c7c20b137b1d
--- /dev/null
+++ b/sysutils/moosefs-cgiserv/Makefile
@@ -0,0 +1,14 @@
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-cgiserv
+
+COMMENT=	MooseFS CGI webserver
+
+LICENSE=	GPLv2
+
+MFS_COMPONENT=	cgiserv
+
+MASTERDIR=	${.CURDIR}/../moosefs-master
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cgiserv/pkg-descr b/sysutils/moosefs-cgiserv/pkg-descr
new file mode 100644
index 000000000000..d882f626c306
--- /dev/null
+++ b/sysutils/moosefs-cgiserv/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+For standard file operations MooseFS acts like any other Unix-like file system.
+
+This port provides: Simple CGI-capable HTTP server to run MooseFS CGI monitor.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-cgiserv/pkg-plist b/sysutils/moosefs-cgiserv/pkg-plist
new file mode 100644
index 000000000000..7b348259aea4
--- /dev/null
+++ b/sysutils/moosefs-cgiserv/pkg-plist
@@ -0,0 +1,5 @@
+sbin/mfscgiserv
+man/man8/mfscgiserv.8.gz
+@owner mfs
+@group mfs
+@dir %%MFS_WORKDIR%%/mfs
diff --git a/sysutils/moosefs-chunkserver/Makefile b/sysutils/moosefs-chunkserver/Makefile
index 118a1bfb1641..5e905f04d8f4 100644
--- a/sysutils/moosefs-chunkserver/Makefile
+++ b/sysutils/moosefs-chunkserver/Makefile
@@ -1,40 +1,14 @@
-# Created by: Chifeng Qu <chifeng@gmail.com>
+# 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=	-chunkserver
-DISTNAME=	mfs-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Storing file data and synchronizing it among themselves
+COMMENT=	MooseFS data storage and synchronization component
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/mfs-1.6.27
-USERS=		mfs
-GROUPS=		mfs
-GNU_CONFIGURE=	yes
+MFS_COMPONENT=	chunkserver
 
-USE_RC_SUBR=	mfschunkserver
-SUB_FILES=	pkg-message
+MASTERDIR=	${.CURDIR}/../moosefs-master
 
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-mfschunkserver \
-		--disable-mfsmaster \
-		--disable-mfsmount \
-		--disable-mfscgi \
-		--disable-mfscgiserv \
-		--bindir=${PREFIX}/sbin \
-		--with-default-user=mfs \
-		--with-default-group=mfs
-
-post-patch:
-	${REINPLACE_CMD} -e 's;^general_mans;#general_mans;g' \
-		${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-chunkserver/distinfo b/sysutils/moosefs-chunkserver/distinfo
deleted file mode 100644
index 68d592bc4795..000000000000
--- a/sysutils/moosefs-chunkserver/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
-SIZE (mfs-1.6.27-5.tar.gz) = 784507
diff --git a/sysutils/moosefs-chunkserver/files/mfschunkserver.in b/sysutils/moosefs-chunkserver/files/mfschunkserver.in
deleted file mode 100644
index 4db272e2d939..000000000000
--- a/sysutils/moosefs-chunkserver/files/mfschunkserver.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: mfschunkserver
-# REQUIRE: LOGIN 
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable mfschunkserver:
-#
-# mfschunkserver_enable (bool):   Set to NO by default.
-#                                 Set it to YES to enable mfschunkserver.
-# mfschunkserver_config (path):   Set to %%PREFIX%%/etc/mfs/mfschunkserver.cfg
-#                                 by default.
-# mfschunkserver_flags (str):     Set to ""  by default.
-#                                 Extra flags passed to mfschunkserver.
-#
-
-. /etc/rc.subr
-
-name=mfschunkserver
-rcvar=mfschunkserver_enable
-
-load_rc_config $name
-
-: ${mfschunkserver_enable=NO}
-: ${mfschunkserver_config=%%PREFIX%%/etc/mfs/mfschunkserver.cfg}
-
-extra_commands=reload
-command=%%PREFIX%%/sbin/${name}
-command_args="-c ${mfschunkserver_config}"
-
-run_rc_command "$1"
diff --git a/sysutils/moosefs-chunkserver/files/patch-mfsdata_Makefile.in b/sysutils/moosefs-chunkserver/files/patch-mfsdata_Makefile.in
deleted file mode 100644
index 9517c06c1d39..000000000000
--- a/sysutils/moosefs-chunkserver/files/patch-mfsdata_Makefile.in
+++ /dev/null
@@ -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 --git a/sysutils/moosefs-chunkserver/pkg-descr b/sysutils/moosefs-chunkserver/pkg-descr
index 0b66cd2f2d52..6b3f8161d438 100644
--- a/sysutils/moosefs-chunkserver/pkg-descr
+++ b/sysutils/moosefs-chunkserver/pkg-descr
@@ -1,7 +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.
 
-mfschunkserver is any number of commodity servers storing files
-data and synchronizing it among themselves (if a certain file
-is supposed to exist in more than one copy).
+For standard file operations MooseFS acts like any other Unix-like file system.
 
-WWW: http://www.moosefs.org/
+This port provides: MooseFS data server.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-chunkserver/pkg-plist b/sysutils/moosefs-chunkserver/pkg-plist
index 2bcf094e5344..0842f7c90e27 100644
--- a/sysutils/moosefs-chunkserver/pkg-plist
+++ b/sysutils/moosefs-chunkserver/pkg-plist
@@ -1,13 +1,10 @@
-@owner mfs
-@group mfs
 @sample etc/mfs/mfschunkserver.cfg.sample
 @sample etc/mfs/mfshdd.cfg.sample
-@owner
-@group
+sbin/mfschunkserver
+sbin/mfschunktool
 man/man5/mfschunkserver.cfg.5.gz
 man/man5/mfshdd.cfg.5.gz
 man/man8/mfschunkserver.8.gz
-sbin/mfschunkserver
 @owner mfs
 @group mfs
-@unexec rmdir "/var/mfs" >/dev/null 2>&1 || :
+@dir %%MFS_WORKDIR%%/mfs
diff --git a/sysutils/moosefs-cli/Makefile b/sysutils/moosefs-cli/Makefile
new file mode 100644
index 000000000000..a573189fc097
--- /dev/null
+++ b/sysutils/moosefs-cli/Makefile
@@ -0,0 +1,16 @@
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-cli
+
+COMMENT=	MooseFS command line interface
+
+LICENSE=	GPLv2
+
+MFS_COMPONENT=	cli
+
+MASTERDIR=	${.CURDIR}/../moosefs-master
+
+PLIST_FILES=	bin/mfscli
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cli/pkg-descr b/sysutils/moosefs-cli/pkg-descr
new file mode 100644
index 000000000000..48db6cc3f490
--- /dev/null
+++ b/sysutils/moosefs-cli/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+For standard file operations MooseFS acts like any other Unix-like file system.
+
+This port provides: MooseFS CLI utilities.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 744558a25567..74ebcbe135b4 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -1,33 +1,14 @@
-# Created by: Chifeng Qu <chifeng@gmail.com>
+# 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=	-client
-DISTNAME=	mfs-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Moosefs client tools
+COMMENT=	MooseFS client tools
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/mfs-1.6.27
-GNU_CONFIGURE=	yes
+MFS_COMPONENT=	client
 
-USES=		fuse pkgconfig
+MASTERDIR=	${.CURDIR}/../moosefs-master
 
-CONFIGURE_ARGS=	--disable-mfsmaster \
-		--disable-mfschunkserver \
-		--disable-mfscgi \
-		--disable-mfscgiserv \
-		--enable-mfsmount
-
-post-patch:
-	${REINPLACE_CMD} -e 's;^general_mans;#general_mans;g' \
-		${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-client/distinfo b/sysutils/moosefs-client/distinfo
deleted file mode 100644
index 68d592bc4795..000000000000
--- a/sysutils/moosefs-client/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mfs-1.6.27-5.tar.gz) = 5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb
-SIZE (mfs-1.6.27-5.tar.gz) = 784507
diff --git a/sysutils/moosefs-client/files/patch-mfsdata_Makefile.in b/sysutils/moosefs-client/files/patch-mfsdata_Makefile.in
deleted file mode 100644
index 9517c06c1d39..000000000000
--- a/sysutils/moosefs-client/files/patch-mfsdata_Makefile.in
+++ /dev/null
@@ -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 --git a/sysutils/moosefs-client/pkg-descr b/sysutils/moosefs-client/pkg-descr
index 6385db2440a6..7183a1cf9350 100644
--- a/sysutils/moosefs-client/pkg-descr
+++ b/sysutils/moosefs-client/pkg-descr
@@ -1,8 +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.
 
-moosefs client is any number of machines using mfsmount process
-to communicate with the managing server (to receive and modify
-file metadata) and with chunkservers (to exchange actual file
-data).
+For standard file operations MooseFS acts like any other Unix-like file system.
 
-WWW: http://www.moosefs.org/
+This port provides: MooseFS clients: mfsmount and mfstools.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-client/pkg-plist b/sysutils/moosefs-client/pkg-plist
index 837da6ea53e5..36f1022ce616 100644
--- a/sysutils/moosefs-client/pkg-plist
+++ b/sysutils/moosefs-client/pkg-plist
@@ -1,32 +1,39 @@
 bin/mfsappendchunks
 bin/mfscheckfile
-bin/mfsdeleattr
 bin/mfsdirinfo
 bin/mfsfileinfo
 bin/mfsfilerepair
-bin/mfsgeteattr
-bin/mfsgetgoal
-bin/mfsgettrashtime
 bin/mfsmakesnapshot
-bin/mfsmount
+bin/mfsgetgoal
+bin/mfssetgoal
 bin/mfsrgetgoal
-bin/mfsrgettrashtime
 bin/mfsrsetgoal
+bin/mfsgettrashtime
+bin/mfssettrashtime
+bin/mfsrgettrashtime
 bin/mfsrsettrashtime
+bin/mfsgeteattr
 bin/mfsseteattr
-bin/mfssetgoal
-bin/mfssettrashtime
+bin/mfsdeleattr
+bin/mfsgetquota
+bin/mfssetquota
+bin/mfsdelquota
+bin/mfsfilepaths
 bin/mfssnapshot
+bin/mfsmount
 bin/mfstools
 @sample etc/mfs/mfsmount.cfg.sample
 man/man1/mfsappendchunks.1.gz
 man/man1/mfscheckfile.1.gz
 man/man1/mfsdeleattr.1.gz
+man/man1/mfsdelquota.1.gz
 man/man1/mfsdirinfo.1.gz
 man/man1/mfsfileinfo.1.gz
+man/man1/mfsfilepaths.1.gz
 man/man1/mfsfilerepair.1.gz
 man/man1/mfsgeteattr.1.gz
 man/man1/mfsgetgoal.1.gz
+man/man1/mfsgetquota.1.gz
 man/man1/mfsgettrashtime.1.gz
 man/man1/mfsmakesnapshot.1.gz
 man/man1/mfsrgetgoal.1.gz
@@ -35,6 +42,7 @@ man/man1/mfsrsetgoal.1.gz
 man/man1/mfsrsettrashtime.1.gz
 man/man1/mfsseteattr.1.gz
 man/man1/mfssetgoal.1.gz
+man/man1/mfssetquota.1.gz
 man/man1/mfssettrashtime.1.gz
 man/man1/mfstools.1.gz
 man/man8/mfsmount.8.gz
diff --git a/sysutils/moosefs-master/Makefile b/sysutils/moosefs-master/Makefile
index 58292694d072..8ae5b6f375d8 100644
--- a/sysutils/moosefs-master/Makefile
+++ b/sysutils/moosefs-master/Makefile
@@ -1,43 +1,107 @@
-# Created by: Chifeng Qu <chifeng@gmail.com>
+# 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?=		Fault-tolerant distributed filesystem
+
+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 --git a/sysutils/moosefs-master/distinfo b/sysutils/moosefs-master/distinfo
index 68d592bc4795..d5eacd170478 100644
--- a/sysutils/moosefs-master/distinfo
+++ b/sysutils/moosefs-master/distinfo
@@ -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 --git a/sysutils/moosefs-master/files/mfscgiserv.in b/sysutils/moosefs-master/files/mfscgiserv.in
index 93899cccf59d..9a606fa3a133 100644
--- a/sysutils/moosefs-master/files/mfscgiserv.in
+++ b/sysutils/moosefs-master/files/mfscgiserv.in
@@ -1,19 +1,13 @@
 #!/bin/sh
-#
 # $FreeBSD$
-#
 
 # 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 +15,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 --git a/sysutils/moosefs-master/files/mfschunkserver.in b/sysutils/moosefs-master/files/mfschunkserver.in
new file mode 100644
index 000000000000..d4e10b842ddd
--- /dev/null
+++ b/sysutils/moosefs-master/files/mfschunkserver.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+# $FreeBSD$
+
+# 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 --git a/sysutils/moosefs-master/files/mfsmaster.in b/sysutils/moosefs-master/files/mfsmaster.in
index 61b95cdc61a6..b9fa70ee17c4 100644
--- a/sysutils/moosefs-master/files/mfsmaster.in
+++ b/sysutils/moosefs-master/files/mfsmaster.in
@@ -1,21 +1,13 @@
 #!/bin/sh
-#
 # $FreeBSD$
-#
 
 # 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 +15,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 --git a/sysutils/moosefs-master/files/mfsmetalogger.in b/sysutils/moosefs-master/files/mfsmetalogger.in
index ec25c8b294fb..a75d4dd3aa55 100644
--- a/sysutils/moosefs-master/files/mfsmetalogger.in
+++ b/sysutils/moosefs-master/files/mfsmetalogger.in
@@ -1,21 +1,13 @@
 #!/bin/sh
-#
 # $FreeBSD$
-#
 
 # 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 +15,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 --git a/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in b/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in
index 9517c06c1d39..ac1bd4685b43 100644
--- a/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in
+++ b/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in
@@ -1,36 +1,30 @@
---- mfsdata/Makefile.in.orig	2013-11-26 11:22:48.000000000 +0000
+--- mfsdata/Makefile.in.orig	2015-08-12 14:50:32 UTC
 +++ mfsdata/Makefile.in
-@@ -470,26 +470,20 @@ install-data-hook:
- 	if [ ! -d $(DESTDIR)$(sysconfdir)"/mfs" ]; then \
- 		$(MKDIR_P) $(DESTDIR)$(sysconfdir)"/mfs" ; \
- 	fi
+@@ -504,11 +504,11 @@ install-data-hook:
+ @CREATE_DATA_DIR_TRUE@			fi ; \
+ @CREATE_DATA_DIR_TRUE@		fi ; \
+ @CREATE_DATA_DIR_TRUE@	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_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_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_MASTER_TRUE@	if [ "`id -u`" = "0" ]; then \
+ @BUILD_MASTER_TRUE@		if id -u $(DEFAULT_USER) 2> /dev/null > /dev/null ; then \
+@@ -517,8 +517,8 @@ install-data-hook:
+ @BUILD_MASTER_TRUE@			fi ; \
+ @BUILD_MASTER_TRUE@		fi ; \
+ @BUILD_MASTER_TRUE@	fi
 -@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.dist
+-@BUILD_METALOGGER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.cfg.dist
 +@BUILD_MOUNT_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmount.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmount.cfg.sample
++@BUILD_METALOGGER_TRUE@	$(INSTALL_DATA) $(builddir)/mfsmetalogger.cfg $(DESTDIR)$(sysconfdir)/mfs/mfsmetalogger.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 --git a/sysutils/moosefs-master/files/pkg-message-cgiserv.in b/sysutils/moosefs-master/files/pkg-message-cgiserv.in
new file mode 100644
index 000000000000..fd0285475f85
--- /dev/null
+++ b/sysutils/moosefs-master/files/pkg-message-cgiserv.in
@@ -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 --git a/sysutils/moosefs-chunkserver/files/pkg-message.in b/sysutils/moosefs-master/files/pkg-message-chunkserver.in
index 9658126e5d89..6d3bc8159647 100644
--- a/sysutils/moosefs-chunkserver/files/pkg-message.in
+++ b/sysutils/moosefs-master/files/pkg-message-chunkserver.in
@@ -1,6 +1,6 @@
 ************************************************************************
 
-A startup script has been installed as: 
+A startup script has been installed as:
 
 %%PREFIX%%/etc/rc.d/mfschunkserver
 
diff --git a/sysutils/moosefs-master/files/pkg-message-master.in b/sysutils/moosefs-master/files/pkg-message-master.in
new file mode 100644
index 000000000000..4cbf687c6f33
--- /dev/null
+++ b/sysutils/moosefs-master/files/pkg-message-master.in
@@ -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 --git a/sysutils/moosefs-master/files/pkg-message-metalogger.in b/sysutils/moosefs-master/files/pkg-message-metalogger.in
new file mode 100644
index 000000000000..af42c5fdd3a9
--- /dev/null
+++ b/sysutils/moosefs-master/files/pkg-message-metalogger.in
@@ -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 --git a/sysutils/moosefs-master/files/pkg-message.in b/sysutils/moosefs-master/files/pkg-message.in
deleted file mode 100644
index fdea77723c39..000000000000
--- a/sysutils/moosefs-master/files/pkg-message.in
+++ /dev/null
@@ -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 --git a/sysutils/moosefs-master/pkg-descr b/sysutils/moosefs-master/pkg-descr
index d4f5766e20f5..3e876c696179 100644
--- a/sysutils/moosefs-master/pkg-descr
+++ b/sysutils/moosefs-master/pkg-descr
@@ -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 --git a/sysutils/moosefs-master/pkg-plist b/sysutils/moosefs-master/pkg-plist
index 5ad61e7123da..841a06db0738 100644
--- a/sysutils/moosefs-master/pkg-plist
+++ b/sysutils/moosefs-master/pkg-plist
@@ -1,34 +1,15 @@
-@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/mfsexports.cfg.sample
 @sample etc/mfs/mfstopology.cfg.sample
-@owner
-@group
+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
 @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
diff --git a/sysutils/moosefs-metalogger/Makefile b/sysutils/moosefs-metalogger/Makefile
new file mode 100644
index 000000000000..7cc80f3b21eb
--- /dev/null
+++ b/sysutils/moosefs-metalogger/Makefile
@@ -0,0 +1,14 @@
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-metalogger
+
+COMMENT=	MooseFS metadata backup server
+
+LICENSE=	GPLv2
+
+MFS_COMPONENT=	metalogger
+
+MASTERDIR=	${.CURDIR}/../moosefs-master
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-metalogger/pkg-descr b/sysutils/moosefs-metalogger/pkg-descr
new file mode 100644
index 000000000000..37a9f3861c59
--- /dev/null
+++ b/sysutils/moosefs-metalogger/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+For standard file operations MooseFS acts like any other Unix-like file system.
+
+This port provides: MooseFS metalogger (metadata replication) server.
+
+WWW: https://moosefs.com/
diff --git a/sysutils/moosefs-metalogger/pkg-plist b/sysutils/moosefs-metalogger/pkg-plist
new file mode 100644
index 000000000000..7cd689611413
--- /dev/null
+++ b/sysutils/moosefs-metalogger/pkg-plist
@@ -0,0 +1,7 @@
+@sample etc/mfs/mfsmetalogger.cfg.sample
+sbin/mfsmetalogger
+man/man5/mfsmetalogger.cfg.5.gz
+man/man8/mfsmetalogger.8.gz
+@owner mfs
+@group mfs
+@dir %%MFS_WORKDIR%%/mfs
diff --git a/sysutils/moosefs-netdump/Makefile b/sysutils/moosefs-netdump/Makefile
new file mode 100644
index 000000000000..42b59b8dc28e
--- /dev/null
+++ b/sysutils/moosefs-netdump/Makefile
@@ -0,0 +1,17 @@
+# Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-netdump
+
+COMMENT=	MooseFS network packet dump utility
+
+LICENSE=	GPLv2
+
+MFS_COMPONENT=	netdump
+
+MASTERDIR=	${.CURDIR}/../moosefs-master
+
+PLIST_FILES=	sbin/mfsnetdump \
+		man/man8/mfsnetdump.8.gz
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-netdump/pkg-descr b/sysutils/moosefs-netdump/pkg-descr
new file mode 100644
index 000000000000..8f2ec6470f46
--- /dev/null
+++ b/sysutils/moosefs-netdump/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+For standard file operations MooseFS acts like any other Unix-like file system.
+
+This port provides: MooseFS network packet dump utility
+
+WWW: https://moosefs.com/