As recently discussed, split suggested by Mark Prins, prompted by
Gonzalo's update for 1.513.
Improvements? OKs?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jenkins/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 9 Apr 2013 13:28:02 -0000 1.13
+++ Makefile 1 May 2013 15:27:28 -0000
@@ -1,42 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2013/04/09 13:28:02 jasper Exp $
+# $OpenBSD$
-COMMENT = continuous integration server
+ SUBDIR =
+ SUBDIR += devel
+ SUBDIR += stable
-VERSION = 1.510
-DISTNAME = jenkins
-PKGNAME = jenkins-${VERSION}
-DIST_SUBDIR = jenkins-${VERSION}
-
-CATEGORIES = devel
-
-HOMEPAGE = http://jenkins-ci.org/
-
-MAINTAINER = Ian Darwin <[email protected]>
-
-# Code under MIT license, Artwork under Creative Commons
-PERMIT_PACKAGE_CDROM = Yes
-
-MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
-EXTRACT_ONLY = # empty
-EXTRACT_SUFX = .war
-
-MODULES = java
-MODJAVA_VER = 1.6+
-MODJAVA_JRE = yes
-
-RUN_DEPENDS = java/javaPathHelper
-
-NO_BUILD = Yes
-NO_TEST = Yes
-
-HOMEDIR = /var/jenkins
-WARDIR = ${PREFIX}/share/jenkins
-BINDIR = ${PREFIX}/bin
-
-SUBST_VARS += HOMEDIR
-
-do-install:
- ${INSTALL_DATA_DIR} ${WARDIR}
- ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
-
-.include <bsd.port.mk>
+.include <bsd.port.subdir.mk>
Index: Makefile.inc
===================================================================
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile.inc 1 May 2013 15:27:28 -0000
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.12 2013/03/11 10:50:09 espie Exp $
+
+COMMENT = continuous integration server
+
+DISTNAME = jenkins
+EXTRACT_SUFX = .war
+PKGNAME = jenkins-${VERSION}
+
+CATEGORIES = devel
+
+HOMEPAGE = http://jenkins-ci.org/
+
+MAINTAINER = Ian Darwin <[email protected]>
+
+# Code under MIT license, Artwork under Creative Commons
+PERMIT_PACKAGE_CDROM = Yes
+
+EXTRACT_ONLY = # empty
+
+MODULES = java
+MODJAVA_VER = 1.6+
+MODJAVA_JRE = yes
+
+RUN_DEPENDS = java/javaPathHelper
+
+NO_BUILD = Yes
+NO_TEST = Yes
+
+HOMEDIR = /var/jenkins
+WARDIR = ${PREFIX}/share/jenkins
+BINDIR = ${PREFIX}/bin
+
+SUBST_VARS += HOMEDIR
+
+do-install:
+ ${INSTALL_DATA_DIR} ${WARDIR}
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jenkins.war ${WARDIR}
Index: distinfo
===================================================================
RCS file: distinfo
diff -N distinfo
--- distinfo 9 Apr 2013 13:28:02 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (jenkins-1.510/jenkins.war) =
LcG3iRw2urUOWV1nheKgvSI71ufhWKLPovlZP9opd64=
-SIZE (jenkins-1.510/jenkins.war) = 53863729
Index: devel/Makefile
===================================================================
RCS file: devel/Makefile
diff -N devel/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/Makefile 1 May 2013 15:27:28 -0000
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION = 1.513
+MASTER_SITES = http://mirrors.jenkins-ci.org/war/${VERSION}/
+DIST_SUBDIR = jenkins-devel
+
+.include <bsd.port.mk>
+
Index: devel/distinfo
===================================================================
RCS file: devel/distinfo
diff -N devel/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/distinfo 1 May 2013 15:27:28 -0000
@@ -0,0 +1,2 @@
+SHA256 (jenkins-devel/jenkins.war) =
TkKoFVZd9nEXltPzNgriegpHunx0iJV4zjZwM/tpfKM=
+SIZE (jenkins-devel/jenkins.war) = 53880699
Index: devel/pkg/DESCR
===================================================================
RCS file: devel/pkg/DESCR
diff -N devel/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/pkg/DESCR 1 May 2013 15:27:28 -0000
@@ -0,0 +1,8 @@
+This is the development branch of Jenkins, a community continuation of Hudson,
+the continuous integration (CI) server (for information on CI see
+http://www.martinfowler.com/articles/continuousIntegration.html).
+Written in Java and with a web-based configuration interface, Jenkins
+can be run standalone (contains its own tiny web server) or in any
+standard Java-capable web server or application server.
+But not limited to Java: can test almost anything, particularly
+projects built with Make, Ant, Maven, or similar.
Index: devel/pkg/PLIST
===================================================================
RCS file: devel/pkg/PLIST
diff -N devel/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/pkg/PLIST 1 May 2013 15:27:28 -0000
@@ -0,0 +1,14 @@
+@comment $OpenBSD: PLIST,v 1.2 2011/03/26 00:44:53 ian Exp $
+@conflict hudson-*
+@newgroup _jenkins:668
+@newuser _jenkins:668:_jenkins:daemon:Jenkins Account:${HOMEDIR}:/sbin/nologin
+@extraunexec rm -rf ${HOMEDIR}/*
+@owner _jenkins
+@group _jenkins
+@sample ${HOMEDIR}/
+@owner
+@group
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/jenkins/
+share/jenkins/jenkins.war
+@rcscript ${RCDIR}/jenkins
Index: devel/pkg/README
===================================================================
RCS file: devel/pkg/README
diff -N devel/pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/pkg/README 1 May 2013 15:27:28 -0000
@@ -0,0 +1,41 @@
+$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+To arrange for the standalone Jenkins server to run automatically
+on reboot, add "jenkins" to "pkg_scripts" in /etc/rc.conf.local, e.g.:
+
+pkg_scripts="${pkg_scripts} jenkins"
+
+NOTE: This script runs Jenkins on port 8000, not 8080, since most
+Java application servers run on port 8080. By default we disable
+HTTPS and AJP, since the former is extra overhead on localhost and
+the latter conflicts with most Java application servers' AJP port.
+
+To change any of these options, carefully copy the line
+beginning "daemon_flags=" from ${RCDIR}/jenkins into /etc/rc.conf.local
+and change "daemon_flags" to "jenkins_flags" in addition to any
+changes to the ports and other options.
+
+To run Jenkins in another Java web/application server, do not enable the
+Jenkins rc script as above, but instead copy the war file
+from ${TRUEPREFIX}/share/jenkins to your server's deploy
+directory, or read more at ${HOMEPAGE}.
+
+To use the email notifications, you will have to configure a valid
+sending address (and SMTP server, if not localhost) under
+Manage Jenkins -> Email Configuration.
+
+The Jenkins data files are in the home directory (/var/jenkins),
+under the "hidden" directory ".jenkins".
+
+If you are upgrading from Hudson to Jenkins, you can copy the old
+content of /var/hudson/.hudson into /var/jenkins/.jenkins, e.g.,
+ # cp -r /var/hudson/.hudson/* /var/jenkins/.jenkins
+ # chown -R _jenkins:_jenkins /var/jenkins/.jenkins
+
+Please be aware that Jenkins offers an upgrade for the CVS plugin. It is
+strongly advised *not* to upgrade this plugin as the updated version assumes
+a GNU rlog command line option (-S) is available.
Index: devel/pkg/SECURITY
===================================================================
RCS file: devel/pkg/SECURITY
diff -N devel/pkg/SECURITY
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/pkg/SECURITY 1 May 2013 15:27:28 -0000
@@ -0,0 +1,13 @@
+Jenkins runs external processes such as CVS, Ant, Make and so on,
+whose path is configurable from the web menu system.
+
+Please make very sure to enable login restriction under Manage
+Jenkins -> Configure Global Security if your server is reachable
+from any (untrusted) network! If you only run it on localhost, be
+sure to block access to the HTTP port (see non-standard port number
+in README) using pf(8).
+
+Take these steps before you start the server the first time!
+
+See more information at
+http://wiki.jenkins-ci.org/display/JENKINS/Securing+Jenkins
Index: devel/pkg/jenkins.rc
===================================================================
RCS file: devel/pkg/jenkins.rc
diff -N devel/pkg/jenkins.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/pkg/jenkins.rc 1 May 2013 15:27:28 -0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon=$(${LOCALBASE}/bin/javaPathHelper -c jenkins)
+daemon_flags="-jar ${TRUEPREFIX}/share/jenkins/jenkins.war --httpPort=8000
--httpsPort=-1 --ajp13Port=-1"
+daemon_user="_jenkins"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 4 Feb 2013 16:26:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-Jenkins is a community continuation of Hudson, the continuous
-integration (CI) server (for information on CI see
-http://www.martinfowler.com/articles/continuousIntegration.html).
-Written in Java and with a web-based configuration interface, Jenkins
-can be run standalone (contains its own tiny web server) or in any
-standard Java-capable web server or application server.
-But not limited to Java: can test almost anything, particularly
-projects built with Make, Ant, Maven, or similar.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 11 May 2011 06:22:17 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/05/11 06:22:17 ajacoutot Exp $
-@conflict hudson-*
-@newgroup _jenkins:668
-@newuser _jenkins:668:_jenkins:daemon:Jenkins Account:${HOMEDIR}:/sbin/nologin
-@extraunexec rm -rf ${HOMEDIR}/*
-@owner _jenkins
-@group _jenkins
-@sample ${HOMEDIR}/
-@owner
-@group
-share/doc/pkg-readmes/${FULLPKGNAME}
-share/jenkins/
-share/jenkins/jenkins.war
-@rcscript ${RCDIR}/jenkins
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- pkg/README 4 Feb 2013 16:26:59 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: README,v 1.6 2013/02/04 16:26:59 jasper Exp $
-
-+-----------------------------------------------------------------------
-| Running ${FULLPKGNAME} on OpenBSD
-+-----------------------------------------------------------------------
-
-To arrange for the standalone Jenkins server to run automatically
-on reboot, add "jenkins" to "pkg_scripts" in /etc/rc.conf.local, e.g.:
-
-pkg_scripts="${pkg_scripts} jenkins"
-
-NOTE: This script runs Jenkins on port 8000, not 8080, since most
-Java application servers run on port 8080. By default we disable
-HTTPS and AJP, since the former is extra overhead on localhost and
-the latter conflicts with most Java application servers' AJP port.
-
-To change any of these options, carefully copy the line
-starting daemon_flags= from ${RCDIR}/jenkins into /etc/rc.conf.local
-and change the daemon_flags to jenkins_flags in addition to any
-changes to the ports and other options.
-
-To run Jenkins in another Java web/application server, copy the war
-file from ${TRUEPREFIX}/share/jenkins to your server's deploy
-directory, or read more at ${HOMEPAGE}.
-
-To use the email notifications, you will have to configure a valid
-sending address (and SMTP server, if not localhost) under
-Manage Jenkins -> Email Configuration.
-
-The Jenkins data files are in the home directory (/var/jenkins),
-under the "hidden" directory ".jenkins".
-
-If you are upgrading from Hudson to Jenkins, you can copy the old
-content of /var/hudson/.hudson into /var/jenkins/.jenkins, e.g.,
- # cp -r /var/hudson/.hudson/* /var/jenkins/.jenkins
- # chown -R _jenkins:_jenkins /var/jenkins/.jenkins
-
-Please be aware that Jenkins offers an upgrade for the CVS plugin. It is
-strongly advised *not* to upgrade this plugin as the updated version assumes
-a GNU rlog command line option (-S) is available.
Index: pkg/SECURITY
===================================================================
RCS file: pkg/SECURITY
diff -N pkg/SECURITY
--- pkg/SECURITY 4 Feb 2013 16:26:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Jenkins runs external processes such as CVS, Ant, Make and so on,
-whose path is configurable from the web menu system.
-
-Please make very sure to enable login restriction under Manage
-Jenkins -> Configure Global Security if your server is reachable
-from any (untrusted) network! If you only run it on localhost, be
-sure to block access to the HTTP port using pf(8).
-
-Take these steps before you start the server the first time!
-
-See more information at
-http://wiki.jenkins-ci.org/display/JENKINS/Securing+Jenkins
Index: pkg/jenkins.rc
===================================================================
RCS file: pkg/jenkins.rc
diff -N pkg/jenkins.rc
--- pkg/jenkins.rc 28 Mar 2011 22:03:44 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-daemon=$(${LOCALBASE}/bin/javaPathHelper -c jenkins)
-daemon_flags="-jar ${TRUEPREFIX}/share/jenkins/jenkins.war --httpPort=8000
--httpsPort=-1 --ajp13Port=-1"
-daemon_user="_jenkins"
-
-. /etc/rc.d/rc.subr
-
-rc_bg=YES
-rc_reload=NO
-
-rc_cmd $1
Index: stable/Makefile
===================================================================
RCS file: stable/Makefile
diff -N stable/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/Makefile 1 May 2013 15:27:28 -0000
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION = 1.480.3
+MASTER_SITES = http://mirrors.jenkins-ci.org/war-stable/${VERSION}/
+DIST_SUBDIR = jenkins-stable
+
+.include <bsd.port.mk>
+
Index: stable/distinfo
===================================================================
RCS file: stable/distinfo
diff -N stable/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/distinfo 1 May 2013 15:27:28 -0000
@@ -0,0 +1,2 @@
+SHA256 (jenkins-stable/jenkins.war) =
DYvzwEOVG9D6u+dL3g9zfuXOSP/bXSMNFK9rgeL3Qx4=
+SIZE (jenkins-stable/jenkins.war) = 48310563
Index: stable/pkg/DESCR
===================================================================
RCS file: stable/pkg/DESCR
diff -N stable/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/pkg/DESCR 1 May 2013 15:27:28 -0000
@@ -0,0 +1,8 @@
+This is the stable LTS branch of Jenkins, a community continuation of Hudson,
+the continuous integration (CI) server (for information on CI see
+http://www.martinfowler.com/articles/continuousIntegration.html).
+Written in Java and with a web-based configuration interface, Jenkins
+can be run standalone (contains its own tiny web server) or in any
+standard Java-capable web server or application server.
+But not limited to Java: can test almost anything, particularly
+projects built with Make, Ant, Maven, or similar.
Index: stable/pkg/PLIST
===================================================================
RCS file: stable/pkg/PLIST
diff -N stable/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/pkg/PLIST 1 May 2013 15:27:28 -0000
@@ -0,0 +1,14 @@
+@comment $OpenBSD: PLIST,v 1.2 2011/03/26 00:44:53 ian Exp $
+@conflict hudson-*
+@newgroup _jenkins:668
+@newuser _jenkins:668:_jenkins:daemon:Jenkins Account:${HOMEDIR}:/sbin/nologin
+@extraunexec rm -rf ${HOMEDIR}/*
+@owner _jenkins
+@group _jenkins
+@sample ${HOMEDIR}/
+@owner
+@group
+share/doc/pkg-readmes/${FULLPKGNAME}
+share/jenkins/
+share/jenkins/jenkins.war
+@rcscript ${RCDIR}/jenkins
Index: stable/pkg/README
===================================================================
RCS file: stable/pkg/README
diff -N stable/pkg/README
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/pkg/README 1 May 2013 15:27:28 -0000
@@ -0,0 +1,41 @@
+$OpenBSD: README,v 1.5 2012/04/22 11:41:55 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+To arrange for the standalone Jenkins server to run automatically
+on reboot, add "jenkins" to "pkg_scripts" in /etc/rc.conf.local, e.g.:
+
+pkg_scripts="${pkg_scripts} jenkins"
+
+NOTE: This script runs Jenkins on port 8000, not 8080, since most
+Java application servers run on port 8080. By default we disable
+HTTPS and AJP, since the former is extra overhead on localhost and
+the latter conflicts with most Java application servers' AJP port.
+
+To change any of these options, carefully copy the line
+beginning "daemon_flags=" from ${RCDIR}/jenkins into /etc/rc.conf.local
+and change "daemon_flags" to "jenkins_flags" in addition to any
+changes to the ports and other options.
+
+To run Jenkins in another Java web/application server, do not enable the
+Jenkins rc script as above, but instead copy the war file
+from ${TRUEPREFIX}/share/jenkins to your server's deploy
+directory, or read more at ${HOMEPAGE}.
+
+To use the email notifications, you will have to configure a valid
+sending address (and SMTP server, if not localhost) under
+Manage Jenkins -> Email Configuration.
+
+The Jenkins data files are in the home directory (/var/jenkins),
+under the "hidden" directory ".jenkins".
+
+If you are upgrading from Hudson to Jenkins, you can copy the old
+content of /var/hudson/.hudson into /var/jenkins/.jenkins, e.g.,
+ # cp -r /var/hudson/.hudson/* /var/jenkins/.jenkins
+ # chown -R _jenkins:_jenkins /var/jenkins/.jenkins
+
+Please be aware that Jenkins offers an upgrade for the CVS plugin. It is
+strongly advised *not* to upgrade this plugin as the updated version assumes
+a GNU rlog command line option (-S) is available.
Index: stable/pkg/SECURITY
===================================================================
RCS file: stable/pkg/SECURITY
diff -N stable/pkg/SECURITY
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/pkg/SECURITY 1 May 2013 15:27:28 -0000
@@ -0,0 +1,13 @@
+Jenkins runs external processes such as CVS, Ant, Make and so on,
+whose path is configurable from the web menu system.
+
+Please make very sure to enable login restriction under Manage
+Jenkins -> Configure Global Security if your server is reachable
+from any (untrusted) network! If you only run it on localhost, be
+sure to block access to the HTTP port (see non-standard port number
+in README) using pf(8).
+
+Take these steps before you start the server the first time!
+
+See more information at
+http://wiki.jenkins-ci.org/display/JENKINS/Securing+Jenkins
Index: stable/pkg/jenkins.rc
===================================================================
RCS file: stable/pkg/jenkins.rc
diff -N stable/pkg/jenkins.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/pkg/jenkins.rc 1 May 2013 15:27:28 -0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+daemon=$(${LOCALBASE}/bin/javaPathHelper -c jenkins)
+daemon_flags="-jar ${TRUEPREFIX}/share/jenkins/jenkins.war --httpPort=8000
--httpsPort=-1 --ajp13Port=-1"
+daemon_user="_jenkins"
+
+. /etc/rc.d/rc.subr
+
+rc_bg=YES
+rc_reload=NO
+
+rc_cmd $1
