Attachment #180188 for bug #217274

Lines 25-35 Link Here

(-)sysutils/py-salt/Makefile (-14 / +59 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
29	OPTIONS_DEFAULT= ZEROMQ	29	OPTIONS_DEFAULT= ZEROMQ
30		30	.if empty(PKGNAMESUFFIX)
		31	OPTIONS_RADIO= SERVER
		32	OPTIONS_RADIO_SERVER= MASTER PROXY
		33	.endif
		34	OPTIONS_SUB= yes
31	ZEROMQ_DESC= Enable ZeroMQ transport	35	ZEROMQ_DESC= Enable ZeroMQ transport
32	RAET_DESC= Enable RAET transport	36	RAET_DESC= Enable RAET transport
		37	MINION_DESC= Enable Minion
		38	MASTER_DESC= Enable Master
		39	PROXY_DESC= Enable Proxy
		40	API_DESC= Enable Api
		41	SYNDIC_DESC= Enable Syndic
33		42
34	ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq	43	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 \	44	ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \
Lines 60-82 Link Here
60	--salt-pidfile-dir=/var/run \	69	--salt-pidfile-dir=/var/run \
61	install	70	install
62		71
63	USE_RC_SUBR= salt_api \	72	.include <bsd.port.options.mk>
64	salt_master \
65	salt_minion \
66	salt_proxy \
67	salt_syndic
68		73
		74	POST_PATCH_LIST= doc/man/salt.7 doc/man/salt.1 salt/modules/tls.py
		75
		76	.if empty(PKGNAMESUFFIX)
		77	.if ${PORT_OPTIONS:MMASTER}
		78	CONFLICTS+= py-salt-proxy-[0-9]*
		79	.else
		80	.if ${PORT_OPTIONS:MPROXY}
		81	CONFLICTS+= py-salt-master-[0-9]*
		82	.endif
		83	.endif
		84	.else
		85	CONFLICTS+= py-salt-[0-9]*
		86	.endif
		87
		88	.if ${PORT_OPTIONS:MMINION}
		89	USE_RC_SUBR = salt_minion
		90	POST_PATCH_LIST+= conf/minion doc/man/salt-minion.1
		91	.endif
		92
		93	.if ${PORT_OPTIONS:MMASTER}
		94	USE_RC_SUBR+= salt_master
		95	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
		96	.endif
		97
		98	.if ${PORT_OPTIONS:MPROXY}
		99	USE_RC_SUBR+= salt_proxy
		100	POST_PATCH_LIST+= conf/proxy doc/man/salt-proxy.1
		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
		108	.if ${PORT_OPTIONS:MSYNDIC}
		109	USE_RC_SUBR+= salt_syndic
		110	POST_PATCH_LIST+= doc/man/salt-syndic.1
		111	.endif
		112
69	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}	113	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD}
70		114
71	SUB_FILES= pkg-message	115	SUB_FILES= pkg-message
72		116
73	post-patch:	117	post-patch:
74	.for file in conf/minion conf/master doc/man/salt-key.1 \	118	.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}\|' \	119	@${REINPLACE_CMD} -e 's\|/etc/salt\|${ETCDIR}\|' \
81	-e 's\|/srv/salt\|${ETCDIR}/states\|' \	120	-e 's\|/srv/salt\|${ETCDIR}/states\|' \
82	-e 's\|/srv/pillar\|${ETCDIR}/pillar\|' ${WRKSRC}/${file}	121	-e 's\|/srv/pillar\|${ETCDIR}/pillar\|' ${WRKSRC}/${file}
Lines 85-91 Link Here
85		124
86	post-install:	125	post-install:
87	@${MKDIR} ${STAGEDIR}${ETCDIR}	126	@${MKDIR} ${STAGEDIR}${ETCDIR}
		127
		128	.if ${PORT_OPTIONS:MMASTER}
88	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample	129	${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample
		130	.endif
		131
		132	.if ${PORT_OPTIONS:MMINION}
89	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample	133	${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample
		134	.endif
90		135
91	.include <bsd.port.mk>	136	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)sysutils/py-salt/pkg-plist (-2 / +3 lines)
1	%%ETCDIR%%/master.sample	1	@sample %%MASTER%%/etc/salt/master.sample
2	%%ETCDIR%%/minion.sample	2	@sample %%MINION%%/etc/salt/minion.sample
		3	@sample %%PROXY%%/etc/salt/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"

Return to bug 217274