Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Nov 2013 23:54:01 +0000 (UTC)
From:      Colin Percival <cperciva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332791 - head/sysutils/ec2-scripts
Message-ID:  <201311042354.rA4Ns1Cw097424@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cperciva
Date: Mon Nov  4 23:54:00 2013
New Revision: 332791
URL: http://svnweb.freebsd.org/changeset/ports/332791

Log:
  Update to 1.6.  This uses "firstboot" support in the base system, so
  provide an option which reverts back to the old version of this port.
  
  I'm making it a configurable option rather than autodetecting based
  on OSVERSION to make my life easier with "cross-building" images.

Modified:
  head/sysutils/ec2-scripts/Makefile
  head/sysutils/ec2-scripts/distinfo

Modified: head/sysutils/ec2-scripts/Makefile
==============================================================================
--- head/sysutils/ec2-scripts/Makefile	Mon Nov  4 23:51:10 2013	(r332790)
+++ head/sysutils/ec2-scripts/Makefile	Mon Nov  4 23:54:00 2013	(r332791)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ec2-scripts
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://freebsd-ec2-dist.s3.amazonaws.com/
 EXTRACT_SUFX=	.tgz
@@ -10,20 +10,31 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cperciva@FreeBSD.org
 COMMENT=	Startup scripts for FreeBSD/EC2 environment
 
+LICENSE=	BSD
+
+OPTIONS_DEFINE=	NOFIRSTBOOT
+NOFIRSTBOOT_DESC=	Use old (pre-firstboot support) version of scripts
+
 NO_BUILD=	YES
 NO_INSTALL=	YES
 
-RC_SCRIPTS=	ec2_bootmail ec2_ephemeralswap ec2_fetchkey	\
-		ec2_firstboot ec2_loghostkey panicmail
+RC_SCRIPTS=	ec2_bootmail ec2_ephemeralswap ec2_fetchkey ec2_loghostkey
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNOFIRSTBOOT}
+PORTVERSION=	1.5
+PORTREVISION=	1
+RC_SCRIPTS+=	ec2_firstboot panicmail
+.endif
 
 .for i in ${RC_SCRIPTS}
 PLIST_FILES+=	etc/rc.d/$i
 .endfor
 
-NO_STAGE=	yes
 post-install:
-	@for i in ${RC_SCRIPTS}; do	\
-		${INSTALL_SCRIPT} ${WRKSRC}/$${i} ${PREFIX}/etc/rc.d/$${i}; \
-	done
+.for i in ${RC_SCRIPTS}
+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/etc/rc.d/
+.endfor
 
 .include <bsd.port.mk>

Modified: head/sysutils/ec2-scripts/distinfo
==============================================================================
--- head/sysutils/ec2-scripts/distinfo	Mon Nov  4 23:51:10 2013	(r332790)
+++ head/sysutils/ec2-scripts/distinfo	Mon Nov  4 23:54:00 2013	(r332791)
@@ -1,2 +1,4 @@
 SHA256 (ec2-scripts-1.5.tgz) = b1c95ecf56d3bcd1e903714cd453666b3fba842ee9ad9a82da519f2b01f00934
 SIZE (ec2-scripts-1.5.tgz) = 4383
+SHA256 (ec2-scripts-1.6.tgz) = 9ebe30cfcd47d2de1205355eb1f64ce424e87ef252ad9c0ccb566415bda33c52
+SIZE (ec2-scripts-1.6.tgz) = 3751



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311042354.rA4Ns1Cw097424>