CVS commit: pkgsrc/audio

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Tue Dec 24 05:07:45 UTC 2019

Modified Files:
        pkgsrc/audio/libao: Makefile Makefile.common
        pkgsrc/audio/libao-macosx: Makefile

Log Message:
audio/libao: fix Darwin build

libao tried disable the macos plugin by setting a configure
environment variable that didn't work.  This forces the option
off by the SUBST framework to edit the config file.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/audio/libao/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/audio/libao/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/audio/libao-macosx/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libao/Makefile
diff -u pkgsrc/audio/libao/Makefile:1.35 pkgsrc/audio/libao/Makefile:1.36
--- pkgsrc/audio/libao/Makefile:1.35    Sun Nov 24 00:35:56 2019
+++ pkgsrc/audio/libao/Makefile Tue Dec 24 05:07:45 2019
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2019/11/24 00:35:56 nia Exp $
+# $NetBSD: Makefile,v 1.36 2019/12/24 05:07:45 dbj Exp $
 
 .include "Makefile.common"
 
 INSTALLATION_DIRS+=    lib/ao/plugins-4
 
+SUBST_CLASSES+=                        disable-macosx
+SUBST_MESSAGE.disable-macosx+= Force disabling macosx plugin.
+SUBST_STAGE.disable-macosx=    pre-configure
+SUBST_FILES.disable-macosx=    configure.ac
+SUBST_SED.disable-macosx=      -e 's,have_macosx=yes,have_macosx=disabled,'
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/libao/Makefile.common
diff -u pkgsrc/audio/libao/Makefile.common:1.40 pkgsrc/audio/libao/Makefile.common:1.41
--- pkgsrc/audio/libao/Makefile.common:1.40     Sun Nov 24 00:35:56 2019
+++ pkgsrc/audio/libao/Makefile.common  Tue Dec 24 05:07:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2019/11/24 00:35:56 nia Exp $
+# $NetBSD: Makefile.common,v 1.41 2019/12/24 05:07:45 dbj Exp $
 #
 # used by audio/libao-alsa/Makefile
 # used by audio/libao-arts/Makefile
@@ -43,7 +43,6 @@ CONFIGURE_ENV+=               ac_cv_header_sys_soundc
 CONFIGURE_ENV+=                ac_cv_header_machine_soundcard_h=no
 CONFIGURE_ENV+=                ac_cv_header_sys_audioio_h=no # disable Sun audio by default
 CONFIGURE_ENV+=                ac_cv_header_sndio_h=no # disable sndio by default
-CONFIGURE_ENV+=                have_macosx=no # disable macOS audio by default
 
 MAKE_ENV+=             DLLIB=${BUILDLINK_LDADD.dl:Q}
 

Index: pkgsrc/audio/libao-macosx/Makefile
diff -u pkgsrc/audio/libao-macosx/Makefile:1.8 pkgsrc/audio/libao-macosx/Makefile:1.9
--- pkgsrc/audio/libao-macosx/Makefile:1.8      Sun Nov 24 00:35:57 2019
+++ pkgsrc/audio/libao-macosx/Makefile  Tue Dec 24 05:07:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/24 00:35:57 nia Exp $
+# $NetBSD: Makefile,v 1.9 2019/12/24 05:07:45 dbj Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -8,7 +8,6 @@ COMMENT+=       (MacOS X plugin)
 
 ONLY_FOR_PLATFORM+=    Darwin-*-*
 
-CONFIGURE_ENV:=                ${CONFIGURE_ENV:S/have_macosx=no//1}
 BUILD_DIRS=            src/plugins/macosx
 INSTALL_DIRS=          src/plugins/macosx