moc 2.5.1, 2.6-alpha2 (devel)

moc 2.5.1

Also add devel version 2.6-alpha2, which additionally depends on popt.

Release announcement: https://moc.daper.net/node/1504.

Closes #567.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>

Formula/moc.rb

@@ -1,19 +1,11 @@
 class Moc < Formula
   desc "Terminal-based music player"
   homepage "https://moc.daper.net"
-  revision 2
   head "svn://daper.net/moc/trunk"
 
   stable do
-    url "http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.0.tar.bz2"
-    sha256 "d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091"
-
-    # Backport r2779: Adapt to FFmpeg/LibAV's audioconvert.h rename (commit 5980f5dd).
-    # Necessary for building against FFmpeg 3.0. See https://moc.daper.net/node/1496.
-    patch do
-      url "https://raw.githubusercontent.com/Homebrew/patches/1282e60/moc/moc-2.5.0.diff"
-      sha256 "1a7d2d7f967c8182db01dd95d5a05aac8f2acae2eac6fcda419baaed068bc8ef"
-    end
+    url "http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.1.tar.bz2"
+    sha256 "1b419c75a92a85ff4ee7670c65d660c86fef32032c65e89e868b988f80fac4f2"
   end
 
   bottle do
@@ -22,6 +14,12 @@ class Moc < Formula
     sha256 "39a6dc0a11c173a4e4556d7774061c12fdaf532a218ca1891ce367c453c75c31" => :mavericks
   end
 
+  devel do
+    url "http://ftp.daper.net/pub/soft/moc/unstable/moc-2.6-alpha2.tar.xz"
+    version "2.6-alpha2"
+    sha256 "0a3a4fb11227ec58025f7177a3212aca9c9955226a2983939e8db662af13434b"
+  end
+
   option "with-ncurses", "Build with wide character support."
 
   depends_on "autoconf" => :build
@@ -43,6 +41,8 @@ class Moc < Formula
   depends_on "libmagic" => :optional
   depends_on "homebrew/dupes/ncurses" => :optional
 
+  depends_on "popt" if build.devel?
+
   def install
     system "autoreconf", "-fvi"
     system "./configure", "--disable-debug", "--prefix=#{prefix}"