6 files changed, 53 insertions, 14 deletions

diff --git a/audio/ruby-shout/Makefile b/audio/ruby-shout/Makefile
index 947b971b4e6d..69e15c3999e1 100644
--- a/audio/ruby-shout/Makefile
+++ b/audio/ruby-shout/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	shout
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	audio ruby
-MASTER_SITES=	http://www.dingoskidneys.com/~jaredj/downloads/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/7211/
 MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
@@ -22,7 +21,7 @@ LIB_DEPENDS=	shout.5:${PORTSDIR}/audio/libshout2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-
+RUBY_EXTCONF=	ext/extconf.rb
 INSTALL_TARGET=	site-install
 
 DOCS=		README	doc
diff --git a/audio/ruby-shout/distinfo b/audio/ruby-shout/distinfo
index 5ec69f4c6ae1..bf4372e3dfe5 100644
--- a/audio/ruby-shout/distinfo
+++ b/audio/ruby-shout/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-shout-2.0.tar.gz) = 328e1300ef39baa8b385633deded824b
-SHA256 (ruby/ruby-shout-2.0.tar.gz) = 8ed96ffd6409b15f8a7cce0a90d686eb9d8085f68a12610e195ed2b43acbde0f
-SIZE (ruby/ruby-shout-2.0.tar.gz) = 9664
+MD5 (ruby/ruby-shout-2.1.tar.gz) = 10a3adc40dfe0100f9c845a3e56adf68
+SHA256 (ruby/ruby-shout-2.1.tar.gz) = 750e25a860857a25e13dbe7f683ed757668f64a96f978fc8795ae6a41e57d4b9
+SIZE (ruby/ruby-shout-2.1.tar.gz) = 43999
diff --git a/audio/ruby-shout/files/patch-extconf.rb b/audio/ruby-shout/files/patch-ext_extconf.rb
index 8c3a85a06874..af595ca1db8a 100644
--- a/audio/ruby-shout/files/patch-extconf.rb
+++ b/audio/ruby-shout/files/patch-ext_extconf.rb
@@ -1,10 +1,11 @@
---- extconf.rb.orig	Mon Jan 16 22:19:37 2006
-+++ extconf.rb	Mon Jan 16 22:19:50 2006
-@@ -3,6 +3,7 @@
+--- ext/extconf.rb.orig	Sun Nov 20 15:53:45 2005
++++ ext/extconf.rb	Mon Jan 30 17:23:19 2006
+@@ -3,7 +3,7 @@
  dir_config("shout")
  have_library("ogg", "oggpack_writeinit")
  have_library("vorbis", "vorbis_dsp_clear")
+-have_library("pthread", "pthread_create")
 +have_library("speex", "speex_decode")
- have_library("pthread", "pthread_create")
  if find_library("shout", "shout_init","/usr","/usr/local") and have_header("shout/shout.h")
      create_makefile("shout")
+ else
diff --git a/audio/ruby-shout/files/patch-ext_shout.c b/audio/ruby-shout/files/patch-ext_shout.c
new file mode 100644
index 000000000000..f388bc16ea8a
--- /dev/null
+++ b/audio/ruby-shout/files/patch-ext_shout.c
@@ -0,0 +1,16 @@
+--- ext/shout.c.orig	Mon Jan 30 17:53:08 2006
++++ ext/shout.c	Mon Jan 30 17:54:51 2006
+@@ -606,9 +606,10 @@ VALUE _sh_description_eq(VALUE self, VAL
+  */
+ VALUE _sh_metadata_eq(VALUE self, VALUE meta) {
+         int err;
+-        shout_connection *s; GET_SC(self, s);
+-        shout_metadata_t *m; Data_Get_Struct(meta, shout_metadata_t, m);
+-
++        shout_connection *s;
++        shout_metadata_t *m;
++	GET_SC(self, s);
++	Data_Get_Struct(meta, shout_metadata_t, m);
+         err = shout_set_metadata(s->conn, m);
+ 
+         if(err != SHOUTERR_SUCCESS) {
diff --git a/audio/ruby-shout/pkg-descr b/audio/ruby-shout/pkg-descr
index 333453eff9dc..5d0d6aba921f 100644
--- a/audio/ruby-shout/pkg-descr
+++ b/audio/ruby-shout/pkg-descr
@@ -2,4 +2,4 @@ Ruby-shout is a binding to the libshout library, which sends streaming
 MP3/Vorbis to an icecast server with libshout.
 
 Author:	jared jennings <jjenning@fastmail.fm>
-WWW:	http://www.dingoskidneys.com/~jaredj/shout.html
+WWW:	http://ruby-shout.rubyforge.org/
diff --git a/audio/ruby-shout/pkg-plist b/audio/ruby-shout/pkg-plist
index 1a9af75d32b3..3b6abf8f6e89 100644
--- a/audio/ruby-shout/pkg-plist
+++ b/audio/ruby-shout/pkg-plist
@@ -5,6 +5,7 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000001.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000002.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000003.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000004.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000005.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000006.html
@@ -13,6 +14,22 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000009.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000010.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000011.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000012.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000013.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000014.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000015.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000016.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000017.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000018.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000019.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000020.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000021.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000022.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000023.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000024.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000025.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000026.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000027.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000028.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000029.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000030.html
@@ -27,16 +44,22 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000039.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000040.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000041.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000042.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000043.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000044.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/Shout.src/M000045.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/ShoutError.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/classes/ShoutMetadata.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/created.rid
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/example_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/extconf_rb.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/shout_c.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/ext/shout_c.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/files/ext/extconf_rb.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_class_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_file_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/fr_method_index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/index.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/doc/rdoc-style.css
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files/ext
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/files
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes/Shout.src
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/doc/classes