From 5c7d6c51c0f5fe7f53320733e8447ad1db4abe34 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 7 Jul 2009 14:45:41 +0000
Subject: Cleanup configure patch. DESTDIR support. Simplify.

---
 audio/alsa-plugins-oss/Makefile         | 12 ++++++------
 audio/alsa-plugins-oss/distinfo         |  4 ++--
 audio/alsa-plugins-oss/patches/patch-aa | 11 +----------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/audio/alsa-plugins-oss/Makefile b/audio/alsa-plugins-oss/Makefile
index 1a39d18407a..04c856ed511 100644
--- a/audio/alsa-plugins-oss/Makefile
+++ b/audio/alsa-plugins-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/19 12:34:22 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/07 14:45:41 joerg Exp $
 #
 
 DISTNAME=	alsa-plugins-1.0.18
@@ -11,18 +11,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.alsa-project.org/
 COMMENT=	Advanced Linux Sound Architecture (ALSA) - OSS plugin
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 USE_TOOLS=	pkg-config gmake
 USE_LIBTOOL=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
 CFLAGS+=	-DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
 LIBS+=		${LIBOSSAUDIO}
 
-do-build:
-	cd ${WRKSRC}/oss && ${GMAKE}
-
-do-install:
-	cd ${WRKSRC}/oss && ${GMAKE} install
+BUILD_DIRS=	oss
 
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/alsa-plugins-oss/distinfo b/audio/alsa-plugins-oss/distinfo
index 26b5901c3af..6ef5a024b79 100644
--- a/audio/alsa-plugins-oss/distinfo
+++ b/audio/alsa-plugins-oss/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/07/07 14:45:41 joerg Exp $
 
 SHA1 (alsa-plugins-1.0.18.tar.bz2) = 33b5eca861de35a6eeb47862f24a8663af56cd0a
 RMD160 (alsa-plugins-1.0.18.tar.bz2) = 83b570d5346c7c79f5fe628e381ba1cf8e5a69db
 Size (alsa-plugins-1.0.18.tar.bz2) = 312656 bytes
-SHA1 (patch-aa) = af3bc837cab95c8f042b6e041c89b03e171f1a73
+SHA1 (patch-aa) = 77774e607905f3930ffec503c04d6dd1f70d9946
 SHA1 (patch-ab) = 9cf0bda9f1928f46d0d5eac9464b790710ea2fda
 SHA1 (patch-ac) = 13da103ce3daad29d3c715f8f7d58dcd7bb9a72c
diff --git a/audio/alsa-plugins-oss/patches/patch-aa b/audio/alsa-plugins-oss/patches/patch-aa
index 1f60ac4f88f..ac45450df09 100644
--- a/audio/alsa-plugins-oss/patches/patch-aa
+++ b/audio/alsa-plugins-oss/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/07 14:45:41 joerg Exp $
 
 --- configure.orig	2008-10-29 08:47:45.000000000 -0400
 +++ configure
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/12/19 04:03:22 jmcneill Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21974,6 +21974,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;
-- 
cgit v1.2.3