Index: jenkins/Makefile =================================================================== --- jenkins/Makefile (revision 410908) +++ jenkins/Makefile (working copy) @@ -7,10 +7,10 @@ DISTNAME= jenkins EXTRACT_SUFX= .war DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} -EXTRACT_ONLY= +EXTRACT_ONLY?= MAINTAINER= lwhsu@FreeBSD.org -COMMENT= Open-source continuous integration server +COMMENT?= Open-source continuous integration server LICENSE= MIT @@ -20,7 +20,7 @@ NO_BUILD= yes -USE_RC_SUBR= jenkins +USE_RC_SUBR?= jenkins USES+= cpe CPE_VENDOR= cloudbees @@ -47,9 +47,20 @@ .include +.if !defined(SLAVE) +PLIST_SUB+= WARFILE=${DISTNAME}${EXTRACT_SUFX} +.else +PLIST_SUB+= WARFILE=slave.jar +.endif + do-install: ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${JENKINS_HOME} +.if !defined(SLAVE) ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ ${STAGEDIR}${DATADIR} +.else + ${INSTALL_DATA} ${WRKSRC}/WEB-INF/slave.jar \ + ${STAGEDIR}${DATADIR} +.endif .include Index: jenkins/pkg-plist =================================================================== --- jenkins/pkg-plist (revision 410908) +++ jenkins/pkg-plist (working copy) @@ -1,2 +1,2 @@ -%%DATADIR%%/jenkins.war +%%DATADIR%%/%%WARFILE%% @dir(%%JENKINS_USER%%,%%JENKINS_GROUP%%,) jenkins Index: jenkins-slave/Makefile =================================================================== --- jenkins-slave/Makefile (revision 0) +++ jenkins-slave/Makefile (working copy) @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -slave +EXTRACT_ONLY= ${PORTNAME}${EXTRACT_SUFX} + +MAINTAINER= lwhsu@FreeBSD.org +COMMENT= Jenkins slave + +LICENSE= MIT + +MASTERDIR= ${.CURDIR}/../jenkins +NO_WRKSUBDIR= yes + +DESCR= ${.CURDIR}/pkg-descr + +SLAVE= yes + +USE_RC_SUBR= jenkins-slave + +# do not overwrite JENKINS_HOME! +JENKINS_LOG_FILE?= /var/log/jenkins-slave.log + +.include "${MASTERDIR}/Makefile" Property changes on: jenkins-slave/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: jenkins-slave/pkg-descr =================================================================== --- jenkins-slave/pkg-descr (revision 0) +++ jenkins-slave/pkg-descr (working copy) @@ -0,0 +1,3 @@ +Jenkins slave + +WWW: http://jenkins-ci.org/ Property changes on: jenkins-slave/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property