From 6a3e63337f9d17fc2090c689e6fe09867a5e97c1 Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 2 Jun 2008 08:20:04 +0000
Subject: Fix a configure botchup that breaks the build of mikmod if libmikmod
 is built with esound support. PR 35992. PKGREVISION -> 3.

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

(limited to 'audio')

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 7ff8ff5bb14..3b7ec946e64 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -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 --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 0ed21a0c646..d6e6a219023 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -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 @@ SHA1 (libmikmod-3.1.11-a.diff) = 22c9f0aed6415612ed2b16d2eaed31a22207aeef
 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 --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index c4cd4ffc915..19407df1fa2 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -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 @@ $NetBSD: patch-ac,v 1.7 2002/08/31 03:47:54 wiz Exp $
  # 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 @@ $NetBSD: patch-ac,v 1.7 2002/08/31 03:47:54 wiz Exp $
  
  # ====================
  # 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
-- 
cgit v1.2.3