From 7820c0a420e4139701f67dc64ea793501ef3f3dc Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Thu, 27 Mar 2025 17:21:01 +0100 Subject: [PATCH] net/akhq: misc fix - Fix handling of sample file - Fix PREFIX vs LOCALBASE in the .in file - Fix NO_EXTRACT and CONFIG_FILES that are not needed anymore Sponsored by: Klara, Inc. Approved by: 0mp (mentor) Approved by: kevans Reported by: diizzy Differential Revision: https://reviews.freebsd.org/D49537 --- net/akhq/Makefile | 9 +++------ net/akhq/files/akhq.in | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/net/akhq/Makefile b/net/akhq/Makefile index d1f433e0d0da..6ee54f3635df 100644 --- a/net/akhq/Makefile +++ b/net/akhq/Makefile @@ -1,7 +1,7 @@ PORTNAME= akhq DISTVERSION= 0.25.1 DISTVERSIONSUFFIX= -all -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net java MASTER_SITES= https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/ EXTRACT_SUFX= .jar @@ -21,19 +21,16 @@ NO_BUILD= yes SUB_FILES= akhq SUB_LIST= WWWOWN=${WWWOWN} +NO_WRKSUBDIR= yes + PLIST_FILES= "@sample ${ETCDIR}/application.yml.sample" \ ${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar PLIST_SUB+= ${SUB_LIST} -CONFIG_FILES= application.yml - -NO_EXTRACT= yes - do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} ${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml.sample - ${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml .include diff --git a/net/akhq/files/akhq.in b/net/akhq/files/akhq.in index d13c742faf56..1e3feedeae28 100644 --- a/net/akhq/files/akhq.in +++ b/net/akhq/files/akhq.in @@ -12,8 +12,8 @@ rcvar=akhq_enable load_rc_config $name : ${akhq_enable:=NO} -: ${akhq_config:=%%LOCALBASE%%/etc/akhq/application.yml} -: ${akhq_jar:=%%LOCALBASE%%/share/java/akhq/akhq.jar} +: ${akhq_config:=%%PREFIX%%/etc/akhq/application.yml} +: ${akhq_jar:=%%PREFIX%%/share/java/akhq/akhq.jar} : ${akhq_java:=%%LOCALBASE%%/bin/java} : ${akhq_user:=%%WWWOWN%%} : ${akhq_pidfile:=/var/run/${name}.pid}