Received: by mail.netbsd.org (Postfix, from userid 605) id BD3C484DDD; Sat, 11 Apr 2020 10:31:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4255C84D6E for ; Sat, 11 Apr 2020 10:31:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id ieqj81ltZZwJ for ; Sat, 11 Apr 2020 10:31:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8CE4884D3E for ; Sat, 11 Apr 2020 10:31:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7A05BFB27; Sat, 11 Apr 2020 10:31:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1586601074160520" MIME-Version: 1.0 Date: Sat, 11 Apr 2020 10:31:14 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200411103114.7A05BFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1586601074160520 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Apr 11 10:31:14 UTC 2020 Modified Files: pkgsrc/mk: oss.buildlink3.mk Log Message: mk/oss.buildlink3.mk: Simplify per-OS DEV* conditionals. Add MIDI. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/oss.buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1586601074160520 Content-Disposition: inline Content-Length: 1359 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/oss.buildlink3.mk diff -u pkgsrc/mk/oss.buildlink3.mk:1.13 pkgsrc/mk/oss.buildlink3.mk:1.14 --- pkgsrc/mk/oss.buildlink3.mk:1.13 Sun Jun 30 21:28:28 2019 +++ pkgsrc/mk/oss.buildlink3.mk Sat Apr 11 10:31:14 2020 @@ -1,4 +1,4 @@ -# $NetBSD: oss.buildlink3.mk,v 1.13 2019/06/30 21:28:28 rillig Exp $ +# $NetBSD: oss.buildlink3.mk,v 1.14 2020/04/11 10:31:14 nia Exp $ # # This Makefile fragment is included by packages that require an Open Sound # System (OSS) implementation. After inclusion of this file, the following @@ -33,21 +33,14 @@ BUILDLINK_BUILTIN_MK.oss= ../../mk/oss.b .if !empty(OSS_BUILDLINK3_MK:M+) LIBOSSAUDIO?= ${BUILDLINK_LDADD.oss} -. if (${OPSYS} == "Linux") && exists(/dev/dsp) -DEVOSSAUDIO?= /dev/dsp -DEVOSSSOUND?= /dev/dsp -. elif ${OPSYS} == "DragonFly" -DEVOSSAUDIO?= /dev/dsp -DEVOSSSOUND?= /dev/dsp -. elif ${OPSYS} == "FreeBSD" -DEVOSSAUDIO?= /dev/dsp -DEVOSSSOUND?= /dev/dsp -. elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*) && exists(/dev/dsp) -DEVOSSAUDIO?= /dev/dsp -DEVOSSSOUND?= /dev/dsp -. else +. if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" DEVOSSAUDIO?= /dev/audio DEVOSSSOUND?= /dev/sound +DEVOSSMIDI?= /dev/rmidi0 +. else +DEVOSSAUDIO?= /dev/dsp +DEVOSSSOUND?= /dev/dsp +DEVOSSMIDI?= /dev/midi . endif CONFIGURE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} --_----------=_1586601074160520--