From owner-svn-ports-head@FreeBSD.ORG Sat Oct 18 18:06:41 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10550B7F; Sat, 18 Oct 2014 18:06:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6B32A79; Sat, 18 Oct 2014 18:06:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9II6edH076069; Sat, 18 Oct 2014 18:06:40 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9II6e2h076067; Sat, 18 Oct 2014 18:06:40 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201410181806.s9II6e2h076067@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 18 Oct 2014 18:06:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371152 - head/devel/jenkins-lts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2014 18:06:41 -0000 Author: swills Date: Sat Oct 18 18:06:39 2014 New Revision: 371152 URL: https://svnweb.freebsd.org/changeset/ports/371152 QAT: https://qat.redports.org/buildarchive/r371152/ Log: devel/jenkins-lts: Fix permissions on ${PREFIX}/jenkins While here, bring over other changes from devel/jenkins PR: 194274 Reported by: Holger Freyther Added: head/devel/jenkins-lts/pkg-plist (contents, props changed) Modified: head/devel/jenkins-lts/Makefile Modified: head/devel/jenkins-lts/Makefile ============================================================================== --- head/devel/jenkins-lts/Makefile Sat Oct 18 18:05:34 2014 (r371151) +++ head/devel/jenkins-lts/Makefile Sat Oct 18 18:06:39 2014 (r371152) @@ -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 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 Added: head/devel/jenkins-lts/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/jenkins-lts/pkg-plist Sat Oct 18 18:06:39 2014 (r371152) @@ -0,0 +1,3 @@ +%%DATADIR%%/jenkins.war +@dirrmtry(%%JENKINS_USER%%,%%JENKINS_GROUP%%,) jenkins +@dirrm %%DATADIR%%