Attachment 132027 Details for Bug 176215 – file.diff

[patch] file.diff

file.diff (text/plain), 4.21 KB, created by Christer Edwards on 2013-02-17 20:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2013-02-17 20:50:00 UTC

Size: 4.21 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/py-salt-cloud/Makefile /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/Makefile
>--- /usr/ports/sysutils/py-salt-cloud/Makefile	2013-01-27 14:46:31.000000000 -0700
>+++ /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/Makefile	2013-02-17 13:43:49.555230936 -0700
>@@ -2,7 +2,7 @@
> # $FreeBSD: ports/sysutils/py-salt-cloud/Makefile,v 1.2 2013/01/27 21:46:31 svnexp Exp $
> 
> PORTNAME=	salt-cloud
>-PORTVERSION=	0.8.4
>+PORTVERSION=	0.8.5
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -21,12 +21,11 @@
> MAN1=		salt-cloud.1
> MAN7=		salt-cloud.7
> 
>-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}salt:${PORTSDIR}/sysutils/py-salt \
>+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}salt>=0.13.0:${PORTSDIR}/sysutils/py-salt \
> 		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
>-		${PYTHON_PKGNAMEPREFIX}libcloud>=0:${PORTSDIR}/net/py-libcloud \
>-		${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko \
>-
>-RUN_DEPENDS:=	${BUILD_DEPENDS}
>+		${PYTHON_PKGNAMEPREFIX}libcloud>=0.11.4:${PORTSDIR}/net/py-libcloud \
>+		${PYTHON_PKGNAMEPREFIX}botocore>=0:${PORTSDIR}/devel/py-botocore \
>+		sshpass>=0:${PORTSDIR}/security/sshpass
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
>diff -ruN /usr/ports/sysutils/py-salt-cloud/distinfo /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/distinfo
>--- /usr/ports/sysutils/py-salt-cloud/distinfo	2013-01-27 14:44:03.000000000 -0700
>+++ /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/distinfo	2013-02-15 10:05:03.000000000 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (salt-cloud-0.8.4.tar.gz) = 376c0cbb0667a54c5ef1a5913bef6a61d72f7dbbe5bf24cabcd4894b66eeaf6a
>-SIZE (salt-cloud-0.8.4.tar.gz) = 70189
>+SHA256 (salt-cloud-0.8.5.tar.gz) = d9719ec5cec50cc2fac7ad2b35c7e0f686b12f01bdbf43cf4197b82048558474
>+SIZE (salt-cloud-0.8.5.tar.gz) = 85155
>diff -ruN /usr/ports/sysutils/py-salt-cloud/files/patch-setup.py /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/files/patch-setup.py
>--- /usr/ports/sysutils/py-salt-cloud/files/patch-setup.py	2013-01-27 14:44:03.000000000 -0700
>+++ /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/files/patch-setup.py	2013-02-15 10:20:12.009120715 -0700
>@@ -1,14 +1,13 @@
>---- work/salt-cloud-0.6.0/setup.py	2012-07-13 11:50:56.000000000 -0600
>-+++ setup.py	2012-07-16 13:07:15.901865171 -0600
>-@@ -45,9 +45,9 @@
>+--- setup.py	2013-02-15 10:16:10.892115647 -0700
>++++ setup.py.new	2013-02-15 10:17:37.691120961 -0700
>+@@ -67,8 +67,8 @@
>        package_data={
>            'saltcloud': ['deploy/*'],
>            },
>--      data_files=[('share/man/man1',
>-+      data_files=[('man/man1',
>-                      ['doc/man/salt-cloud.1']),
>--                     ('share/man/man7',
>-+                     ('man/man7',
>-                      ['doc/man/salt-cloud.7'])],
>+-      data_files=[('share/man/man1', ['doc/man/salt-cloud.1']),
>+-                  ('share/man/man7', ['doc/man/salt-cloud.7'])
>++      data_files=[('man/man1', ['doc/man/salt-cloud.1']),
>++                  ('man/man7', ['doc/man/salt-cloud.7'])
>+                   ],
>        scripts=['scripts/salt-cloud'],
>-      )
>+       **setup_kwargs
>diff -ruN /usr/ports/sysutils/py-salt-cloud/pkg-plist /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/pkg-plist
>--- /usr/ports/sysutils/py-salt-cloud/pkg-plist	2013-01-27 14:44:03.000000000 -0700
>+++ /usr/local/poudriere/ports/default/sysutils/py-salt-cloud/pkg-plist	2013-02-15 10:32:02.000000000 -0700
>@@ -37,11 +37,11 @@
> %%PYTHON_SITELIBDIR%%/saltcloud/config.pyo
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch-git.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch.sh
>-%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian-git.sh
>-%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
>-%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt-minion.sh
>+%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap-git.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap.sh
>+%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian-git.sh
>+%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora-git.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora.sh
> %%PYTHON_SITELIBDIR%%/saltcloud/deploy/FreeBSD-git.sh

Actions: View | Diff

Attachments on bug 176215: 132027