From 5ce3e147caf3f29ea2b066960e5c2a0f45dbcfe5 Mon Sep 17 00:00:00 2001
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 10 Jul 2014 14:39:53 +0000
Subject: [PATCH] - Add staging support - Use @sample for config file

---
 security/massh/Makefile  | 28 ++++++++++++----------------
 security/massh/pkg-plist |  5 ++---
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/security/massh/Makefile b/security/massh/Makefile
index ce203950036c..eea45504c94b 100644
--- a/security/massh/Makefile
+++ b/security/massh/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	massh
 PORTVERSION=	2.0.57
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security sysutils
 MASTER_SITES=	http://m.a.tt/er/
 DISTNAME=	massh
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel ssh command execution and file transfer on multiple hosts
 
 LICENSE=	GPLv3
@@ -18,14 +18,11 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		ambit:${PORTSDIR}/shells/ambit
 
 MASSHDIR?=	/var/spool/massh
-MAN1=		massh.1
-MANCOMPRESSED=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB=	MASSHDIR=${MASSHDIR}
 
-NO_STAGE=	yes
 pre-patch:
 	@${REINPLACE_CMD} -e "s!/bin/bash!${LOCALBASE}/bin/bash!" \
 		${WRKSRC}/usr/bin/massh
@@ -41,16 +38,15 @@ pre-patch:
 		${WRKSRC}/etc/massh/massh.conf
 
 do-install:
-	${MKDIR} ${MASSHDIR}/pull
-	${MKDIR} ${MASSHDIR}/push
-	${MKDIR} ${MASSHDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/massh ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/usr/lib/massh/libmassh.sh ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/etc/massh/massh.conf ${PREFIX}/etc/massh.conf.example
-	@if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; \
-	then \
-		${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.example ${PREFIX}/etc/${PORTNAME}.conf; \
-	fi
-	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/massh.1.gz ${MAN1PREFIX}/man/man1/
+	@${MKDIR} ${STAGEDIR}${MASSHDIR}/pull
+	@${MKDIR} ${STAGEDIR}${MASSHDIR}/push
+	@${MKDIR} ${STAGEDIR}${MASSHDIR}/scripts
+	${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/massh ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/usr/lib/massh/libmassh.sh \
+		${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/etc/massh/massh.conf \
+		${STAGEDIR}${PREFIX}/etc/massh.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/massh.1.gz \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/security/massh/pkg-plist b/security/massh/pkg-plist
index cb22ca418471..ae974a50c34b 100644
--- a/security/massh/pkg-plist
+++ b/security/massh/pkg-plist
@@ -1,8 +1,7 @@
 bin/massh
 lib/libmassh.sh
-@unexec if cmp -s %D/etc/massh.conf.example %D/etc/massh.conf; then rm -f %D/etc/massh.conf; fi
-etc/massh.conf.example
-@exec if [ ! -f $D/etc/massh.conf ] ; then cp -p %D/%F %B/massh.conf; fi
+@sample etc/massh.conf.sample
+man/man1/massh.1.gz
 @exec mkdir -p %%MASSHDIR%%/pull
 @exec mkdir -p %%MASSHDIR%%/push
 @exec mkdir -p %%MASSHDIR%%/scripts