5 files changed, 92 insertions, 20 deletions

diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index 1c9be5a934ac..1b0a12d59fca 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libsamplerate
-PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTVERSION=	0.1.8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/SRC/
 
diff --git a/audio/libsamplerate/distinfo b/audio/libsamplerate/distinfo
index 30cf07fda017..45945ac4393a 100644
--- a/audio/libsamplerate/distinfo
+++ b/audio/libsamplerate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libsamplerate-0.1.7.tar.gz) = 78ed5d9ff1bf162c4a078f6a3e7432a537dd2f22dc58872b081fb01156027fcc
-SIZE (libsamplerate-0.1.7.tar.gz) = 4340619
+SHA256 (libsamplerate-0.1.8.tar.gz) = 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06
+SIZE (libsamplerate-0.1.8.tar.gz) = 4303330
diff --git a/audio/libsamplerate/files/patch-configure b/audio/libsamplerate/files/patch-configure
new file mode 100644
index 000000000000..5c8071e93bcc
--- /dev/null
+++ b/audio/libsamplerate/files/patch-configure
@@ -0,0 +1,40 @@
+--- configure.orig	2011-08-24 08:46:26.000000000 -0300
++++ configure	2011-08-24 08:47:26.000000000 -0300
+@@ -17137,12 +17137,12 @@
+ 		;;
+ 	esac
+ 
+-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
++htmldocdir=$prefix/share/doc/libsamplerate
+ 
+ if test $prefix = "NONE" ; then
+-	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
++	htmldocdir=/usr/local/share/doc/libsamplerate
+ else
+-	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
++	htmldocdir=$prefix/share/doc/libsamplerate
+ 	fi
+ 
+ #====================================================================================
+@@ -20124,18 +20124,18 @@
+ 
+     Library directory : ........... ${prefix}/lib
+     Program directory : ........... ${prefix}/bin
+-    Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
++    Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
+ " >&5
+ $as_echo "  Installation directories :
+ 
+     Library directory : ........... ${prefix}/lib
+     Program directory : ........... ${prefix}/bin
+-    Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
++    Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
+ " >&6; }
+ 
+ if test x$prefix != "x/usr" ; then
+ 	echo "Compiling some other packages against ${PACKAGE} may require "
+-	echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the "
++	echo -e "the addition of \"${prefix}/libdata/pkgconfig\" to the "
+ 	echo -e "PKG_CONFIG_PATH environment variable.\n"
+ 	fi
+ 
diff --git a/audio/libsamplerate/files/patch-configure.ac b/audio/libsamplerate/files/patch-configure.ac
new file mode 100644
index 000000000000..15c381f2a015
--- /dev/null
+++ b/audio/libsamplerate/files/patch-configure.ac
@@ -0,0 +1,33 @@
+--- configure.ac.orig	2011-08-24 08:46:32.000000000 -0300
++++ configure.ac	2011-08-24 08:48:08.000000000 -0300
+@@ -262,12 +262,12 @@
+ 		;;
+ 	esac
+ 
+-htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
++htmldocdir=$prefix/share/doc/libsamplerate/html
+ 
+ if test $prefix = "NONE" ; then
+-	htmldocdir=/usr/local/share/doc/libsamplerate0-dev/html
++	htmldocdir=/usr/local/share/doc/libsamplerate
+ else
+-	htmldocdir=$prefix/share/doc/libsamplerate0-dev/html
++	htmldocdir=$prefix/share/doc/libsamplerate
+ 	fi
+ 
+ #====================================================================================
+@@ -331,12 +331,12 @@
+ 
+     Library directory : ........... ${prefix}/lib
+     Program directory : ........... ${prefix}/bin
+-    Pkgconfig directory : ......... ${prefix}/lib/pkgconfig
++    Pkgconfig directory : ......... ${prefix}/libdata/pkgconfig
+ ])
+ 
+ if test x$prefix != "x/usr" ; then
+ 	echo "Compiling some other packages against ${PACKAGE} may require "
+-	echo -e "the addition of \"${prefix}/lib/pkgconfig\" to the "
++	echo -e "the addition of \"${prefix}/libdata/pkgconfig\" to the "
+ 	echo -e "PKG_CONFIG_PATH environment variable.\n"
+ 	fi
+ 
diff --git a/audio/libsamplerate/pkg-plist b/audio/libsamplerate/pkg-plist
index fa0dbf71d842..ce91b5ea44bb 100644
--- a/audio/libsamplerate/pkg-plist
+++ b/audio/libsamplerate/pkg-plist
@@ -5,19 +5,19 @@ lib/libsamplerate.la
 lib/libsamplerate.so
 lib/libsamplerate.so.1
 libdata/pkgconfig/samplerate.pc
-%%PORTDOCS%%%%DOCSDIR%%/SRC.css
-%%PORTDOCS%%%%DOCSDIR%%/SRC.png
-%%PORTDOCS%%%%DOCSDIR%%/api.html
-%%PORTDOCS%%%%DOCSDIR%%/api_callback.html
-%%PORTDOCS%%%%DOCSDIR%%/api_full.html
-%%PORTDOCS%%%%DOCSDIR%%/api_misc.html
-%%PORTDOCS%%%%DOCSDIR%%/api_simple.html
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/history.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/lists.html
-%%PORTDOCS%%%%DOCSDIR%%/quality.html
-%%PORTDOCS%%%%DOCSDIR%%/win32.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DOCSDIR%%/SRC.css
+%%DOCSDIR%%/SRC.png
+%%DOCSDIR%%/api.html
+%%DOCSDIR%%/api_callback.html
+%%DOCSDIR%%/api_full.html
+%%DOCSDIR%%/api_misc.html
+%%DOCSDIR%%/api_simple.html
+%%DOCSDIR%%/download.html
+%%DOCSDIR%%/faq.html
+%%DOCSDIR%%/history.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/license.html
+%%DOCSDIR%%/lists.html
+%%DOCSDIR%%/quality.html
+%%DOCSDIR%%/win32.html
+@dirrm %%DOCSDIR%%