View | Details | Raw Unified | Return to bug 217274 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/py-salt/Makefile (-15 / +73 lines)
Lines 25-36 Link Here
25
		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
25
		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
26
		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado
26
		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado
27
27
28
OPTIONS_DEFINE=	ZEROMQ RAET
28
SALT_BUILD=	${PKGNAMESUFFIX:S/^-//}
29
OPTIONS_DEFAULT=	ZEROMQ
30
29
30
OPTIONS_DEFINE=	ZEROMQ RAET API MINION MASTER PROXY SYNDIC
31
32
CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}salt-[0-9]* ${PYTHON_PKGNAMEPREFIX}salt-[A-Za-z]*-[0-9]*
33
34
.if ${SALT_BUILD} == ""
35
OPTIONS_DEFAULT= ZEROMQ API MINION MASTER PROXY SYNDIC
36
.else
37
OPTIONS_DEFAULT= ZEROMQ
38
.endif
39
40
options_SUB=	yes
41
42
API_DESC=	Enable API server
31
ZEROMQ_DESC=	Enable ZeroMQ transport
43
ZEROMQ_DESC=	Enable ZeroMQ transport
32
RAET_DESC=	Enable RAET transport
44
RAET_DESC=	Enable RAET transport
45
MINION_DESC=	Enable Minion server
46
MASTER_DESC=	Enable Master server
47
PROXY_DESC=	Enable Proxy server
48
SYNDIC_DESC=	Enable Syndic server
33
49
50
SYNDIC_IMPLIES= MASTER API
51
PROXY_IMPLIES= 	MINION
52
MASTER_IMPLIES= API
53
34
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
54
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
35
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
55
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
36
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
56
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
Lines 60-91 Link Here
60
	--salt-pidfile-dir=/var/run \
80
	--salt-pidfile-dir=/var/run \
61
	install
81
	install
62
82
63
USE_RC_SUBR=	salt_api \
83
.include <bsd.port.options.mk>
64
		salt_master \
65
		salt_minion \
66
		salt_proxy \
67
		salt_syndic
68
84
85
POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1  salt/modules/tls.py
86
87
.if ${PORT_OPTIONS:MPROXY}
88
USE_RC_SUBR+= salt_proxy
89
POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1
90
PLIST_FILES+= ${ETCDIR}/proxy.sample
91
.endif
92
93
.if ${PORT_OPTIONS:MSYNDIC}
94
USE_RC_SUBR+= salt_syndic
95
POST_PATCH_LIST+= doc/man/salt-syndic.1
96
.endif
97
98
.if ${PORT_OPTIONS:MMINION}
99
USE_RC_SUBR+= salt_minion
100
POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
101
PLIST_FILES+= ${ETCDIR}/minion.sample
102
.endif
103
104
.if ${PORT_OPTIONS:MMASTER}
105
USE_RC_SUBR+= salt_master
106
POST_PATCH_LIST+= conf/master doc/man/salt-cp.1 doc/man/salt-master.1 doc/man/salt-run.1 salt/modules/mysql.py salt/utils/parsers.py salt/modules/postgres.py salt/utils/migrations.py
107
PLIST_FILES+= ${ETCDIR}/master.sample
108
.endif
109
110
.if ${PORT_OPTIONS:MAPI}
111
USE_RC_SUBR+= salt_api
112
POST_PATCH_LIST+= doc/man/salt-api.1
113
.endif
114
69
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
115
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
70
116
71
SUB_FILES=	pkg-message
117
SUB_FILES=	pkg-message
72
118
73
post-patch:
119
post-patch:
74
.for file in conf/minion conf/master doc/man/salt-key.1 \
120
.for file in ${POST_PATCH_LIST}
75
	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
76
	doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
77
	doc/man/salt-call.1 \
78
	salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \
79
	salt/modules/postgres.py salt/utils/migrations.py
80
	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
121
	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
81
		-e 's|/srv/salt|${ETCDIR}/states|' \
122
		-e 's|/srv/salt|${ETCDIR}/states|' \
82
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
123
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
83
.endfor
124
.endfor
125
126
.if ${PORT_OPTIONS:MMINION}
84
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
127
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
128
.endif
85
129
130
.if ${PORT_OPTIONS:MPROXY}
131
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/proxy
132
.endif
133
86
post-install:
134
post-install:
87
	@${MKDIR} ${STAGEDIR}${ETCDIR}
135
	@${MKDIR} ${STAGEDIR}${ETCDIR}
88
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
89
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
90
136
137
.if ${PORT_OPTIONS:MMASTER}
138
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}/${ETCDIR}/master.sample
139
.endif
140
141
.if ${PORT_OPTIONS:MMINION}
142
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}/${ETCDIR}/minion.sample
143
.endif
144
145
.if ${PORT_OPTIONS:MPROXY}
146
	${INSTALL_DATA} ${WRKSRC}/conf/proxy ${STAGEDIR}/${ETCDIR}/proxy.sample
147
.endif
148
91
.include <bsd.port.mk>
149
.include <bsd.port.mk>
(-)sysutils/py-salt/pkg-plist (-2 lines)
Lines 1-5 Link Here
1
%%ETCDIR%%/master.sample
2
%%ETCDIR%%/minion.sample
3
%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
1
%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
4
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
2
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
5
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
3
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
(-)sysutils/py-salt-master/Makefile (+10 lines)
Line 0 Link Here
1
# Created by: Marco Re <laza_bsd@laza.it>
2
# $FreeBSD$
3
4
MASTERDIR=      ${.CURDIR}/../../sysutils/py-salt
5
6
OPTIONS_SLAVE= MASTER API
7
8
PKGNAMESUFFIX= -master
9
10
.include "${MASTERDIR}/Makefile"
(-)sysutils/py-salt-minion/Makefile (+10 lines)
Line 0 Link Here
1
# Created by: Marco Re <laza_bsd@laza.it>
2
# $FreeBSD$
3
4
MASTERDIR=      ${.CURDIR}/../../sysutils/py-salt
5
6
OPTIONS_SLAVE= MINION
7
8
PKGNAMESUFFIX= -minion
9
10
.include "${MASTERDIR}/Makefile"
(-)sysutils/py-salt-proxy/Makefile (+10 lines)
Line 0 Link Here
1
# Created by: Marco Re <laza_bsd@laza.it>
2
# $FreeBSD$
3
4
MASTERDIR=      ${.CURDIR}/../../sysutils/py-salt
5
6
OPTIONS_SLAVE= PROXY MINION
7
8
PKGNAMESUFFIX= -proxy
9
10
.include "${MASTERDIR}/Makefile"
(-)sysutils/py-salt-syndic/Makefile (+10 lines)
Line 0 Link Here
1
# Created by: Marco Re <laza_bsd@laza.it>
2
# $FreeBSD$
3
4
MASTERDIR=      ${.CURDIR}/../../sysutils/py-salt
5
6
OPTIONS_SLAVE= SYNDIC API
7
8
PKGNAMESUFFIX= -syndic
9
10
.include "${MASTERDIR}/Makefile"

Return to bug 217274