Integrate rcsslogplayer and rcssmonitor into rcssserver

Closes #31768.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

3 files changed, 31 insertions, 52 deletions

diff --git a/Library/Formula/rcsslogplayer.rb b/Library/Formula/rcsslogplayer.rb
deleted file mode 100644
index 00e3311b3..000000000
--- a/Library/Formula/rcsslogplayer.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "formula"
-
-class Rcsslogplayer < Formula
-  homepage "http://sserver.sourceforge.net/"
-  url "https://downloads.sourceforge.net/sserver/rcsslogplayer/15.1.0/rcsslogplayer-15.1.0.tar.gz"
-  sha1 "f1a4140ca98a642e87ea8862c9dcfc6b335df008"
-
-  bottle do
-    sha1 "e14d2392e672bd1497dd3f7199dee35d413b0afe" => :mavericks
-    sha1 "40532bbf785d987c7417c6914708e2497127318c" => :mountain_lion
-    sha1 "e5f256e90585f06e9767d0ea6031fcff691dbf24" => :lion
-  end
-
-  depends_on "pkg-config" => :build
-  depends_on "qt"
-  depends_on "boost"
-
-  def install
-    system "./configure", "--prefix=#{prefix}"
-    system "make", "install"
-  end
-
-  test do
-    system "#{bin}/rcsslogplayer --version | tail -1 | grep 'rcsslogplayer Version #{version}'"
-  end
-end
diff --git a/Library/Formula/rcssmonitor.rb b/Library/Formula/rcssmonitor.rb
deleted file mode 100644
index 7858487fa..000000000
--- a/Library/Formula/rcssmonitor.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "formula"
-
-class Rcssmonitor < Formula
-  homepage "http://sserver.sourceforge.net/"
-  url "https://downloads.sourceforge.net/sserver/rcssmonitor/15.1.0/rcssmonitor-15.1.0.tar.gz"
-  sha1 "9a2c1905429882291267b463ec1db858ab0dde90"
-
-  bottle do
-    sha1 "07ae3bf0142c044c374f2366458388aa1c3a483f" => :mavericks
-    sha1 "c87a3380c6390b7d75126d777d03dbf83055d9f7" => :mountain_lion
-    sha1 "a03085dccc0377736de773ff39915db61a9a4dfd" => :lion
-  end
-
-  depends_on "pkg-config" => :build
-  depends_on "qt"
-  depends_on "boost"
-
-  def install
-    system "./configure", "--prefix=#{prefix}"
-    system "make", "install"
-  end
-
-  test do
-    system "#{bin}/rcssmonitor --version | tail -1 | grep 'rcssmonitor Version #{version}'"
-  end
-end
diff --git a/Library/Formula/rcssserver.rb b/Library/Formula/rcssserver.rb
index 765a91413..fd1522e95 100644
--- a/Library/Formula/rcssserver.rb
+++ b/Library/Formula/rcssserver.rb
@@ -12,9 +12,29 @@ class Rcssserver < Formula
     sha1 "ab94f23eae47b48ce2f9ed3d94e727f2d7387289" => :lion
   end
 
+  stable do
+    resource "rcssmonitor" do
+      url "https://downloads.sourceforge.net/sserver/rcssmonitor/15.1.1/rcssmonitor-15.1.1.tar.gz"
+      sha1 "60483838a81acd8ada6d228a86e54faeb019ab10"
+    end
+
+    resource "rcsslogplayer" do
+      url "https://downloads.sourceforge.net/sserver/rcsslogplayer/15.1.1/rcsslogplayer-15.1.1.tar.gz"
+      sha1 "d0b8f8e8a4328398655140e7c019149ab8d9c1c3"
+    end
+  end
+
   head do
     url "svn://svn.code.sf.net/p/sserver/code/rcss/trunk/rcssserver"
 
+    resource "rcssmonitor" do
+      url "svn://svn.code.sf.net/p/sserver/code/rcss/trunk/rcssmonitor_qt4"
+    end
+
+    resource "rcsslogplayer" do
+      url "svn://svn.code.sf.net/p/sserver/code/rcss/trunk/rcsslogplayer"
+    end
+
     depends_on "autoconf" => :build
     depends_on "automake" => :build
     depends_on "libtool" => :build
@@ -23,6 +43,7 @@ class Rcssserver < Formula
   depends_on "flex" => :build
   depends_on "pkg-config" => :build
   depends_on "boost"
+  depends_on "qt"
 
   def install
     ENV.j1
@@ -43,9 +64,19 @@ class Rcssserver < Formula
 
     system "./configure", "--prefix=#{prefix}"
     system "make", "install"
+
+    resources.each do |r|
+      r.stage do
+        system "./bootstrap" if build.head?
+        system "./configure", "--prefix=#{prefix}"
+        system "make", "install"
+      end
+    end
   end
 
   test do
     system "#{bin}/rcssserver help | head -1 | grep 'rcssserver-#{version}'"
+    system "#{bin}/rcsslogplayer --version | tail -1 | grep 'rcsslogplayer Version'"
+    system "#{bin}/rcssmonitor --version | tail -1 | grep 'rcssmonitor Version'"
   end
 end