5 files changed, 29 insertions, 77 deletions

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