Revised to have a single copy of files like DESCR and pkg rc.
Has different PLIST as they are more likely to diverge in future.
Borrowed from ruby-puppet on the advice of jasper@.
OKs now?
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 6 May 2013 01:19:56 -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 <i...@openbsd.org>
-
-# 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 6 May 2013 01:19:56 -0000
@@ -0,0 +1,40 @@
+# $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}
+FILESDIR ?= ${.CURDIR}/../files
+PKGDIR ?= ${.CURDIR}/../pkg
+PLIST ?= ${.CURDIR}/pkg/PLIST
+
+CATEGORIES = devel
+
+HOMEPAGE = http://jenkins-ci.org/
+
+MAINTAINER = Ian Darwin <i...@openbsd.org>
+
+# 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 6 May 2013 01:19:56 -0000
@@ -0,0 +1,8 @@
+# $OpenBSD$
+
+VERSION = 1.514
+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 6 May 2013 01:19:56 -0000
@@ -0,0 +1,2 @@
+SHA256 (jenkins-devel/jenkins.war) =
TkKoFVZd9nEXltPzNgriegpHunx0iJV4zjZwM/tpfKM=
+SIZE (jenkins-devel/jenkins.war) = 53880699
Index: stable/Makefile
===================================================================
RCS file: stable/Makefile
diff -N stable/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ stable/Makefile 6 May 2013 01:19:56 -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 6 May 2013 01:19:56 -0000
@@ -0,0 +1,2 @@
+SHA256 (jenkins-stable/jenkins.war) =
DYvzwEOVG9D6u+dL3g9zfuXOSP/bXSMNFK9rgeL3Qx4=
+SIZE (jenkins-stable/jenkins.war) = 48310563
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 6 May 2013 01:20:06 -0000
@@ -0,0 +1,14 @@
+@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: 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 6 May 2013 01:20:06 -0000
@@ -0,0 +1,14 @@
+@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
