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

Collapse All | Expand All

(-)sysutils/py-salt/Makefile (-15 / +66 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
OPTIONS_DEFINE=	ZEROMQ RAET API MINION MASTER PROXY SYNDIC
29
OPTIONS_DEFAULT=	ZEROMQ
29
OPTIONS_DEFAULT= ZEROMQ
30
options_SUB=	yes
30
31
32
API_DESC=	Enable API server
31
ZEROMQ_DESC=	Enable ZeroMQ transport
33
ZEROMQ_DESC=	Enable ZeroMQ transport
32
RAET_DESC=	Enable RAET transport
34
RAET_DESC=	Enable RAET transport
35
MINION_DESC=	Enable Minion server
36
MASTER_DESC=	Enable Master server
37
PROXY_DESC=	Enable Proxy server
38
SYNDIC_DESC=	Enable Syndic server
33
39
40
SYNDIC_IMPLIES= MASTER API
41
PROXY_IMPLIES= MINION
42
MASTER_IMPLIES= API
43
34
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
44
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 \
45
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
36
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
46
		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto
Lines 60-91 Link Here
60
	--salt-pidfile-dir=/var/run \
70
	--salt-pidfile-dir=/var/run \
61
	install
71
	install
62
72
63
USE_RC_SUBR=	salt_api \
73
.include <bsd.port.options.mk>
64
		salt_master \
65
		salt_minion \
66
		salt_proxy \
67
		salt_syndic
68
74
75
POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1  salt/modules/tls.py
76
77
CONFLICTS+=             py-salt-[0-9]*
78
79
.if ${PORT_OPTIONS:MPROXY}
80
USE_RC_SUBR+= salt_proxy
81
POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1
82
PLIST+= ${PKGDIR}/pkg-plist.proxy
83
.endif
84
85
.if ${PORT_OPTIONS:MSYNDIC}
86
PORT_OPTIONS:MMASTER true
87
USE_RC_SUBR+= salt_syndic
88
POST_PATCH_LIST+= doc/man/salt-syndic.1
89
.endif
90
91
.if ${PORT_OPTIONS:MMINION}
92
USE_RC_SUBR = salt_minion
93
POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
94
PLIST+= ${PKGDIR}/pkg-plist.minion
95
.endif
96
97
.if ${PORT_OPTIONS:MMASTER}
98
USE_RC_SUBR+= salt_master
99
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
100
PLIST+= ${PKGDIR}/pkg-plist.master
101
.endif
102
103
.if ${PORT_OPTIONS:MAPI}
104
USE_RC_SUBR+= salt_api
105
POST_PATCH_LIST+= doc/man/salt-api.1
106
.endif
107
69
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
108
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
70
109
71
SUB_FILES=	pkg-message
110
SUB_FILES=	pkg-message
72
111
73
post-patch:
112
post-patch:
74
.for file in conf/minion conf/master doc/man/salt-key.1 \
113
.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}|' \
114
	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
81
		-e 's|/srv/salt|${ETCDIR}/states|' \
115
		-e 's|/srv/salt|${ETCDIR}/states|' \
82
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
116
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
83
.endfor
117
.endfor
118
119
.if ${PORT_OPTIONS:MMINION}
84
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
120
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion
121
.endif
85
122
123
.if ${PORT_OPTIONS:MPROXY}
124
	@${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/proxy
125
.endif
126
86
post-install:
127
post-install:
87
	@${MKDIR} ${STAGEDIR}${ETCDIR}
128
	@${MKDIR} ${STAGEDIR}${ETCDIR}
88
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
89
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
90
129
130
.if ${PORT_OPTIONS:MMASTER}
131
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}/${ETCDIR}/master.sample
132
.endif
133
134
.if ${PORT_OPTIONS:MMINION}
135
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}/${ETCDIR}/minion.sample
136
.endif
137
138
.if ${PORT_OPTIONS:MPROXY}
139
	${INSTALL_DATA} ${WRKSRC}/conf/proxy ${STAGEDIR}/${ETCDIR}/proxy.sample
140
.endif
141
91
.include <bsd.port.mk>
142
.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/pkg-plist.master (+1 lines)
Line 0 Link Here
1
%%ETCDIR%%/master.sample
(-)sysutils/py-salt/pkg-plist.minion (+1 lines)
Line 0 Link Here
1
%%ETCDIR%%/minion.sample
(-)sysutils/py-salt/pkg-plist.proxy (+1 lines)
Line 0 Link Here
1
%%ETCDIR%%/proxy.sample
(-)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
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
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
7
8
PKGNAMESUFFIX=  -syndic
9
10
.include "${MASTERDIR}/Makefile"

Return to bug 217274