[pkgsrc/trunk]: pkgsrc/audio/libmikmod Fix a configure botchup that breaks th...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5a300f025f1
branches:  trunk
changeset: 543052:c5a300f025f1
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Jun 02 08:20:04 2008 +0000

description:
Fix a configure botchup that breaks the build of mikmod if libmikmod is
built with esound support. PR 35992.
PKGREVISION -> 3.

diffstat:

 audio/libmikmod/Makefile         |   4 ++--
 audio/libmikmod/distinfo         |   4 ++--
 audio/libmikmod/patches/patch-ac |  19 ++++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 1951c53b1f79 -r c5a300f025f1 audio/libmikmod/Makefile
--- a/audio/libmikmod/Makefile  Sun Jun 01 22:33:20 2008 +0000
+++ b/audio/libmikmod/Makefile  Mon Jun 02 08:20:04 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2007/12/16 14:25:35 heinz Exp $
+# $NetBSD: Makefile,v 1.44 2008/06/02 08:20:04 dholland Exp $
 
 DISTNAME=              libmikmod-3.1.11
 PKGNAME=               libmikmod-3.1.11.1
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            audio
 MASTER_SITES=          http://mikmod.raphnet.net/files/
 
diff -r 1951c53b1f79 -r c5a300f025f1 audio/libmikmod/distinfo
--- a/audio/libmikmod/distinfo  Sun Jun 01 22:33:20 2008 +0000
+++ b/audio/libmikmod/distinfo  Mon Jun 02 08:20:04 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/03/17 22:37:35 jlam Exp $
+$NetBSD: distinfo,v 1.12 2008/06/02 08:20:04 dholland Exp $
 
 SHA1 (libmikmod-3.1.11.tar.gz) = ca18fff19348d3bcf3550aa920b129b082c5069a
 RMD160 (libmikmod-3.1.11.tar.gz) = 79b144cce51340b4c9abe09d1110dba2333d7bfb
@@ -7,5 +7,5 @@
 RMD160 (libmikmod-3.1.11-a.diff) = 8a072ea0c8bb778f289554b3f13d653d065713dc
 Size (libmikmod-3.1.11-a.diff) = 67970 bytes
 SHA1 (patch-ab) = afda9a7d29e70e42c037163ac5b2d2742c77daab
-SHA1 (patch-ac) = 97554f00e4a4823e7a90f742679044fb8f887167
+SHA1 (patch-ac) = 6fc74c596c50fcea30e280b894a631e5dcb2b6a5
 SHA1 (patch-ad) = f2fc607efccd4d883ce6b642ab644f0e7bf747f6
diff -r 1951c53b1f79 -r c5a300f025f1 audio/libmikmod/patches/patch-ac
--- a/audio/libmikmod/patches/patch-ac  Sun Jun 01 22:33:20 2008 +0000
+++ b/audio/libmikmod/patches/patch-ac  Mon Jun 02 08:20:04 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2002/08/31 03:47:54 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2008/06/02 08:20:05 dholland Exp $
 
---- configure.orig     Tue Jan 22 01:21:19 2002
-+++ configure  Thu Jul 11 02:05:35 2002
-@@ -1865,6 +1865,7 @@
+--- configure.orig     2004-01-21 12:43:52.000000000 -0500
++++ configure  2008-06-02 04:18:48.000000000 -0400
+@@ -5741,6 +5741,7 @@
  fi
  
  
@@ -10,7 +10,7 @@
  # Check if makeinfo support html output. If it doesn't, pretend it's missing
  # rather than failing rebuilding the documentation.
  echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6
-@@ -1887,6 +1888,7 @@
+@@ -5763,6 +5764,7 @@
  else
        MAKEINFO="$MAKEINFO --no-split"
  fi
@@ -18,3 +18,12 @@
  
  # ====================
  # Check for libraries.
+@@ -7743,7 +7745,7 @@
+       # systems, libaudiofile, libasound on Linux)
+       if test $libmikmod_dynload != no
+       then
+-              ESD_LIBS="`echo $ESD_LIBS|sed -e 's/-lesd//'|sed -e 's/-lasound//'|sed -e 's/-laudiofile//'|sed -e 's/-lossaudio//'`"
++              ESD_LIBS="`echo $ESD_LIBS|sed -e 's/-lesd//g'|sed -e 's/-lasound//g'|sed -e 's/-laudiofile//g'|sed -e 's/-lossaudio//g'`"
+       fi
+       LIBRARY_LIB="$ESD_LIBS $LIBRARY_LIB"
+ fi