svn commit: r476478 - in branches/2018Q3/net/cloud-init: . files

[Ryan Steinmetz]

Author: zi
Date: Sun Aug  5 21:46:39 2018
New Revision: 476478
URL: https://svnweb.freebsd.org/changeset/ports/476478

Log:
  MFH: r476232
  
  - Bump PORTREVISION
  - Fix rc script errors
  - Fix config file location
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
     - copied unchanged from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
  branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal
     - copied unchanged from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal
  branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
     - copied unchanged from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
Deleted:
  branches/2018Q3/net/cloud-init/pkg-plist
Modified:
  branches/2018Q3/net/cloud-init/Makefile
  branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/net/cloud-init/Makefile
==============================================================================
--- branches/2018Q3/net/cloud-init/Makefile	Sun Aug  5 21:46:14 2018	(r476477)
+++ branches/2018Q3/net/cloud-init/Makefile	Sun Aug  5 21:46:39 2018	(r476478)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cloud-init
 PORTVERSION=	18.3
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -40,7 +41,9 @@ ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	currently depends on dmidecode which is x86-only
 
 post-patch:
-	@${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig
+	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
+	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
 
 post-build:
 	@cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg

Copied: branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig (from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig	Sun Aug  5 21:46:39 2018	(r476478, copy of r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudconfig.orig	2018-08-01 15:31:13 UTC
++++ sysvinit/freebsd/cloudconfig
+@@ -22,4 +22,7 @@ cloudconfig_start()
+ }
+ 
+ load_rc_config $name
++
++: ${cloudconfig_enable="NO"}
++
+ run_rc_command "$1"

Copied: branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal (from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal	Sun Aug  5 21:46:39 2018	(r476478, copy of r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudfinal.orig	2018-08-01 15:31:17 UTC
++++ sysvinit/freebsd/cloudfinal
+@@ -22,4 +22,7 @@ cloudfinal_start()
+ }
+ 
+ load_rc_config $name
++
++: ${cloudfinal_enable="NO"}
++
+ run_rc_command "$1"

Modified: branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
==============================================================================
--- branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	Sun Aug  5 21:46:14 2018	(r476477)
+++ branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit	Sun Aug  5 21:46:39 2018	(r476478)
@@ -1,4 +1,4 @@
---- sysvinit/freebsd/cloudinit.orig	2018-01-01 11:58:33 UTC
+--- sysvinit/freebsd/cloudinit.orig	2018-08-01 15:31:22 UTC
 +++ sysvinit/freebsd/cloudinit
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -9,3 +9,11 @@
  # BEFORE:  cloudconfig cloudfinal
  
  . /etc/rc.subr
+@@ -22,4 +22,7 @@ cloudinit_start()
+ }
+ 
+ load_rc_config $name
++
++: ${cloudinit_enable="NO"}
++
+ run_rc_command "$1"

Copied: branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal (from r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q3/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal	Sun Aug  5 21:46:39 2018	(r476478, copy of r476232, head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudinitlocal.orig	2018-08-01 15:31:29 UTC
++++ sysvinit/freebsd/cloudinitlocal
+@@ -22,4 +22,7 @@ cloudlocal_start()
+ }
+ 
+ load_rc_config $name
++
++: ${cloudinitlocal_enable="NO"}
++
+ run_rc_command "$1"