From f4b3b7eef492f2ff8d1c070673dae622c3fdbe1b Mon Sep 17 00:00:00 2001 From: hasso Date: Tue, 30 Dec 2008 14:44:14 +0000 Subject: * Make it build on DragonFly * Fix interpreter in alsaconf and make package depend on bash (runtime). * Bump PKGREVISION --- audio/alsa-utils/Makefile | 7 +++++-- audio/alsa-utils/distinfo | 8 ++++---- audio/alsa-utils/patches/patch-ab | 6 +++--- audio/alsa-utils/patches/patch-ac | 4 ++-- audio/alsa-utils/patches/patch-ad | 4 ++-- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile index e97cf176ca5..a25357d21ac 100644 --- a/audio/alsa-utils/Makefile +++ b/audio/alsa-utils/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/12/22 03:18:12 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2008/12/30 14:44:14 hasso Exp $ # DISTNAME= alsa-utils-1.0.18 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ftp://ftp.alsa-project.org/pub/utils/ EXTRACT_SUFX= .tar.bz2 @@ -11,10 +12,12 @@ HOMEPAGE= ftp://ftp.alsa-project.org/pub/utils/ COMMENT= Advanced Linux Sound Architecture (ALSA) utilities GNU_CONFIGURE= yes -USE_TOOLS= pkg-config gmake +USE_TOOLS= pkg-config gmake bash:run USE_PKGLOCALEDIR= yes USE_NCURSES= yes +REPLACE_BASH= alsaconf/alsaconf.in + BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto .include "../../audio/alsa-lib/buildlink3.mk" diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo index 3b0c5f71989..da7eb3f1168 100644 --- a/audio/alsa-utils/distinfo +++ b/audio/alsa-utils/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ +$NetBSD: distinfo,v 1.2 2008/12/30 14:44:14 hasso Exp $ SHA1 (alsa-utils-1.0.18.tar.bz2) = 22ca9c26774550742d77504274b7f3e83fcce0e1 RMD160 (alsa-utils-1.0.18.tar.bz2) = 19725f866477abd5d97c8a18b736d2f4c62773e9 Size (alsa-utils-1.0.18.tar.bz2) = 1039779 bytes SHA1 (patch-aa) = b3dcc338045b95fd5e531428af4253d356f59944 -SHA1 (patch-ab) = 559275eea8697e085e5969eaa8b639089f6cc285 -SHA1 (patch-ac) = 3d31802758d286e8d5ec3424456a035d96876d00 -SHA1 (patch-ad) = d963e23e5287bdfc1647b1f6514bb43a5f1f92f1 +SHA1 (patch-ab) = b899128edb57bdb3a8b8186b6dd69182a7c1932f +SHA1 (patch-ac) = 613414c9683255e1a9ed6c32187a220b151beea2 +SHA1 (patch-ad) = 79764fb1a95363839e46e74ed5502bb2ffb18c16 diff --git a/audio/alsa-utils/patches/patch-ab b/audio/alsa-utils/patches/patch-ab index f4e6289555a..a74f398726b 100644 --- a/audio/alsa-utils/patches/patch-ab +++ b/audio/alsa-utils/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ +$NetBSD: patch-ab,v 1.2 2008/12/30 14:44:14 hasso Exp $ --- aplay/aplay.c.orig 2008-12-18 22:21:06.000000000 -0500 +++ aplay/aplay.c @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ #include #include #include -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#else #include @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ #define LLONG_MAX 9223372036854775807LL #endif -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#define open64 open +#define lseek64 lseek +#define off64_t off_t diff --git a/audio/alsa-utils/patches/patch-ac b/audio/alsa-utils/patches/patch-ac index 3dc36caf44d..2e6c5ab1cf6 100644 --- a/audio/alsa-utils/patches/patch-ac +++ b/audio/alsa-utils/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ +$NetBSD: patch-ac,v 1.2 2008/12/30 14:44:14 hasso Exp $ --- aplay/formats.h.orig 2008-12-18 22:21:49.000000000 -0500 +++ aplay/formats.h @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ #ifndef FORMATS_H #define FORMATS_H 1 -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#define bswap_16 bswap16 +#define bswap_32 bswap32 diff --git a/audio/alsa-utils/patches/patch-ad b/audio/alsa-utils/patches/patch-ad index da9cb4d2bbf..e2af5ebd033 100644 --- a/audio/alsa-utils/patches/patch-ad +++ b/audio/alsa-utils/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ +$NetBSD: patch-ad,v 1.2 2008/12/30 14:44:14 hasso Exp $ --- speaker-test/speaker-test.c.orig 2008-12-18 22:24:52.000000000 -0500 +++ speaker-test/speaker-test.c @@ -6,7 +6,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/12/19 03:33:45 jmcneill Exp $ #ifdef ENABLE_NLS #include #endif -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#define ESTRPIPE EPIPE +#else -- cgit v1.2.3