3 files changed, 6 insertions, 50 deletions

diff --git a/sysutils/moosefs-chunkserver/Makefile b/sysutils/moosefs-chunkserver/Makefile
index 4b97ed8f713b..b4fd177e549e 100644
--- a/sysutils/moosefs-chunkserver/Makefile
+++ b/sysutils/moosefs-chunkserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	moosefs
 PORTVERSION=	1.6.20
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/moosefs/moosefs/${PORTVERSION}/
 PKGNAMESUFFIX=	-chunkserver
@@ -15,6 +16,10 @@ DISTNAME=	mfs-${PORTVERSION}
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Storing files data and synchronizing it among themselves
 
+LICENSE=	GPLv3
+USERS=		mfs
+GROUPS=		mfs
+
 GNU_CONFIGURE=	yes
 USE_RC_SUBR+=	mfschunkserver
 MFS_WORKDIR=	/var
@@ -22,7 +27,7 @@ MFS_WORKDIR=	/var
 MAN5=		mfschunkserver.cfg.5 mfshdd.cfg.5
 MAN8=		mfschunkserver.8
 
-SUB_FILES+=	pkg-install pkg-message pkg-deinstall
+SUB_FILES+=	pkg-message
 SUB_LIST+=	MFS_WORKDIR="${MFS_WORKDIR}"
 
 CONFIGURE_ARGS=	--localstatedir=${MFS_WORKDIR} \
@@ -47,7 +52,6 @@ post-install:
 		${CP} ${PREFIX}/etc/${FILE}.cfg.dist ${PREFIX}/etc/${FILE}.cfg ; \
 	fi
 .endfor
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/moosefs-chunkserver/files/pkg-deinstall.in b/sysutils/moosefs-chunkserver/files/pkg-deinstall.in
deleted file mode 100644
index bec0d963dc2c..000000000000
--- a/sysutils/moosefs-chunkserver/files/pkg-deinstall.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-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/files/pkg-install.in b/sysutils/moosefs-chunkserver/files/pkg-install.in
deleted file mode 100644
index 99a254a25607..000000000000
--- a/sysutils/moosefs-chunkserver/files/pkg-install.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-
-if [ "$2" != "PRE-INSTALL" ]; then
-	exit 0
-fi
-
-	USER=mfs
-	GROUP=${USER}
-	UID=925
-	GID=${UID}
-
-	if pw group show "${GROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GROUP}\", so I will use it."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${USER}" 2>/dev/null; then
-		echo "You already have a user \"${USER}\", so I will use it."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "MySQL Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-exit 0