36 files changed, 27 insertions, 19 deletions
diff --git a/MOVED b/MOVED
index b198812e5ce7..ac6953849de5 100644
--- a/MOVED
+++ b/MOVED
@@ -8600,3 +8600,11 @@ games/freetennis||2016-07-05|Depends on expired graphics/ocaml-images
 graphics/ocaml-images||2016-07-05|Has expired: Depends on expiring devel/omake
 devel/omake||2016-07-05|Has expired: Broken for more than 6 months
 www/yahoo-ui||2016-07-05|Has expired: Broken for more than 6 months
+sysutils/moosefs-cgi|sysutils/moosefs2-cgi|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-cgiserv|sysutils/moosefs2-cgiserv|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-chunkserver|sysutils/moosefs2-chunkserver|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-cli|sysutils/moosefs2-cli|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-client|sysutils/moosefs2-client|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-master|sysutils/moosefs2-master|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-metalogger|sysutils/moosefs2-metalogger|2016-07-07|Moved to a numbered port name
+sysutils/moosefs-netdump|sysutils/moosefs2-netdump|2016-07-07|Moved to a numbered port name
diff --git a/sysutils/Makefile b/sysutils/Makefile
index fc15585e866d..5f1f0bc9474e 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -593,14 +593,14 @@
     SUBDIR += monitord
     SUBDIR += monitorix
     SUBDIR += mono-kmod
-    SUBDIR += moosefs-cgi
-    SUBDIR += moosefs-cgiserv
-    SUBDIR += moosefs-chunkserver
-    SUBDIR += moosefs-cli
-    SUBDIR += moosefs-client
-    SUBDIR += moosefs-master
-    SUBDIR += moosefs-metalogger
-    SUBDIR += moosefs-netdump
+    SUBDIR += moosefs2-cgi
+    SUBDIR += moosefs2-cgiserv
+    SUBDIR += moosefs2-chunkserver
+    SUBDIR += moosefs2-cli
+    SUBDIR += moosefs2-client
+    SUBDIR += moosefs2-master
+    SUBDIR += moosefs2-metalogger
+    SUBDIR += moosefs2-netdump
     SUBDIR += moreutils
     SUBDIR += most
     SUBDIR += mount.app
diff --git a/sysutils/moosefs-cgi/Makefile b/sysutils/moosefs2-cgi/Makefile
index e702129fc120..ddc1ce2b347b 100644
--- a/sysutils/moosefs-cgi/Makefile
+++ b/sysutils/moosefs2-cgi/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	cgi
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cgi/pkg-descr b/sysutils/moosefs2-cgi/pkg-descr
index 03b667fc5c63..03b667fc5c63 100644
--- a/sysutils/moosefs-cgi/pkg-descr
+++ b/sysutils/moosefs2-cgi/pkg-descr
diff --git a/sysutils/moosefs-cgi/pkg-plist b/sysutils/moosefs2-cgi/pkg-plist
index d601df00caac..d601df00caac 100644
--- a/sysutils/moosefs-cgi/pkg-plist
+++ b/sysutils/moosefs2-cgi/pkg-plist
diff --git a/sysutils/moosefs-cgiserv/Makefile b/sysutils/moosefs2-cgiserv/Makefile
index c7c20b137b1d..354d4edc6920 100644
--- a/sysutils/moosefs-cgiserv/Makefile
+++ b/sysutils/moosefs2-cgiserv/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	cgiserv
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cgiserv/pkg-descr b/sysutils/moosefs2-cgiserv/pkg-descr
index d882f626c306..d882f626c306 100644
--- a/sysutils/moosefs-cgiserv/pkg-descr
+++ b/sysutils/moosefs2-cgiserv/pkg-descr
diff --git a/sysutils/moosefs-cgiserv/pkg-plist b/sysutils/moosefs2-cgiserv/pkg-plist
index 7b348259aea4..7b348259aea4 100644
--- a/sysutils/moosefs-cgiserv/pkg-plist
+++ b/sysutils/moosefs2-cgiserv/pkg-plist
diff --git a/sysutils/moosefs-chunkserver/Makefile b/sysutils/moosefs2-chunkserver/Makefile
index 5e905f04d8f4..6567fd2a9a15 100644
--- a/sysutils/moosefs-chunkserver/Makefile
+++ b/sysutils/moosefs2-chunkserver/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	chunkserver
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-chunkserver/pkg-descr b/sysutils/moosefs2-chunkserver/pkg-descr
index 6b3f8161d438..6b3f8161d438 100644
--- a/sysutils/moosefs-chunkserver/pkg-descr
+++ b/sysutils/moosefs2-chunkserver/pkg-descr
diff --git a/sysutils/moosefs-chunkserver/pkg-plist b/sysutils/moosefs2-chunkserver/pkg-plist
index 40859990403e..40859990403e 100644
--- a/sysutils/moosefs-chunkserver/pkg-plist
+++ b/sysutils/moosefs2-chunkserver/pkg-plist
diff --git a/sysutils/moosefs-cli/Makefile b/sysutils/moosefs2-cli/Makefile
index dec01d61a9ce..57128b0b446f 100644
--- a/sysutils/moosefs-cli/Makefile
+++ b/sysutils/moosefs2-cli/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	cli
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-cli/pkg-descr b/sysutils/moosefs2-cli/pkg-descr
index 48db6cc3f490..48db6cc3f490 100644
--- a/sysutils/moosefs-cli/pkg-descr
+++ b/sysutils/moosefs2-cli/pkg-descr
diff --git a/sysutils/moosefs-cli/pkg-plist b/sysutils/moosefs2-cli/pkg-plist
index 17fff2f3de57..17fff2f3de57 100644
--- a/sysutils/moosefs-cli/pkg-plist
+++ b/sysutils/moosefs2-cli/pkg-plist
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs2-client/Makefile
index 74ebcbe135b4..5d4f80bbaebf 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs2-client/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	client
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-client/pkg-descr b/sysutils/moosefs2-client/pkg-descr
index 7183a1cf9350..7183a1cf9350 100644
--- a/sysutils/moosefs-client/pkg-descr
+++ b/sysutils/moosefs2-client/pkg-descr
diff --git a/sysutils/moosefs-client/pkg-plist b/sysutils/moosefs2-client/pkg-plist
index 2fe316151a86..2fe316151a86 100644
--- a/sysutils/moosefs-client/pkg-plist
+++ b/sysutils/moosefs2-client/pkg-plist
diff --git a/sysutils/moosefs-master/Makefile b/sysutils/moosefs2-master/Makefile
index 3e5c5ea2a011..b2b94ec566bd 100644
--- a/sysutils/moosefs-master/Makefile
+++ b/sysutils/moosefs2-master/Makefile
@@ -1,12 +1,12 @@
 # Created by: Jakub Kruszona-Zawadzki <acid@moosefs.com> ; Based on port created by: Chifeng Qu <chifeng@gmail.com>
 # $FreeBSD$
 
-PORTNAME=		moosefs
+PORTNAME=		moosefs2
 PORTVERSION=		2.0.89
 CATEGORIES=		sysutils
 MASTER_SITES=		http://ppa.moosefs.com/src/
 PKGNAMESUFFIX?=		-master
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1
+DISTNAME=		moosefs-${PORTVERSION}-1
 
 MAINTAINER=		freebsd@moosefs.com
 COMMENT?=		Fault-tolerant distributed filesystem
@@ -15,7 +15,7 @@ LICENSE=		GPLv2
 
 USES=			python:build
 GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=			${WRKDIR}/moosefs-${PORTVERSION}
 PLIST=			${.CURDIR}/pkg-plist
 DESCR=			${.CURDIR}/pkg-descr
 
@@ -49,7 +49,7 @@ 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:sysutils/moosefs-cgi
+RUN_DEPENDS=		moosefs2-cgi>0:sysutils/moosefs2-cgi
 .else
 CONFIGURE_ARGS+=	--disable-mfscgiserv
 .endif
diff --git a/sysutils/moosefs-master/distinfo b/sysutils/moosefs2-master/distinfo
index 05385819921a..05385819921a 100644
--- a/sysutils/moosefs-master/distinfo
+++ b/sysutils/moosefs2-master/distinfo
diff --git a/sysutils/moosefs-master/files/mfscgiserv.in b/sysutils/moosefs2-master/files/mfscgiserv.in
index 9a606fa3a133..9a606fa3a133 100644
--- a/sysutils/moosefs-master/files/mfscgiserv.in
+++ b/sysutils/moosefs2-master/files/mfscgiserv.in
diff --git a/sysutils/moosefs-master/files/mfschunkserver.in b/sysutils/moosefs2-master/files/mfschunkserver.in
index d4e10b842ddd..d4e10b842ddd 100644
--- a/sysutils/moosefs-master/files/mfschunkserver.in
+++ b/sysutils/moosefs2-master/files/mfschunkserver.in
diff --git a/sysutils/moosefs-master/files/mfsmaster.in b/sysutils/moosefs2-master/files/mfsmaster.in
index b9fa70ee17c4..b9fa70ee17c4 100644
--- a/sysutils/moosefs-master/files/mfsmaster.in
+++ b/sysutils/moosefs2-master/files/mfsmaster.in
diff --git a/sysutils/moosefs-master/files/mfsmetalogger.in b/sysutils/moosefs2-master/files/mfsmetalogger.in
index a75d4dd3aa55..a75d4dd3aa55 100644
--- a/sysutils/moosefs-master/files/mfsmetalogger.in
+++ b/sysutils/moosefs2-master/files/mfsmetalogger.in
diff --git a/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in b/sysutils/moosefs2-master/files/patch-mfsdata_Makefile.in
index ac1bd4685b43..ac1bd4685b43 100644
--- a/sysutils/moosefs-master/files/patch-mfsdata_Makefile.in
+++ b/sysutils/moosefs2-master/files/patch-mfsdata_Makefile.in
diff --git a/sysutils/moosefs-master/files/pkg-message-cgiserv.in b/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
index fd0285475f85..fd0285475f85 100644
--- a/sysutils/moosefs-master/files/pkg-message-cgiserv.in
+++ b/sysutils/moosefs2-master/files/pkg-message-cgiserv.in
diff --git a/sysutils/moosefs-master/files/pkg-message-chunkserver.in b/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
index 6d3bc8159647..6d3bc8159647 100644
--- a/sysutils/moosefs-master/files/pkg-message-chunkserver.in
+++ b/sysutils/moosefs2-master/files/pkg-message-chunkserver.in
diff --git a/sysutils/moosefs-master/files/pkg-message-master.in b/sysutils/moosefs2-master/files/pkg-message-master.in
index 4cbf687c6f33..4cbf687c6f33 100644
--- a/sysutils/moosefs-master/files/pkg-message-master.in
+++ b/sysutils/moosefs2-master/files/pkg-message-master.in
diff --git a/sysutils/moosefs-master/files/pkg-message-metalogger.in b/sysutils/moosefs2-master/files/pkg-message-metalogger.in
index af42c5fdd3a9..af42c5fdd3a9 100644
--- a/sysutils/moosefs-master/files/pkg-message-metalogger.in
+++ b/sysutils/moosefs2-master/files/pkg-message-metalogger.in
diff --git a/sysutils/moosefs-master/pkg-descr b/sysutils/moosefs2-master/pkg-descr
index 3e876c696179..3e876c696179 100644
--- a/sysutils/moosefs-master/pkg-descr
+++ b/sysutils/moosefs2-master/pkg-descr
diff --git a/sysutils/moosefs-master/pkg-plist b/sysutils/moosefs2-master/pkg-plist
index d536f235edb8..d536f235edb8 100644
--- a/sysutils/moosefs-master/pkg-plist
+++ b/sysutils/moosefs2-master/pkg-plist
diff --git a/sysutils/moosefs-metalogger/Makefile b/sysutils/moosefs2-metalogger/Makefile
index 7cc80f3b21eb..594947002f52 100644
--- a/sysutils/moosefs-metalogger/Makefile
+++ b/sysutils/moosefs2-metalogger/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	metalogger
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-metalogger/pkg-descr b/sysutils/moosefs2-metalogger/pkg-descr
index 37a9f3861c59..37a9f3861c59 100644
--- a/sysutils/moosefs-metalogger/pkg-descr
+++ b/sysutils/moosefs2-metalogger/pkg-descr
diff --git a/sysutils/moosefs-metalogger/pkg-plist b/sysutils/moosefs2-metalogger/pkg-plist
index 7cd689611413..7cd689611413 100644
--- a/sysutils/moosefs-metalogger/pkg-plist
+++ b/sysutils/moosefs2-metalogger/pkg-plist
diff --git a/sysutils/moosefs-netdump/Makefile b/sysutils/moosefs2-netdump/Makefile
index 80c4941b670c..d234e63378d0 100644
--- a/sysutils/moosefs-netdump/Makefile
+++ b/sysutils/moosefs2-netdump/Makefile
@@ -9,6 +9,6 @@ LICENSE=	GPLv2
 
 MFS_COMPONENT=	netdump
 
-MASTERDIR=	${.CURDIR}/../moosefs-master
+MASTERDIR=	${.CURDIR}/../moosefs2-master
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/moosefs-netdump/pkg-descr b/sysutils/moosefs2-netdump/pkg-descr
index 8f2ec6470f46..8f2ec6470f46 100644
--- a/sysutils/moosefs-netdump/pkg-descr
+++ b/sysutils/moosefs2-netdump/pkg-descr
diff --git a/sysutils/moosefs-netdump/pkg-plist b/sysutils/moosefs2-netdump/pkg-plist
index 0137ae45840e..0137ae45840e 100644
--- a/sysutils/moosefs-netdump/pkg-plist
+++ b/sysutils/moosefs2-netdump/pkg-plist