From owner-svn-ports-head@FreeBSD.ORG Mon Nov 4 23:54:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A13C3B6D; Mon, 4 Nov 2013 23:54:01 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 750E42CC8; Mon, 4 Nov 2013 23:54:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4Ns1VZ097427; Mon, 4 Nov 2013 23:54:01 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4Ns1Cw097424; Mon, 4 Nov 2013 23:54:01 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201311042354.rA4Ns1Cw097424@svn.freebsd.org> From: Colin Percival Date: Mon, 4 Nov 2013 23:54:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332791 - head/sysutils/ec2-scripts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 23:54:01 -0000 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 + +.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 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