Attachment #180221 for bug #217274




		${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures \
		${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado

OPTIONS_DEFINE=	ZEROMQ RAET MINION API SYNDIC MASTER PROXY
OPTIONS_DEFAULT= ZEROMQ
OPTIONS_SUB=	yes
ZEROMQ_DESC=	Enable ZeroMQ transport
RAET_DESC=	Enable RAET transport
MINION_DESC=	Enable Minion
MASTER_DESC=	Enable Master
PROXY_DESC=	Enable Proxy
API_DESC=	Enable Api
SYNDIC_DESC=	Enable Syndic

ZEROMQ_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq
ZEROMQ_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \

	--salt-pidfile-dir=/var/run \
	install

.include <bsd.port.options.mk>
		salt_master \
		salt_minion \
		salt_proxy \
		salt_syndic

POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1  salt/modules/tls.py

CONFLICTS+=             py-salt-[0-9]*

.if ${PORT_OPTIONS:MMINION}
USE_RC_SUBR = salt_minion
POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
.endif

.if ${PORT_OPTIONS:MMASTER}
USE_RC_SUBR+= salt_master
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
.endif

.if ${PORT_OPTIONS:MPROXY}
USE_RC_SUBR+= salt_proxy
POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1
.endif

.if ${PORT_OPTIONS:MAPI}
USE_RC_SUBR+= salt_api
POST_PATCH_LIST+= doc/man/salt-api.1
.endif

.if ${PORT_OPTIONS:MSYNDIC}
USE_RC_SUBR+= salt_syndic
POST_PATCH_LIST+= doc/man/salt-syndic.1
.endif

SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}

SUB_FILES=	pkg-message

post-patch:
.for file in ${POST_PATCH_LIST}
	doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \
	doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \
	doc/man/salt-call.1 \
	salt/modules/mysql.py salt/utils/parsers.py salt/modules/tls.py \
	salt/modules/postgres.py salt/utils/migrations.py
	@${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \
		-e 's|/srv/salt|${ETCDIR}/states|' \
		-e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file}


post-install:
	@${MKDIR} ${STAGEDIR}${ETCDIR}

.if ${PORT_OPTIONS:MMASTER}
	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
.endif

.if ${PORT_OPTIONS:MMINION}
	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
.endif

.if ${PORT_OPTIONS:MPROXY}
	${INSTALL_DATA} ${WRKSRC}/conf/proxy ${STAGEDIR}${ETCDIR}/proxy.sample
.endif

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)sysutils/py-salt/pkg-plist (-2 / +3 lines)
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

Line 0 Link Here

(-)sysutils/py-salt-master/Makefile (+10 lines)
	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"

Line 0 Link Here

(-)sysutils/py-salt-minion/Makefile (+10 lines)
	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"

Line 0 Link Here

(-)sysutils/py-salt-proxy/Makefile (+10 lines)
	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"

Line 0 Link Here

(-)sysutils/py-salt-syndic/Makefile (+10 lines)
	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

Lines 25-35 Link Here

(-)sysutils/py-salt/Makefile (-14 / +49 lines)
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 API 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	API_DESC= Enable Api
		37	SYNDIC_DESC= Enable Syndic
33		38
34	ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq	39	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 \	40	ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
Lines 60-82 Link Here
60	--salt-pidfile-dir=/var/run \	65	--salt-pidfile-dir=/var/run \
61	install	66	install
62		67
63	USE_RC_SUBR= salt_api \	68	.include <bsd.port.options.mk>
64	salt_master \
65	salt_minion \
66	salt_proxy \
67	salt_syndic
68		69
		70	POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1 salt/modules/tls.py
		71
		72	CONFLICTS+= py-salt-[0-9]*
		73
		74	.if ${PORT_OPTIONS:MMINION}
		75	USE_RC_SUBR = salt_minion
		76	POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
		77	.endif
		78
		79	.if ${PORT_OPTIONS:MMASTER}
		80	USE_RC_SUBR+= salt_master
		81	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
		82	.endif
		83
		84	.if ${PORT_OPTIONS:MPROXY}
		85	USE_RC_SUBR+= salt_proxy
		86	POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1
		87	.endif
		88
		89	.if ${PORT_OPTIONS:MAPI}
		90	USE_RC_SUBR+= salt_api
		91	POST_PATCH_LIST+= doc/man/salt-api.1
		92	.endif
		93
		94	.if ${PORT_OPTIONS:MSYNDIC}
		95	USE_RC_SUBR+= salt_syndic
		96	POST_PATCH_LIST+= doc/man/salt-syndic.1
		97	.endif
		98
69	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}	99	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
70		100
71	SUB_FILES= pkg-message	101	SUB_FILES= pkg-message
72		102
73	post-patch:	103	post-patch:
74	.for file in conf/minion conf/master doc/man/salt-key.1 \	104	.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}\|' \	105	@${REINPLACE_CMD} -e 's\|/etc/salt\|${ETCDIR}\|' \
81	-e 's\|/srv/salt\|${ETCDIR}/states\|' \	106	-e 's\|/srv/salt\|${ETCDIR}/states\|' \
82	-e 's\|/srv/pillar\|${ETCDIR}/pillar\|' ${WRKSRC}/${file}	107	-e 's\|/srv/pillar\|${ETCDIR}/pillar\|' ${WRKSRC}/${file}
Lines 85-91 Link Here
85		110
86	post-install:	111	post-install:
87	@${MKDIR} ${STAGEDIR}${ETCDIR}	112	@${MKDIR} ${STAGEDIR}${ETCDIR}
		113
		114	.if ${PORT_OPTIONS:MMASTER}
88	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample	115	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
		116	.endif
		117
		118	.if ${PORT_OPTIONS:MMINION}
89	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample	119	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
		120	.endif
90		121
		122	.if ${PORT_OPTIONS:MPROXY}
		123	${INSTALL_DATA} ${WRKSRC}/conf/proxy ${STAGEDIR}${ETCDIR}/proxy.sample
		124	.endif
		125
91	.include <bsd.port.mk>	126	.include <bsd.port.mk>