8 files changed, 19 insertions, 93 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 2fe570c6fa34..712765c08d3e 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.3.4
-PORTREVISION=	2
+PORTVERSION=	1.3.5
 PORTEPOCH=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
@@ -17,12 +16,13 @@ USES=		libtool pathfix tar:xz
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-ogg=${LOCALBASE} \
-		--disable-docs		# don't rebuild
+CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-stage:
+	cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} libvorbis
 	${LN} -s libvorbis.so.0 ${STAGEDIR}${PREFIX}/lib/libvorbis.so.4
 	${LN} -s libvorbisfile.so.3 ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.6
 
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index d0b31f827b0e..3cdedc491338 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libvorbis-1.3.4.tar.xz) = 2f05497d29195dc23ee952a24ee3973a74e6277569c4c2eca0ec5968e541f372
-SIZE (libvorbis-1.3.4.tar.xz) = 1091376
+SHA256 (libvorbis-1.3.5.tar.xz) = 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
+SIZE (libvorbis-1.3.5.tar.xz) = 1193144
diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure
index 7ee13f0530af..f970a1a4e896 100644
--- a/audio/libvorbis/files/patch-configure
+++ b/audio/libvorbis/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	2010-06-05 15:16:53.000000000 +0200
-+++ configure	2010-06-05 15:20:42.000000000 +0200
-@@ -11778,7 +11778,7 @@ if test -z "$GCC"; then
+--- configure.orig	2015-02-26 22:09:49 UTC
++++ configure
+@@ -12672,7 +12672,7 @@ if test -z "$GCC"; then
  		PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
  	*)
  		DEBUG="-g"
@@ -12,16 +9,16 @@ $FreeBSD$
  		PROFILE="-g -p" ;;
          esac
  else
-@@ -11956,9 +11956,9 @@ rm -f core conftest.err conftest.$ac_obj
- 		CFLAGS="-O20 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
+@@ -12816,9 +12816,9 @@ rm -f core conftest.err conftest.$ac_obj
+ 		CFLAGS="-O3 -Wall -W -ffast-math -D_REENTRANT -fsigned-char"
+ 		PROFILE="-pg -g -O3 -ffast-math -D_REENTRANT -fsigned-char";;
   	*)
 -		DEBUG="-g -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
--		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
--		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
+-		CFLAGS="-O3 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
+-		PROFILE="-O3 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
 +		DEBUG="-g -Wall -Wextra -fsigned-char"
 +		CFLAGS="-Wall -Wextra -fsigned-char"
 +		PROFILE="-g -pg -fsigned-char" ;;
          esac
  
-         { echo "$as_me:$LINENO: checking if $CC accepts -Wdeclaration-after-statement" >&5
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -Wdeclaration-after-statement" >&5
diff --git a/audio/libvorbis/files/patch-doc_Makefile.in b/audio/libvorbis/files/patch-doc_Makefile.in
deleted file mode 100644
index 48f6fe1999d6..000000000000
--- a/audio/libvorbis/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in.orig	2010-03-26 08:00:08.000000000 +0100
-+++ doc/Makefile.in	2010-06-05 15:26:43.000000000 +0200
-@@ -171,7 +171,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -275,7 +275,7 @@ SPEC_TEX = \
- 	footer.tex
- 
- built_docs = Vorbis_I_spec.pdf Vorbis_I_spec.html Vorbis_I_spec.css
--@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) doxygen-build.stamp
-+@BUILD_DOCS_FALSE@doc_DATA = $(static_docs)
- 
- # conditionally make the generated documentation
- @BUILD_DOCS_TRUE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs) doxygen-build.stamp
diff --git a/audio/libvorbis/files/patch-doc_libvorbis_Makefile.in b/audio/libvorbis/files/patch-doc_libvorbis_Makefile.in
deleted file mode 100644
index ce59b8cd4b58..000000000000
--- a/audio/libvorbis/files/patch-doc_libvorbis_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/libvorbis/Makefile.in.orig
-+++ doc/libvorbis/Makefile.in
-@@ -158,7 +158,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/libvorbis
-+docdir = $(datadir)/doc/$(PACKAGE)/libvorbis
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
deleted file mode 100644
index cf04fdc10c9a..000000000000
--- a/audio/libvorbis/files/patch-doc_vorbisenc_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/vorbisenc/Makefile.in.orig	2009-07-06 20:04:38.000000000 +0200
-+++ doc/vorbisenc/Makefile.in	2009-07-06 20:04:49.000000000 +0200
-@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
-+docdir = $(datadir)/doc/$(PACKAGE)/vorbisenc
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in b/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
deleted file mode 100644
index 75c50cf16c50..000000000000
--- a/audio/libvorbis/files/patch-doc_vorbisfile_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/vorbisfile/Makefile.in.orig	2009-07-06 20:05:09.000000000 +0200
-+++ doc/vorbisfile/Makefile.in	2009-07-06 20:05:20.000000000 +0200
-@@ -156,7 +156,7 @@ build_vendor = @build_vendor@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
-+docdir = $(datadir)/doc/$(PACKAGE)/vorbisfile
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 687957d2ec6d..6f2fc734dc5a 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -4,23 +4,23 @@ include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.so
 lib/libvorbis.so.0
-lib/libvorbis.so.0.4.7
+lib/libvorbis.so.0.4.8
 lib/libvorbis.so.4
 lib/libvorbisenc.a
 lib/libvorbisenc.so
 lib/libvorbisenc.so.2
-lib/libvorbisenc.so.2.0.10
+lib/libvorbisenc.so.2.0.11
 lib/libvorbisfile.a
 lib/libvorbisfile.so
 lib/libvorbisfile.so.3
-lib/libvorbisfile.so.3.3.6
+lib/libvorbisfile.so.3.3.7
 lib/libvorbisfile.so.6
 libdata/pkgconfig/vorbis.pc
 libdata/pkgconfig/vorbisenc.pc
 libdata/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
+%%PORTDOCS%%%%DOCSDIR%%/doxygen-build.stamp
 %%PORTDOCS%%%%DOCSDIR%%/eightphase.png
-%%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/fish_xiph_org.png
 %%PORTDOCS%%%%DOCSDIR%%/floor1_inverse_dB_table.html
 %%PORTDOCS%%%%DOCSDIR%%/floorval.png
@@ -73,8 +73,6 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_synthesis_restart.html
 %%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_synthesis_trackonly.html
 %%PORTDOCS%%%%DOCSDIR%%/libvorbis/vorbis_version_string.html
-%%PORTDOCS%%%%DOCSDIR%%/lspmap.png
-%%PORTDOCS%%%%DOCSDIR%%/oddlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/oggstream.html
 %%PORTDOCS%%%%DOCSDIR%%/programming.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc5215.txt
@@ -86,7 +84,6 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-clip.txt
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-errors.txt
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-fidelity.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/changes.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/index.html
@@ -158,6 +155,3 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/threads.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbisword2.png
-%%PORTDOCS%%%%DOCSDIR%%/wait.png
-%%PORTDOCS%%%%DOCSDIR%%/white-xifish.png