svn commit: r533905 - head/devel/sonarqube-community

[Alexander Leidinger]

Author: netchild
Date: Mon May  4 08:39:56 2020
New Revision: 533905
URL: https://svnweb.freebsd.org/changeset/ports/533905

Log:
  Fix plist issue. Detected by poudriere-build.
  
  Notced by:	mfechner

Modified:
  head/devel/sonarqube-community/Makefile
  head/devel/sonarqube-community/pkg-plist

Modified: head/devel/sonarqube-community/Makefile
==============================================================================
--- head/devel/sonarqube-community/Makefile	Mon May  4 08:36:16 2020	(r533904)
+++ head/devel/sonarqube-community/Makefile	Mon May  4 08:39:56 2020	(r533905)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sonarqube
 DISTVERSION=	8.2.0.32929
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel security www java
 MASTER_SITES=	https://binaries.sonarsource.com/Distribution/sonarqube/:m_core \
 		https://binaries.sonarsource.com/Distribution/sonar-csharp-plugin/:m_csharp \
@@ -47,8 +47,9 @@ APP_DIR=	libexec/${PORTNAME}
 LOG_DIR=	/var/log/${PORTNAME}
 PID_DIR=	/var/run/${PORTNAME}
 JAR_VERSION=	${DISTVERSION}
-DATA_DIR=	/var/db/${PORTNAME}/data
-TEMP_DIR=	/var/db/${PORTNAME}/temp
+DBBASE_DIR=	/var/db/${PORTNAME}
+DATA_DIR=	${DBBASE_DIR}/data
+TEMP_DIR=	${DBBASE_DIR}/temp
 
 SONARCSHARP_VER=	8.6.1.17183
 SONARJAVA_VER=		6.3.0.21585
@@ -80,6 +81,7 @@ PLIST_SUB=	APP_NAME=${APP_NAME} \
 		LOG_DIR=${LOG_DIR} \
 		PID_DIR=${PID_DIR} \
 		JAR_VERSION=${JAR_VERSION} \
+		DBBASE_DIR=${DBBASE_DIR} \
 		DATA_DIR=${DATA_DIR} \
 		TEMP_DIR=${TEMP_DIR} \
 		SONARCSHARP_VER=${SONARCSHARP_VER} \
@@ -122,6 +124,7 @@ do-install:
 
 gen-plist:
 	${ECHO} '@sample ${APP_DIR}/conf/sonar.properties.sample' >${PLIST}.new
+	${ECHO} '@dir(sonarqube,sonarqube,755) %%DBBASE_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%DATA_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir(sonarqube,sonarqube,755) %%TEMP_DIR%%' >>${PLIST}.new
 	${ECHO} '@dir %%APP_DIR%%/elasticsearch/plugins' >>${PLIST}.new

Modified: head/devel/sonarqube-community/pkg-plist
==============================================================================
--- head/devel/sonarqube-community/pkg-plist	Mon May  4 08:36:16 2020	(r533904)
+++ head/devel/sonarqube-community/pkg-plist	Mon May  4 08:39:56 2020	(r533905)
@@ -1,4 +1,5 @@
 @sample libexec/sonarqube/conf/sonar.properties.sample
+ at dir(sonarqube,sonarqube,755) %%DBBASE_DIR%%
 @dir(sonarqube,sonarqube,755) %%DATA_DIR%%
 @dir(sonarqube,sonarqube,755) %%TEMP_DIR%%
 @dir %%APP_DIR%%/elasticsearch/plugins