Attachment #132027 for bug #176215

View | Details | Raw Unified | Return to bug 176215
Collapse All | Expand All




# $FreeBSD: ports/sysutils/py-salt-cloud/Makefile,v 1.2 2013/01/27 21:46:31 svnexp Exp $

PORTNAME=	salt-cloud
PORTVERSION=	0.8.5
CATEGORIES=	sysutils python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAN1=		salt-cloud.1
MAN7=		salt-cloud.7

BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}salt>=0.13.0:${PORTSDIR}/sysutils/py-salt \
		${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
		${PYTHON_PKGNAMEPREFIX}libcloud>=0.11.4:${PORTSDIR}/net/py-libcloud \
		${PYTHON_PKGNAMEPREFIX}botocore>=0:${PORTSDIR}/devel/py-botocore \
		sshpass>=0:${PORTSDIR}/security/sshpass
RUN_DEPENDS:=	${BUILD_DEPENDS}

post-patch:
	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py

Lines 1-2 Link Here

(-)/usr/local/poudriere/ports/default/sysutils/py-salt-cloud/distinfo (-2 / +2 lines)
1	SHA256 (salt-cloud-0.8.4.tar.gz) = 376c0cbb0667a54c5ef1a5913bef6a61d72f7dbbe5bf24cabcd4894b66eeaf6a	1	SHA256 (salt-cloud-0.8.5.tar.gz) = d9719ec5cec50cc2fac7ad2b35c7e0f686b12f01bdbf43cf4197b82048558474
2	SIZE (salt-cloud-0.8.4.tar.gz) = 70189	2	SIZE (salt-cloud-0.8.5.tar.gz) = 85155




--- 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', ['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'])
                   ],
                      ['doc/man/salt-cloud.7'])],
       scripts=['scripts/salt-cloud'],
       **setup_kwargs




%%PYTHON_SITELIBDIR%%/saltcloud/config.pyo
%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch-git.sh
%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch.sh
%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt.sh
%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt-minion.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

Return to bug 176215

Lines 2-8 Link Here

(-)/usr/local/poudriere/ports/default/sysutils/py-salt-cloud/Makefile (-6 / +5 lines)
2	# $FreeBSD: ports/sysutils/py-salt-cloud/Makefile,v 1.2 2013/01/27 21:46:31 svnexp Exp $	2	# $FreeBSD: ports/sysutils/py-salt-cloud/Makefile,v 1.2 2013/01/27 21:46:31 svnexp Exp $
3		3
4	PORTNAME= salt-cloud	4	PORTNAME= salt-cloud
5	PORTVERSION= 0.8.4	5	PORTVERSION= 0.8.5
6	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 21-32 Link Here
21	MAN1= salt-cloud.1	21	MAN1= salt-cloud.1
22	MAN7= salt-cloud.7	22	MAN7= salt-cloud.7
23		23
24	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}salt:${PORTSDIR}/sysutils/py-salt \	24	BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}salt>=0.13.0:${PORTSDIR}/sysutils/py-salt \
25	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \	25	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
26	${PYTHON_PKGNAMEPREFIX}libcloud>=0:${PORTSDIR}/net/py-libcloud \	26	${PYTHON_PKGNAMEPREFIX}libcloud>=0.11.4:${PORTSDIR}/net/py-libcloud \
27	${PYTHON_PKGNAMEPREFIX}paramiko>=0:${PORTSDIR}/security/py-paramiko \	27	${PYTHON_PKGNAMEPREFIX}botocore>=0:${PORTSDIR}/devel/py-botocore \
28		28	sshpass>=0:${PORTSDIR}/security/sshpass
29	RUN_DEPENDS:= ${BUILD_DEPENDS}
30		29
31	post-patch:	30	post-patch:
32	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/setup.py	31	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|' ${WRKSRC}/setup.py

Lines 1-14 Link Here

(-)/usr/local/poudriere/ports/default/sysutils/py-salt-cloud/files/patch-setup.py (-10 / +9 lines)
1	--- work/salt-cloud-0.6.0/setup.py 2012-07-13 11:50:56.000000000 -0600	1	--- setup.py 2013-02-15 10:16:10.892115647 -0700
2	+++ setup.py 2012-07-16 13:07:15.901865171 -0600	2	+++ setup.py.new 2013-02-15 10:17:37.691120961 -0700
3	@@ -45,9 +45,9 @@	3	@@ -67,8 +67,8 @@
4	package_data={	4	package_data={
5	'saltcloud': ['deploy/*'],	5	'saltcloud': ['deploy/*'],
6	},	6	},
7	- data_files=[('share/man/man1',	7	- data_files=[('share/man/man1', ['doc/man/salt-cloud.1']),
8	+ data_files=[('man/man1',	8	- ('share/man/man7', ['doc/man/salt-cloud.7'])
9	['doc/man/salt-cloud.1']),	9	+ data_files=[('man/man1', ['doc/man/salt-cloud.1']),
10	- ('share/man/man7',	10	+ ('man/man7', ['doc/man/salt-cloud.7'])
11	+ ('man/man7',	11	],
12	['doc/man/salt-cloud.7'])],
13	scripts=['scripts/salt-cloud'],	12	scripts=['scripts/salt-cloud'],
14	)	13	**setup_kwargs

Lines 37-47 Link Here

(-)/usr/local/poudriere/ports/default/sysutils/py-salt-cloud/pkg-plist (-3 / +3 lines)
37	%%PYTHON_SITELIBDIR%%/saltcloud/config.pyo	37	%%PYTHON_SITELIBDIR%%/saltcloud/config.pyo
38	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch-git.sh	38	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch-git.sh
39	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch.sh	39	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Arch.sh
40	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian-git.sh	40	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt.sh
41	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
42	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/bootstrap-salt-minion.sh
43	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap-git.sh	41	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap-git.sh
44	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap.sh	42	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/curl-bootstrap.sh
		43	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian-git.sh
		44	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Debian.sh
45	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora-git.sh	45	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora-git.sh
46	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora.sh	46	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/Fedora.sh
47	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/FreeBSD-git.sh	47	%%PYTHON_SITELIBDIR%%/saltcloud/deploy/FreeBSD-git.sh