Replace patches that remove -ldl with those that use BUILDLINK_LDADD.dl.

Bump PKGREVISION.

4 files changed, 11 insertions, 8 deletions

diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 1c6ef53eac0..3e44bf17d35 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/06/06 01:37:13 minskim Exp $
 
 DISTNAME=	libao-0.8.6
+PKGREVISION=	1
 CATEGORIES=	audio devel
 MASTER_SITES=	http://downloads.xiph.org/releases/ao/
 
@@ -30,6 +31,8 @@ CONFIGURE_ARGS+=	ENABLE_SUN_AUDIO=no
 CONFIGURE_ARGS+=	ENABLE_MACOSX=no
 CONFIGURE_ARGS+=	ENABLE_SOLARIS=no
 
+MAKE_ENV+=		DLLIB=${BUILDLINK_LDADD.dl}
+
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 6d5884e7747..7d020966b03 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2005/05/20 19:20:55 jmmv Exp $
+$NetBSD: distinfo,v 1.18 2005/06/06 01:37:13 minskim Exp $
 
 SHA1 (libao-0.8.6.tar.gz) = 2050e008ffcfd6803e2c2c03c7d5f469b6d8379e
 RMD160 (libao-0.8.6.tar.gz) = 650258240295f221e95d39cf2380ada73f3cb4e1
 Size (libao-0.8.6.tar.gz) = 387583 bytes
 SHA1 (patch-ab) = 9d6902cf3532d858e9c3d2cce75c5b5869634028
-SHA1 (patch-ac) = b857f4cc3aa195230ce32f6b466d461016400f65
-SHA1 (patch-ad) = ed97b52cee1ea5652da233cdd4cf92320d56934d
+SHA1 (patch-ac) = b5b83ebdb0dc37a9c6c7004a766691a0c712f62d
+SHA1 (patch-ad) = 8ff730f3d05ad3341bf0da478ee5a702e398cfec
 SHA1 (patch-ae) = 06e4d61d6465009e509d58a4eec6bd8c6f09b62f
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
index 551f6353478..aa46c079949 100644
--- a/audio/libao/patches/patch-ac
+++ b/audio/libao/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2003/12/08 14:33:47 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2005/06/06 01:37:13 minskim Exp $
 
 --- src/Makefile.am.orig	Wed Jan  8 04:48:54 2003
 +++ src/Makefile.am
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.5 2003/12/08 14:33:47 wiz Exp $
  
  libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h
 -libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
-+libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
++libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ ${DLLIB}
  
  
  debug:
diff --git a/audio/libao/patches/patch-ad b/audio/libao/patches/patch-ad
index 7e57839dd04..724fc920823 100644
--- a/audio/libao/patches/patch-ad
+++ b/audio/libao/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2005/02/18 17:22:07 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2005/06/06 01:37:13 minskim Exp $
 
 --- src/Makefile.in.orig	2005-01-11 23:12:05.000000000 +0100
 +++ src/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.6 2005/02/18 17:22:07 wiz Exp $
  lib_LTLIBRARIES = libao.la
  libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_aixs.c ao_private.h
 -libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
-+libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
++libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ ${DLLIB}
  all: all-recursive
  
  .SUFFIXES: