svn commit: r361456 - head/security/massh

[Pawel Pekala]

Author: pawel
Date: Thu Jul 10 14:39:53 2014
New Revision: 361456
URL: http://svnweb.freebsd.org/changeset/ports/361456
QAT: https://qat.redports.org/buildarchive/r361456/

Log:
  - Add staging support
  - Use @sample for config file

Modified:
  head/security/massh/Makefile
  head/security/massh/pkg-plist

Modified: head/security/massh/Makefile
==============================================================================
--- head/security/massh/Makefile	Thu Jul 10 13:27:09 2014	(r361455)
+++ head/security/massh/Makefile	Thu Jul 10 14:39:53 2014	(r361456)
@@ -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 at FreeBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Parallel ssh command execution and file transfer on multiple hosts
 
 LICENSE=	GPLv3
@@ -18,14 +18,11 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bas
 		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>

Modified: head/security/massh/pkg-plist
==============================================================================
--- head/security/massh/pkg-plist	Thu Jul 10 13:27:09 2014	(r361455)
+++ head/security/massh/pkg-plist	Thu Jul 10 14:39:53 2014	(r361456)
@@ -1,8 +1,7 @@
 bin/massh
 lib/libmassh.sh
- at 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
- at exec if [ ! -f $D/etc/massh.conf ] ; then cp -p %D/%F %B/massh.conf; fi
+ at 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