svn commit: r329474 - in head/devel/jenkins: . files

[Li-Wen Hsu]

Author: lwhsu
Date: Sat Oct  5 16:11:37 2013
New Revision: 329474
URL: http://svnweb.freebsd.org/changeset/ports/329474

Log:
  - The infrastructure takes care of jenkins' home permission well,
    so remove the redundant scripts and commands.
  
  Notified by:	ohauer

Deleted:
  head/devel/jenkins/files/pkg-deinstall.in
Modified:
  head/devel/jenkins/Makefile
  head/devel/jenkins/files/jenkins.in

Modified: head/devel/jenkins/Makefile
==============================================================================
--- head/devel/jenkins/Makefile	Sat Oct  5 16:09:08 2013	(r329473)
+++ head/devel/jenkins/Makefile	Sat Oct  5 16:11:37 2013	(r329474)
@@ -2,6 +2,7 @@
 
 PORTNAME=	jenkins
 PORTVERSION=	1.533
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
@@ -21,7 +22,6 @@ FETCH_ARGS=	-Fpr
 NO_BUILD=	yes
 
 USE_RC_SUBR=	jenkins
-SUB_FILES+=	pkg-deinstall
 
 JENKINS_HOME?=	${PREFIX}/jenkins
 JENKINS_USER?=	jenkins
@@ -37,12 +37,13 @@ GROUPS=	jenkins
 
 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}
 
 .include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.post.mk>

Modified: head/devel/jenkins/files/jenkins.in
==============================================================================
--- head/devel/jenkins/files/jenkins.in	Sat Oct  5 16:09:08 2013	(r329473)
+++ head/devel/jenkins/files/jenkins.in	Sat Oct  5 16:11:37 2013	(r329474)
@@ -72,9 +72,6 @@ jenkins_prestart() {
 		chown "${jenkins_user}:${jenkins_group}" "${jenkins_log_file}"
 		chmod 640 "${jenkins_log_file}"
 	fi
-	if [ ! -d "${jenkins_home}" ]; then
-		install -d -o "${jenkins_user}" -g "${jenkins_group}" -m 750 "${jenkins_home}"
-	fi
 	if [ ! -d "/var/run/jenkins" ]; then
 		install -d -o "${jenkins_user}" -g "${jenkins_group}" -m 750 "/var/run/jenkins"
 	fi