- Update to 1.6.27

- Trim Makefile headers
- Use space in WWW Line

PR:		ports/178397, ports/178398, ports/178399
Submitted by:	Chifeng Qu <chifeng@gmail.com> (maintainer)

12 files changed, 48 insertions, 35 deletions

diff --git a/sysutils/moosefs-chunkserver/Makefile b/sysutils/moosefs-chunkserver/Makefile
index b221bfed7cff..807c4a9f4c1f 100644
--- a/sysutils/moosefs-chunkserver/Makefile
+++ b/sysutils/moosefs-chunkserver/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    moosefs-chunkserver
-# Date created:         1 April 2010
-# Whom:                 Chifeng Qu <chifeng@gmail.com>
-#
+# Created by: Chifeng Qu <chifeng@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	moosefs
 PORTVERSION=	#
@@ -20,7 +16,7 @@ USE_RC_SUBR=	mfschunkserver
 MAN5=		mfschunkserver.cfg.5 mfshdd.cfg.5
 MAN8=		mfschunkserver.8
 
-SUB_FILES+=	pkg-message
+SUB_FILES+=	pkg-message pkg-deinstall
 SUB_LIST+=	MFS_WORKDIR="${MFS_WORKDIR}"
 
 CONFIGURE_ARGS=	--localstatedir=${MFS_WORKDIR} \
@@ -42,7 +38,7 @@ post-patch:
 post-install:
 .for FILE in mfschunkserver mfshdd
 	@if [ ! -f ${PREFIX}/etc/${i}.cfg ]; then \
-		${CP} ${PREFIX}/etc/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
+		${CP} ${PREFIX}/etc/mfs/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
 	fi
 .endfor
 	@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/moosefs-chunkserver/files/pkg-deinstall.in b/sysutils/moosefs-chunkserver/files/pkg-deinstall.in
new file mode 100644
index 000000000000..6e79b6e8d304
--- /dev/null
+++ b/sysutils/moosefs-chunkserver/files/pkg-deinstall.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+
+WORKDIR=%%MFS_WORKDIR%%/mfs
+
+if [ "$2" = "POST-DEINSTALL" ]; then
+	echo "=> Deleting ${WORKDIR} if empty..."
+	rm -d ${WORKDIR} 2>/dev/null || true
+fi
diff --git a/sysutils/moosefs-chunkserver/pkg-descr b/sysutils/moosefs-chunkserver/pkg-descr
index 95a66e87e532..0b66cd2f2d52 100644
--- a/sysutils/moosefs-chunkserver/pkg-descr
+++ b/sysutils/moosefs-chunkserver/pkg-descr
@@ -4,4 +4,4 @@ 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).
 
-WWW:	http://www.moosefs.org/
+WWW: http://www.moosefs.org/
diff --git a/sysutils/moosefs-chunkserver/pkg-plist b/sysutils/moosefs-chunkserver/pkg-plist
index b77da86f9b8a..1558f07045fe 100644
--- a/sysutils/moosefs-chunkserver/pkg-plist
+++ b/sysutils/moosefs-chunkserver/pkg-plist
@@ -1,7 +1,8 @@
 @exec  if [ ! -f %D/etc/mfshdd.cfg ]; then /bin/cp %D/%F %D/etc/mfshdd.cfg; fi
 @exec  if [ ! -f %D/etc/mfschunkserver.cfg ]; then /bin/cp %D/%F %D/etc/mfschunkserver.cfg; fi
-@unexec if cmp -s %D/etc/mfshdd.cfg.dist %D/etc/mfshdd.cfg; then rm -f %D/etc/mfshdd.cfg; fi
-@unexec if cmp -s %D/etc/mfschunkserver.cfg.dist %D/etc/mfschunkserver.cfg; then rm -f %D/etc/mfschunkserver.cfg; fi
-etc/mfschunkserver.cfg.dist
-etc/mfshdd.cfg.dist
+@unexec if cmp -s %D/etc/mfs/mfshdd.cfg.dist %D/etc/mfshdd.cfg; then rm -f %D/etc/mfshdd.cfg; fi
+@unexec if cmp -s %D/etc/mfs/mfschunkserver.cfg.dist %D/etc/mfschunkserver.cfg; then rm -f %D/etc/mfschunkserver.cfg; fi
+etc/mfs/mfschunkserver.cfg.dist
+etc/mfs/mfshdd.cfg.dist
 sbin/mfschunkserver
+@dirrm etc/mfs
diff --git a/sysutils/moosefs-client/Makefile b/sysutils/moosefs-client/Makefile
index 3450a82f463c..420b92aa29a2 100644
--- a/sysutils/moosefs-client/Makefile
+++ b/sysutils/moosefs-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moosefs
-PORTREVISION=	#
+PORTVERSION=	#set via include
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-client
 .include "${.CURDIR}/../moosefs-master/bsd.port.moosefs.mk"
@@ -34,4 +34,9 @@ post-patch:
 	${REINPLACE_CMD} -e 's;^general_mans;#general_mans;g' ${WRKSRC}/doc/Makefile.am \
 		${WRKSRC}/doc/Makefile.in
 
+post-install:
+	@if [ ! -f ${PREFIX}/etc/mfsmount.cfg ]; then \
+		${CP} ${PREFIX}/etc/mfs/mfsmount.cfg.dist ${PREFIX}/etc/mfsmount.cfg ; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/sysutils/moosefs-client/pkg-descr b/sysutils/moosefs-client/pkg-descr
index bb6d95f5b551..6385db2440a6 100644
--- a/sysutils/moosefs-client/pkg-descr
+++ b/sysutils/moosefs-client/pkg-descr
@@ -5,4 +5,4 @@ to communicate with the managing server (to receive and modify
 file metadata) and with chunkservers (to exchange actual file
 data).
 
-WWW:	http://www.moosefs.org/
+WWW: http://www.moosefs.org/
diff --git a/sysutils/moosefs-client/pkg-plist b/sysutils/moosefs-client/pkg-plist
index a7149e0d85e3..faeaa5a6f13b 100644
--- a/sysutils/moosefs-client/pkg-plist
+++ b/sysutils/moosefs-client/pkg-plist
@@ -18,4 +18,7 @@ bin/mfsappendchunks
 bin/mfsmount
 bin/mfstools
 bin/mfssnapshot
-etc/mfsmount.cfg.dist
+@unexec if cmp -s %D/etc/mfs/mfsmount.cfg.dist %D/etc/mfsmount.cfg; then rm -f %D/etc/mfsmount.cfg; fi
+etc/mfs/mfsmount.cfg.dist
+@exec  if [ ! -f %D/etc/mfsmount.cfg ]; then /bin/cp %D/%F %D/etc/mfsmount.cfg; fi
+@dirrm etc/mfs
diff --git a/sysutils/moosefs-master/Makefile b/sysutils/moosefs-master/Makefile
index 0ed07186285e..1cf27616e3e0 100644
--- a/sysutils/moosefs-master/Makefile
+++ b/sysutils/moosefs-master/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    moosefs-master
-# Date created:         1 April 2010
-# Whom:                 Chifeng Qu <chifeng@gmail.com>
-#
+# Created by: Chifeng Qu <chifeng@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	moosefs
 PORTVERSION=	#set via include
@@ -41,8 +37,8 @@ pre-install:
 
 post-install:
 .for FILE in mfsmaster mfsexports mfsmetalogger mfstopology
-	@if [ ! -f ${PREFIX}/etc/${i}.cfg ]; then \
-		${CP} ${PREFIX}/etc/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
+	@if [ ! -f ${PREFIX}/etc/${FILE}.cfg ]; then \
+		${CP} ${PREFIX}/etc/mfs/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
 	fi
 .endfor
 
diff --git a/sysutils/moosefs-master/bsd.port.moosefs.mk b/sysutils/moosefs-master/bsd.port.moosefs.mk
index b86d95cfe065..d4748274daf1 100644
--- a/sysutils/moosefs-master/bsd.port.moosefs.mk
+++ b/sysutils/moosefs-master/bsd.port.moosefs.mk
@@ -1,9 +1,10 @@
-PORTVERSION=	1.6.26
+PORTVERSION=	1.6.27
 PORTREVISION?=	0
 MASTER_SITES=	http://www.moosefs.org/tl_files/mfscode/ \
 		http://ports.quxingwen.com/dist/mfs/
 
-DISTNAME=	mfs-${PORTVERSION}
+DISTNAME=	mfs-${PORTVERSION}-1
+WRKSRC=		${WRKDIR}/mfs-${PORTVERSION}
 
 LICENSE=	GPLv3
 
diff --git a/sysutils/moosefs-master/distinfo b/sysutils/moosefs-master/distinfo
index 95cecb7eb769..6e6286eab5c6 100644
--- a/sysutils/moosefs-master/distinfo
+++ b/sysutils/moosefs-master/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mfs-1.6.26.tar.gz) = f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885
-SIZE (mfs-1.6.26.tar.gz) = 754573
+SHA256 (mfs-1.6.27-1.tar.gz) = dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28
+SIZE (mfs-1.6.27-1.tar.gz) = 771983
diff --git a/sysutils/moosefs-master/pkg-descr b/sysutils/moosefs-master/pkg-descr
index ddbd7a3eebe9..d4f5766e20f5 100644
--- a/sysutils/moosefs-master/pkg-descr
+++ b/sysutils/moosefs-master/pkg-descr
@@ -6,4 +6,4 @@ attributes and file location(s), including all information
 about non-regular files, i.e. directories, sockets, pipes and
 devices).
 
-WWW:	http://www.moosefs.org/
+WWW: http://www.moosefs.org/
diff --git a/sysutils/moosefs-master/pkg-plist b/sysutils/moosefs-master/pkg-plist
index 73061eb72c83..54c35df9cf1a 100644
--- a/sysutils/moosefs-master/pkg-plist
+++ b/sysutils/moosefs-master/pkg-plist
@@ -2,14 +2,14 @@
 @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/mfsmaster.cfg.dist %D/etc/mfsmaster.cfg; then rm -f %D/etc/mfsmaster.cfg; fi
-@unexec if cmp -s %D/etc/mfsexports.cfg.dist %D/etc/mfsexports.cfg; then rm -f %D/etc/mfsexports.cfg; fi
-@unexec if cmp -s %D/etc/mfsmetalogger.cfg.dist %D/etc/mfsmetalogger.cfg; then rm -f %D/etc/mfsmetalogger.cfg; fi
-@unexec if cmp -s %D/etc/mfstopology.cfg.dist %D/etc/mfstopology.cfg; then rm -f %D/etc/mfstopology.cfg; fi
-etc/mfsmaster.cfg.dist
-etc/mfsexports.cfg.dist
-etc/mfsmetalogger.cfg.dist
-etc/mfstopology.cfg.dist
+@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
+etc/mfs/mfsexports.cfg.dist
+etc/mfs/mfsmetalogger.cfg.dist
+etc/mfs/mfstopology.cfg.dist
 sbin/mfscgiserv
 sbin/mfsmaster
 sbin/mfsmetarestore
@@ -22,4 +22,5 @@ share/mfscgi/index.html
 share/mfscgi/err.gif
 share/mfscgi/chart.cgi
 share/mfscgi/favicon.ico
+@dirrm etc/mfs
 @dirrm share/mfscgi