Fix default module path to not include trailing slashes as it breaks

libtool.

2 files changed, 22 insertions, 11 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index a12a2096c02..db59d515dc1 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/07/28 12:52:40 tnn Exp $
+$NetBSD: distinfo,v 1.16 2009/09/18 09:59:54 joerg Exp $
 
 SHA1 (pulseaudio-0.9.14.tar.gz) = a0fb7c21ee21178e102a1e5a11d8ac474e6f5da4
 RMD160 (pulseaudio-0.9.14.tar.gz) = c7722d0d0240555edf917391989ad2e1cd4eb6b1
@@ -16,6 +16,6 @@ SHA1 (patch-aj) = 50edf909d5d7cc35e925685cdf0831e73d06f6ec
 SHA1 (patch-ak) = 2a2f80a2ab4b30f2daaebdb1ad0bcb54345743cd
 SHA1 (patch-al) = 26999d41484421c0995282045783e3c9df36d4d4
 SHA1 (patch-am) = 402dfc10280ec2b6a45781ad6d7b0daa89e2ae34
-SHA1 (patch-ba) = da9742d49ecb409cd13bee4468e64f982c03cffe
+SHA1 (patch-ba) = 6b1ac267a317eed77efc2fbfc2fddebc3a8a69d2
 SHA1 (patch-bb) = ae0209dac352df7abfcf66c452f2ebb91e35e42a
 SHA1 (patch-ca) = 75eef8955fa368a144b9e55258389332a177ed6c
diff --git a/audio/pulseaudio/patches/patch-ba b/audio/pulseaudio/patches/patch-ba
index 197f4cc2dfb..b96685e391a 100644
--- a/audio/pulseaudio/patches/patch-ba
+++ b/audio/pulseaudio/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
+$NetBSD: patch-ba,v 1.4 2009/09/18 09:59:54 joerg Exp $
 
---- configure.ac.orig	2008-10-05 20:39:37.000000000 -0400
-+++ configure.ac	2008-12-23 12:38:28.000000000 -0500
-@@ -125,7 +125,18 @@
+--- configure.ac.orig	2009-01-13 00:44:27.000000000 +0100
++++ configure.ac
+@@ -125,7 +125,18 @@ AC_ARG_ENABLE([atomic-arm-memory-barrier
                  no) ;;
                  *) AC_MSG_ERROR(bad value ${enableval} for --disable-atomic-arm-linux-helpers) ;;
              esac
@@ -22,7 +22,7 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
  
  AC_MSG_CHECKING([target operating system])
  case $host in
-@@ -133,6 +144,10 @@
+@@ -133,6 +144,10 @@ case $host in
  	    AC_MSG_RESULT([linux])
  	    pulse_target_os=linux
      	;;
@@ -33,7 +33,7 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
  	*)
  	    AC_MSG_RESULT([unknown])
  	    pulse_target_os=unknown
-@@ -193,7 +208,13 @@
+@@ -193,7 +208,13 @@ else
  	   fi
        	;;
          *)
@@ -48,7 +48,7 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
          ;;
      esac
  fi
-@@ -263,7 +284,7 @@
+@@ -263,7 +284,7 @@ AC_HEADER_STDC
  AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \
      netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \
      sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \
@@ -57,7 +57,7 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
  AC_CHECK_HEADERS([netinet/ip.h], [], [],
  		 [#include <sys/types.h>
  		  #if HAVE_NETINET_IN_H
-@@ -292,6 +313,9 @@
+@@ -292,6 +313,9 @@ AC_CHECK_HEADERS([sys/filio.h])
  # Windows
  AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h])
  
@@ -67,7 +67,7 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
  # Other
  AC_CHECK_HEADERS([sys/ioctl.h])
  AC_CHECK_HEADERS([byteswap.h])
-@@ -359,8 +383,8 @@
+@@ -359,8 +383,8 @@ AC_CHECK_FUNCS([lrintf strtof])
  AC_FUNC_FORK
  AC_FUNC_GETGROUPS
  AC_FUNC_SELECT_ARGTYPES
@@ -78,3 +78,14 @@ $NetBSD: patch-ba,v 1.3 2008/12/23 19:29:29 jmcneill Exp $
      pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
      sigaction sleep sysconf])
  AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
+@@ -1099,8 +1123,8 @@ fi
+ 
+ AC_ARG_WITH(
+         [module-dir],
+-        AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]),
+-        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"])
++        AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules]),
++        [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules"])
+ 
+ AC_SUBST(modlibexecdir)
+