upgrade to 1.0.7

PR:		32702
Submitted by:	Leo Kim <leo@florida.sarang.net>

5 files changed, 38 insertions, 37 deletions

diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 4fc677524ae8..112498c4fdfd 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libshout
-PORTVERSION=	1.0.5
+PORTVERSION=	1.0.7
 CATEGORIES=	audio net
 MASTER_SITES=	http://developer.icecast.org/libshout/releases/
 
diff --git a/audio/libshout2/distinfo b/audio/libshout2/distinfo
index e356b8db1186..97be1b6a634d 100644
--- a/audio/libshout2/distinfo
+++ b/audio/libshout2/distinfo
@@ -1 +1 @@
-MD5 (libshout-1.0.5.tar.gz) = f0acb01c1ee60366b46b622ecda229f3
+MD5 (libshout-1.0.7.tar.gz) = 7e8054f8c6dbb0bd9179057e2ee465c1
diff --git a/audio/libshout2/files/patch-aa b/audio/libshout2/files/patch-aa
index 38fbcef5d597..7787a49dec2f 100644
--- a/audio/libshout2/files/patch-aa
+++ b/audio/libshout2/files/patch-aa
@@ -1,15 +1,16 @@
---- Makefile.in.orig	Sun May  7 23:13:49 2000
-+++ Makefile.in	Tue Jun  6 16:54:30 2000
-@@ -486,9 +486,9 @@
+--- Makefile.in.orig	Wed Aug  1 17:56:09 2001
++++ Makefile.in	Tue Dec 11 08:50:30 2001
+@@ -507,9 +507,10 @@
  
  install-data-local:
  	mkdir -p $(DESTDIR)$(includedir)/shout
 -	mkdir -p $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
--	$(INSTALL) -m 0644 README AUTHORS COPYING CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)
--	$(INSTALL) -m 0644 example/Makefile example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
-+	mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)/example
-+	$(INSTALL) -m 0644 README AUTHORS COPYING CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-+	$(INSTALL) -m 0644 example/Makefile example/example.c $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)/example
- 	$(INSTALL) -m 0644 shout.h $(DESTDIR)$(includedir)/shout
+-	$(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)
+-	$(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/doc/$(PACKAGE)-$(VERSION)/example
++	mkdir -p $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	mkdir -p $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 0644 $(top_srcdir)/README $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/CHANGES $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++	$(INSTALL) -m 0644 $(top_srcdir)/example/Makefile $(top_srcdir)/example/example.c $(DESTDIR)$(prefix)/share/examples/$(PACKAGE)-$(VERSION)
+ 	$(INSTALL) -m 0644 $(top_srcdir)/shout.h $(DESTDIR)$(includedir)/shout
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/audio/libshout2/files/patch-ab b/audio/libshout2/files/patch-ab
index 568ff5c0b299..65112e1f5765 100644
--- a/audio/libshout2/files/patch-ab
+++ b/audio/libshout2/files/patch-ab
@@ -1,11 +1,11 @@
---- doc/Makefile.in.orig	Sun May  7 23:13:50 2000
-+++ doc/Makefile.in	Tue Jun  6 16:56:33 2000
-@@ -78,7 +78,7 @@
+--- doc/Makefile.in.orig	Tue Dec 11 09:28:01 2001
++++ doc/Makefile.in	Tue Dec 11 09:28:08 2001
+@@ -76,7 +76,7 @@
  
  AUTOMAKE_OPTIONS = foreign
  
 -docdir = $(prefix)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
  
- doc_DATA = index.html overview.html initialization.html 		connection.html datastreaming.html metadata.html 		datastructures.html shout_conn_t.html 		shout_connect.html shout_disconnect.html shout_sleep.html 		shout_init_connection.html shout_send_data.html 		shout_update_metadata.html style.css 		example.html example_c.html reference.html
+ doc_DATA = index.html overview.html initialization.html 		connection.html datastreaming.html metadata.html 		datastructures.html shout_conn_t.html 		shout_connect.html shout_disconnect.html shout_sleep.html 		shout_init_connection.html shout_send_data.html 		shout_update_metadata.html style.css 		example.html example_c.html reference.html 		errorhandling.html shout_strerror.html
  
diff --git a/audio/libshout2/pkg-plist b/audio/libshout2/pkg-plist
index 871984ae1d2e..4b771016fcc8 100644
--- a/audio/libshout2/pkg-plist
+++ b/audio/libshout2/pkg-plist
@@ -1,34 +1,34 @@
-lib/libshout.a
-lib/libshout.la
-lib/libshout.so
-lib/libshout.so.1
 include/shout/shout.h
-@dirrm include/shout
-share/doc/libshout-%%PORTVERSION%%/example.html
-share/doc/libshout-%%PORTVERSION%%/example/Makefile
-share/doc/libshout-%%PORTVERSION%%/example/example.c
-share/doc/libshout-%%PORTVERSION%%/example_c.html
-@dirrm share/doc/libshout-%%PORTVERSION%%/example
-share/doc/libshout-%%PORTVERSION%%/AUTHORS
-share/doc/libshout-%%PORTVERSION%%/CHANGES
-share/doc/libshout-%%PORTVERSION%%/COPYING
-share/doc/libshout-%%PORTVERSION%%/README
-share/doc/libshout-%%PORTVERSION%%/connection.html
-share/doc/libshout-%%PORTVERSION%%/datastreaming.html
-share/doc/libshout-%%PORTVERSION%%/datastructures.html
-share/doc/libshout-%%PORTVERSION%%/errorhandling.html
+lib/libshout.so.2
+lib/libshout.so
+lib/libshout.la
+lib/libshout.a
 share/doc/libshout-%%PORTVERSION%%/index.html
+share/doc/libshout-%%PORTVERSION%%/overview.html
 share/doc/libshout-%%PORTVERSION%%/initialization.html
+share/doc/libshout-%%PORTVERSION%%/connection.html
+share/doc/libshout-%%PORTVERSION%%/datastreaming.html
 share/doc/libshout-%%PORTVERSION%%/metadata.html
-share/doc/libshout-%%PORTVERSION%%/overview.html
-share/doc/libshout-%%PORTVERSION%%/reference.html
+share/doc/libshout-%%PORTVERSION%%/datastructures.html
 share/doc/libshout-%%PORTVERSION%%/shout_conn_t.html
 share/doc/libshout-%%PORTVERSION%%/shout_connect.html
 share/doc/libshout-%%PORTVERSION%%/shout_disconnect.html
+share/doc/libshout-%%PORTVERSION%%/shout_sleep.html
 share/doc/libshout-%%PORTVERSION%%/shout_init_connection.html
 share/doc/libshout-%%PORTVERSION%%/shout_send_data.html
-share/doc/libshout-%%PORTVERSION%%/shout_sleep.html
-share/doc/libshout-%%PORTVERSION%%/shout_strerror.html
 share/doc/libshout-%%PORTVERSION%%/shout_update_metadata.html
 share/doc/libshout-%%PORTVERSION%%/style.css
+share/doc/libshout-%%PORTVERSION%%/example.html
+share/doc/libshout-%%PORTVERSION%%/example_c.html
+share/doc/libshout-%%PORTVERSION%%/reference.html
+share/doc/libshout-%%PORTVERSION%%/errorhandling.html
+share/doc/libshout-%%PORTVERSION%%/shout_strerror.html
+share/doc/libshout-%%PORTVERSION%%/README
+share/doc/libshout-%%PORTVERSION%%/AUTHORS
+share/doc/libshout-%%PORTVERSION%%/COPYING
+share/doc/libshout-%%PORTVERSION%%/CHANGES
+share/examples/libshout-%%PORTVERSION%%/Makefile
+share/examples/libshout-%%PORTVERSION%%/example.c
+@dirrm include/shout
 @dirrm share/doc/libshout-%%PORTVERSION%%
+@dirrm share/examples/libshout-%%PORTVERSION%%