aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2013-11-04 23:54:00 +0000
committerColin Percival <cperciva@FreeBSD.org>2013-11-04 23:54:00 +0000
commit311d06c76fd1d6674a6fb68ec23c8d67bdda3139 (patch)
treed6af73d544ea342022c05fbae8150312c466dd58 /sysutils
parentfb760c1c7c6025ec676d99af0e4f76c5890b3e8a (diff)
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.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/ec2-scripts/Makefile25
-rw-r--r--sysutils/ec2-scripts/distinfo2
2 files changed, 20 insertions, 7 deletions
diff --git a/sysutils/ec2-scripts/Makefile b/sysutils/ec2-scripts/Makefile
index 565901dd5e4e..a62b8b23b4ae 100644
--- a/sysutils/ec2-scripts/Makefile
+++ b/sysutils/ec2-scripts/Makefile
@@ -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>
diff --git a/sysutils/ec2-scripts/distinfo b/sysutils/ec2-scripts/distinfo
index 1468486653d7..f914934f29f7 100644
--- a/sysutils/ec2-scripts/distinfo
+++ b/sysutils/ec2-scripts/distinfo
@@ -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