Attachment #237821 for bug #267309

View | Details | Raw Unified | Return to bug 267309
Collapse All | Expand All




PORTNAME=	kafka
DISTVERSION=	3.3.1
PORTREVISION=	1
CATEGORIES=	net java
MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}/
DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}

KAFKA_USER?=	kafka
KAFKA_GROUP?=	kafka
KAFKA_DBDIR?=	/var/db/${PORTNAME}
KAFKA_DBDIR_KRAFT?=	${KAFKA_DBDIR}-kraft
KAFKA_LOGDIR?=	/var/log/${PORTNAME}

DATADIR=	${JAVASHAREDIR}/${PORTNAME}

		KAFKA_USER=${KAFKA_USER} \
		KAFKA_GROUP=${KAFKA_GROUP} \
		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
		KAFKA_DBDIR=${KAFKA_DBDIR} \
		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
USERS=		${KAFKA_USER}
GROUPS=		${KAFKA_GROUP}


		connect-mirror-maker.properties connect-standalone.properties \
		consumer.properties log4j.properties producer.properties \
		server.properties tools-log4j.properties trogdor.conf
KAFKA_CONFIGS_KRAFT=	broker.properties controller.properties server.properties

PLIST_SUB=	PORTVERSION=${PORTVERSION} \
		KAFKA_USER=${KAFKA_USER} \
		KAFKA_GROUP=${KAFKA_GROUP} \
		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
		KAFKA_DBDIR=${KAFKA_DBDIR} \
		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}

OPTIONS_DEFINE=	DOCS


	@${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh
	@${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh
	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties
.for f in ${KAFKA_CONFIGS_KRAFT}
	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR_KRAFT}|" ${WRKSRC}/config/kraft/${f}
.endfor

do-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${MKDIR} ${STAGEDIR}${ETCDIR}/kraft
	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR_KRAFT}
	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
	${MKDIR} ${STAGEDIR}${DATADIR}/bin
.for f in ${KAFKA_BINS}

.for f in ${KAFKA_CONFIGS}
	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
.endfor
.for f in ${KAFKA_CONFIGS_KRAFT}
	${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample
.endfor


Lines 285-289 Link Here

(-)b/net/kafka/pkg-plist (-2 / +1 lines)
285	@sample %%ETCDIR%%/kraft/controller.properties.sample	285	@sample %%ETCDIR%%/kraft/controller.properties.sample
286	@sample %%ETCDIR%%/kraft/server.properties.sample	286	@sample %%ETCDIR%%/kraft/server.properties.sample
287	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%	287	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%
288	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%/kraft	288	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR_KRAFT%%
289	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%	289	@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%
290	-

Return to bug 267309

Lines 1-5 Link Here

(-)b/net/kafka/Makefile (-7 / +11 lines)
1	PORTNAME= kafka	1	PORTNAME= kafka
2	DISTVERSION= 3.3.1	2	DISTVERSION= 3.3.1
		3	PORTREVISION= 1
3	CATEGORIES= net java	4	CATEGORIES= net java
4	MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/	5	MASTER_SITES= APACHE/${PORTNAME}/${PORTVERSION}/
5	DISTNAME= ${PORTNAME}_2.13-${PORTVERSION}	6	DISTNAME= ${PORTNAME}_2.13-${PORTVERSION}
Lines 27-32 SHEBANG_FILES= bin/*.sh Link Here
27	KAFKA_USER?= kafka	28	KAFKA_USER?= kafka
28	KAFKA_GROUP?= kafka	29	KAFKA_GROUP?= kafka
29	KAFKA_DBDIR?= /var/db/${PORTNAME}	30	KAFKA_DBDIR?= /var/db/${PORTNAME}
		31	KAFKA_DBDIR_KRAFT?= ${KAFKA_DBDIR}-kraft
30	KAFKA_LOGDIR?= /var/log/${PORTNAME}	32	KAFKA_LOGDIR?= /var/log/${PORTNAME}
31		33
32	DATADIR= ${JAVASHAREDIR}/${PORTNAME}	34	DATADIR= ${JAVASHAREDIR}/${PORTNAME}
Lines 39-45 SUB_LIST= JAVA=${JAVA} \ Link Here
39	KAFKA_USER=${KAFKA_USER} \	41	KAFKA_USER=${KAFKA_USER} \
40	KAFKA_GROUP=${KAFKA_GROUP} \	42	KAFKA_GROUP=${KAFKA_GROUP} \
41	KAFKA_LOGDIR=${KAFKA_LOGDIR} \	43	KAFKA_LOGDIR=${KAFKA_LOGDIR} \
42	KAFKA_DBDIR=${KAFKA_DBDIR}	44	KAFKA_DBDIR=${KAFKA_DBDIR} \
		45	KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
43	USERS= ${KAFKA_USER}	46	USERS= ${KAFKA_USER}
44	GROUPS= ${KAFKA_GROUP}	47	GROUPS= ${KAFKA_GROUP}
45		48
Lines 66-78 KAFKA_CONFIGS= connect-console-sink.properties \ Link Here
66	connect-mirror-maker.properties connect-standalone.properties \	69	connect-mirror-maker.properties connect-standalone.properties \
67	consumer.properties log4j.properties producer.properties \	70	consumer.properties log4j.properties producer.properties \
68	server.properties tools-log4j.properties trogdor.conf	71	server.properties tools-log4j.properties trogdor.conf
69	KAFKA_KRAFT= broker.properties controller.properties server.properties	72	KAFKA_CONFIGS_KRAFT= broker.properties controller.properties server.properties
70		73
71	PLIST_SUB= PORTVERSION=${PORTVERSION} \	74	PLIST_SUB= PORTVERSION=${PORTVERSION} \
72	KAFKA_USER=${KAFKA_USER} \	75	KAFKA_USER=${KAFKA_USER} \
73	KAFKA_GROUP=${KAFKA_GROUP} \	76	KAFKA_GROUP=${KAFKA_GROUP} \
74	KAFKA_LOGDIR=${KAFKA_LOGDIR} \	77	KAFKA_LOGDIR=${KAFKA_LOGDIR} \
75	KAFKA_DBDIR=${KAFKA_DBDIR}	78	KAFKA_DBDIR=${KAFKA_DBDIR} \
		79	KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
76		80
77	OPTIONS_DEFINE= DOCS	81	OPTIONS_DEFINE= DOCS
78		82
Lines 82-96 post-patch: Link Here
82	@${REINPLACE_CMD} "s\|\$$base_dir./config\|${ETCDIR}\|" ${WRKSRC}/bin/.sh	86	@${REINPLACE_CMD} "s\|\$$base_dir./config\|${ETCDIR}\|" ${WRKSRC}/bin/.sh
83	@${REINPLACE_CMD} "s\|ps ax\|ps axww\|" ${WRKSRC}/bin/kafka-server-stop.sh	87	@${REINPLACE_CMD} "s\|ps ax\|ps axww\|" ${WRKSRC}/bin/kafka-server-stop.sh
84	@${REINPLACE_CMD} "/log.dirs/s\|=.*\|=${KAFKA_DBDIR}\|" ${WRKSRC}/config/server.properties	88	@${REINPLACE_CMD} "/log.dirs/s\|=.*\|=${KAFKA_DBDIR}\|" ${WRKSRC}/config/server.properties
85	.for f in ${KAFKA_KRAFT}	89	.for f in ${KAFKA_CONFIGS_KRAFT}
86	@${REINPLACE_CMD} "/log.dirs/s\|=.*\|=${KAFKA_DBDIR}/kraft/\|" ${WRKSRC}/config/kraft/${f}	90	@${REINPLACE_CMD} "/log.dirs/s\|=.*\|=${KAFKA_DBDIR_KRAFT}\|" ${WRKSRC}/config/kraft/${f}
87	.endfor	91	.endfor
88		92
89	do-install:	93	do-install:
90	${MKDIR} ${STAGEDIR}${ETCDIR}	94	${MKDIR} ${STAGEDIR}${ETCDIR}
91	${MKDIR} ${STAGEDIR}${ETCDIR}/kraft	95	${MKDIR} ${STAGEDIR}${ETCDIR}/kraft
92	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}	96	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
93	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft	97	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR_KRAFT}
94	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}	98	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
95	${MKDIR} ${STAGEDIR}${DATADIR}/bin	99	${MKDIR} ${STAGEDIR}${DATADIR}/bin
96	.for f in ${KAFKA_BINS}	100	.for f in ${KAFKA_BINS}
Lines 104-110 do-install: Link Here
104	.for f in ${KAFKA_CONFIGS}	108	.for f in ${KAFKA_CONFIGS}
105	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample	109	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
106	.endfor	110	.endfor
107	.for f in ${KAFKA_KRAFT}	111	.for f in ${KAFKA_CONFIGS_KRAFT}
108	${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample	112	${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample
109	.endfor	113	.endfor
110		114