summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2014-10-18 18:06:39 +0000
committerSteve Wills <swills@FreeBSD.org>2014-10-18 18:06:39 +0000
commit9a9d8997df9d49f6bbbd373a0126332d3a2efe20 (patch)
treeb8a7d371421be38317547ffd535d55e4edd20c71
parentnet/py-smb: update to 1.1.13 (diff)
devel/jenkins-lts: Fix permissions on ${PREFIX}/jenkins
While here, bring over other changes from devel/jenkins PR: 194274 Reported by: Holger Freyther <holger@freyther.de>
Notes
Notes: svn path=/head/; revision=371152
-rw-r--r--devel/jenkins-lts/Makefile17
-rw-r--r--devel/jenkins-lts/pkg-plist3
2 files changed, 13 insertions, 7 deletions
diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile
index 8134f6284341..b85e1cffc51f 100644
--- a/devel/jenkins-lts/Makefile
+++ b/devel/jenkins-lts/Makefile
@@ -2,7 +2,7 @@
PORTNAME= jenkins
PORTVERSION= 1.565.3
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/
PKGNAMESUFFIX= -lts
@@ -18,7 +18,6 @@ LICENSE= MIT
CONFLICTS= jenkins-[0-9]*
USE_JAVA= yes
-JAVA_VERSION= 1.6+
NO_BUILD= yes
@@ -36,15 +35,19 @@ USERS= jenkins
GROUPS= jenkins
.endif
-PLIST_FILES= %%DATADIR%%/${DISTNAME}${EXTRACT_SUFX}
-PLIST_DIRS= %%DATADIR%%
-PLIST_DIRSTRY= jenkins
-SUB_LIST+= JENKINS_HOME=${JENKINS_HOME} JENKINS_USER=${JENKINS_USER} JENKINS_GROUP=${JENKINS_GROUP} JAVA_HOME=${JAVA_HOME} JENKINS_LOG_FILE=${JENKINS_LOG_FILE}
+SUB_LIST+= JENKINS_HOME=${JENKINS_HOME} \
+ JENKINS_USER=${JENKINS_USER} \
+ JENKINS_GROUP=${JENKINS_GROUP} \
+ JAVA_HOME=${JAVA_HOME} \
+ JENKINS_LOG_FILE=${JENKINS_LOG_FILE}
+PLIST_SUB+= JENKINS_USER=${JENKINS_USER} \
+ JENKINS_GROUP=${JENKINS_GROUP}
.include <bsd.port.pre.mk>
do-install:
${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME}
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
+ ${STAGEDIR}${DATADIR}
.include <bsd.port.post.mk>
diff --git a/devel/jenkins-lts/pkg-plist b/devel/jenkins-lts/pkg-plist
new file mode 100644
index 000000000000..b08aca18b225
--- /dev/null
+++ b/devel/jenkins-lts/pkg-plist
@@ -0,0 +1,3 @@
+%%DATADIR%%/jenkins.war
+@dirrmtry(%%JENKINS_USER%%,%%JENKINS_GROUP%%,) jenkins
+@dirrm %%DATADIR%%