svn commit: r534258 - in head: . sysutils sysutils/rundeck sysutils/rundeck2 sysutils/rundeck3 sysutils/rundeck3/files

Thu May 7 11:10:41 UTC 2020

Author: tagattie
Date: Thu May  7 11:10:39 2020
New Revision: 534258
URL: https://svnweb.freebsd.org/changeset/ports/534258

Log:
  There is rundeck version 3 available and version 2 is still supported.
  So it is good to have both versions in the ports. This commit is to:
  - Add rundeck ver. 3 as rundeck3
  - Preserve rundeck ver. 2 as rundeck2 for users who want to stay in version 2
  - Pass maintainership to submitter
  
  PR:		246022 246023
  Submitted by:	Daniel Tihanyi <daniel.tihanyi at tetragir.com>
  Approved by:	arcade at b1t.name (maintainer), pizzamig (mentor)

Added:
  head/sysutils/rundeck2/
     - copied from r534257, head/sysutils/rundeck/
  head/sysutils/rundeck3/
     - copied from r534230, head/sysutils/rundeck/
Deleted:
  head/sysutils/rundeck/
Modified:
  head/MOVED
  head/sysutils/Makefile
  head/sysutils/rundeck2/Makefile
  head/sysutils/rundeck2/pkg-plist
  head/sysutils/rundeck3/Makefile
  head/sysutils/rundeck3/distinfo
  head/sysutils/rundeck3/files/rundeck.in
  head/sysutils/rundeck3/pkg-plist

Modified: head/MOVED
==============================================================================

--- head/MOVED	Thu May  7 10:58:35 2020	(r534257)
+++ head/MOVED	Thu May  7 11:10:39 2020	(r534258)
@@ -15006,3 +15006,4 @@ deskutils/osynctool||2020-05-06|Abandonware, website d
 devel/libopensync||2020-05-06|Abandonware, website disappeared
 deskutils/libopensync-plugin-vformat-devel||2020-05-06|Abandonware, website disappeared
 devel/py-ipykernel|devel/py-ipykernel5|2020-05-07|Has expired: Old version, use devel/py-ipykernel5 instead
+sysutils/rundeck|sysutils/rundeck2|2020-05-07|Rename to avoid confusion with sysutils/rundeck3

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Thu May  7 10:58:35 2020	(r534257)
+++ head/sysutils/Makefile	Thu May  7 11:10:39 2020	(r534258)
@@ -1144,7 +1144,8 @@
     SUBDIR += rubygem-winrm-elevated
     SUBDIR += rubygem-winrm-fs
     SUBDIR += rubygem-yell
-    SUBDIR += rundeck
+    SUBDIR += rundeck2
+    SUBDIR += rundeck3
     SUBDIR += runit
     SUBDIR += runit-faster
     SUBDIR += runwhen

Modified: head/sysutils/rundeck2/Makefile
==============================================================================
--- head/sysutils/rundeck/Makefile	Thu May  7 10:58:35 2020	(r534257)
+++ head/sysutils/rundeck2/Makefile	Thu May  7 11:10:39 2020	(r534258)
@@ -4,16 +4,19 @@ PORTNAME=	rundeck
 DISTVERSION=	2.11.14
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://dl.bintray.com/rundeck/rundeck-maven/
+PKGNAMESUFFIX=	2
 DISTNAME=	rundeck-launcher-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 
-MAINTAINER=	arcade at b1t.name
+MAINTAINER=	daniel.tihanyi at tetragir.com
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
 
 LICENSE=	APACHE20
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
+
+CONFLICTS_INSTALL=	rundeck3
 
 NO_ARCH=	yes
 NO_BUILD=	yes

Modified: head/sysutils/rundeck2/pkg-plist
==============================================================================
--- head/sysutils/rundeck/pkg-plist	Thu May  7 10:58:35 2020	(r534257)
+++ head/sysutils/rundeck2/pkg-plist	Thu May  7 11:10:39 2020	(r534258)
@@ -1,3 +1,3 @@
 %%DATADIR%%/rundeck-launcher.jar
- at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib
- at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server
+ at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server/lib
+ at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server

Modified: head/sysutils/rundeck3/Makefile
==============================================================================
--- head/sysutils/rundeck/Makefile	Thu May  7 01:45:10 2020	(r534230)
+++ head/sysutils/rundeck3/Makefile	Thu May  7 11:10:39 2020	(r534258)
@@ -1,13 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	rundeck
-DISTVERSION=	2.11.14
+DISTVERSION=	3.2.6
+DISTVERSIONSUFFIX=	20200427
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://dl.bintray.com/rundeck/rundeck-maven/
-DISTNAME=	rundeck-launcher-${PORTVERSION}
-EXTRACT_SUFX=	.jar
+PKGNAMESUFFIX=	3
+DISTNAME=	${PORTNAME}-${DISTVERSION}-${DISTVERSIONSUFFIX}
+EXTRACT_SUFX=	.war
 
-MAINTAINER=	arcade at b1t.name
+MAINTAINER=	daniel.tihanyi at tetragir.com
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
 
 LICENSE=	APACHE20
@@ -15,6 +17,8 @@ LICENSE=	APACHE20
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
+CONFLICTS_INSTALL=	rundeck2
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
@@ -40,6 +44,6 @@ SUB_LIST+=	RUNDECK_HOME=${RUNDECK_HOME} RUNDECK_USER=$
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${RUNDECK_HOME}/server/lib
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		${STAGEDIR}${DATADIR}/rundeck-launcher${EXTRACT_SUFX}
+		${STAGEDIR}${DATADIR}/rundeck${EXTRACT_SUFX}
 
 .include <bsd.port.mk>

Modified: head/sysutils/rundeck3/distinfo
==============================================================================
--- head/sysutils/rundeck/distinfo	Thu May  7 01:45:10 2020	(r534230)
+++ head/sysutils/rundeck3/distinfo	Thu May  7 11:10:39 2020	(r534258)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570615790
-SHA256 (rundeck-launcher-2.11.14.jar) = 53b3436cf7234f8fd26986e0b35bb5d42569570ca99e8580c6a616ae98b6973f
-SIZE (rundeck-launcher-2.11.14.jar) = 102513074
+TIMESTAMP = 1588154995
+SHA256 (rundeck-3.2.6-20200427.war) = a866c32d866d7b28470e439eeb8c490625d2b116dcc0451a17e198891573cafb
+SIZE (rundeck-3.2.6-20200427.war) = 165490944

Modified: head/sysutils/rundeck3/files/rundeck.in
==============================================================================
--- head/sysutils/rundeck/files/rundeck.in	Thu May  7 01:45:10 2020	(r534230)
+++ head/sysutils/rundeck3/files/rundeck.in	Thu May  7 11:10:39 2020	(r534258)
@@ -58,7 +58,7 @@ pidfile="/var/run/rundeck/rundeck.pid"
 command="/usr/sbin/daemon"
 java_cmd="${rundeck_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck-launcher.jar ${rundeck_args} > ${rundeck_log_file} 2>&1"
+command_args="-p ${pidfile} ${java_cmd} ${rundeck_java_opts} -jar %%DATADIR%%/rundeck.war ${rundeck_args} > ${rundeck_log_file} 2>&1"
 required_files="${java_cmd}"
 
 start_precmd="rundeck_prestart"

Modified: head/sysutils/rundeck3/pkg-plist
==============================================================================
--- head/sysutils/rundeck/pkg-plist	Thu May  7 01:45:10 2020	(r534230)
+++ head/sysutils/rundeck3/pkg-plist	Thu May  7 11:10:39 2020	(r534258)
@@ -1,3 +1,3 @@
-%%DATADIR%%/rundeck-launcher.jar
- at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server/lib
- at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%,755) rundeck/server
+%%DATADIR%%/rundeck.war
+ at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server/lib
+ at dir(%%RUNDECK_USER%%,%%RUNDECK_GROUP%%) rundeck/server
