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

Collapse All | Expand All

(-)sysutils/py-salt/Makefile (-14 / +43 lines)
Lines 25-35 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 MINION SYNDIC MASTER PROXY
29
OPTIONS_DEFAULT=	ZEROMQ
29
OPTIONS_DEFAULT= ZEROMQ
30
30
OPTIONS_SUB=	yes
31
ZEROMQ_DESC=	Enable ZeroMQ transport
31
ZEROMQ_DESC=	Enable ZeroMQ transport
32
RAET_DESC=	Enable RAET transport
32
RAET_DESC=	Enable RAET transport
33
MINION_DESC=	Enable Minion
34
MASTER_DESC=	Enable Master
35
PROXY_DESC=	Enable Proxy
36
SYNDIC_DESC=	Enable Syndic
33
37
34
ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
38
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 \
39
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
Lines 60-82 Link Here
60
	--salt-pidfile-dir=/var/run \
64
	--salt-pidfile-dir=/var/run \
61
	install
65
	install
62
66
63
USE_RC_SUBR=	salt_api \
67
.include <bsd.port.options.mk>
64
		salt_master \
65
		salt_minion \
66
		salt_proxy \
67
		salt_syndic
68
68
69
POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1  salt/modules/tls.py
70
71
CONFLICTS+=             py-salt-[0-9]*
72
73
.if ${PORT_OPTIONS:MMINION}
74
USE_RC_SUBR = salt_minion
75
POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
76
.endif
77
78
.if ${PORT_OPTIONS:MMASTER}
79
USE_RC_SUBR+= salt_master salt_api
80
POST_PATCH_LIST+= 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 doc/man/salt-api.1
81
.endif
82
83
.if ${PORT_OPTIONS:MPROXY}
84
USE_RC_SUBR+= salt_proxy salt_api
85
POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1 doc/man/salt-api.1
86
.endif
87
88
.if ${PORT_OPTIONS:MSYNDIC}
89
USE_RC_SUBR+= salt_syndic salt_api
90
POST_PATCH_LIST+= doc/man/salt-syndic.1 doc/man/salt-api.1
91
.endif
92
69
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
93
SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
70
94
71
SUB_FILES=	pkg-message
95
SUB_FILES=	pkg-message
72
96
73
post-patch:
97
post-patch:
74
.for file in conf/minion conf/master doc/man/salt-key.1 \
98
.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}|' \
99
	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
81
		-e 's|/srv/salt|${ETCDIR}/states|' \
100
		-e 's|/srv/salt|${ETCDIR}/states|' \
82
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
101
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}
Lines 85-91 Link Here
85
104
86
post-install:
105
post-install:
87
	@${MKDIR} ${STAGEDIR}${ETCDIR}
106
	@${MKDIR} ${STAGEDIR}${ETCDIR}
107
108
.if ${PORT_OPTIONS:MMASTER}
88
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
109
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
110
.endif
111
112
.if ${PORT_OPTIONS:MMINION}
89
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
113
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
114
.endif
90
115
116
.if ${PORT_OPTIONS:MPROXY}
117
	${INSTALL_DATA} ${WRKSRC}/conf/proxy ${STAGEDIR}${ETCDIR}/proxy.sample
118
.endif
119
91
.include <bsd.port.mk>
120
.include <bsd.port.mk>
(-)sysutils/py-salt/pkg-plist (-2 / +3 lines)
Lines 1-5 Link Here
1
%%ETCDIR%%/master.sample
1
%%MASTER%%%%ETCDIR%%/master.sample
2
%%ETCDIR%%/minion.sample
2
%%MINION%%%%ETCDIR%%/minion.sample
3
%%PROXY%%%%ETCDIR%%/proxy.sample
3
%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
4
%%PYTHON_SITELIBDIR%%/salt/_syspaths.py
4
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
5
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyc
5
%%PYTHON_SITELIBDIR%%/salt/_syspaths.pyo
6
%%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
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