CVS commit: [pkgsrc-2020Q1] pkgsrc/audio/adplay

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Tue May 26 18:37:30 UTC 2020

Modified Files:
        pkgsrc/audio/adplay [pkgsrc-2020Q1]: Makefile distinfo
Added Files:
        pkgsrc/audio/adplay/patches [pkgsrc-2020Q1]: patch-configure

Log Message:
Pullup ticket #6212 - requested by nia
audio/adplay: dependent update

Revisions pulled up:
- audio/adplay/Makefile                                         1.4
- audio/adplay/distinfo                                         1.2
- audio/adplay/patches/patch-configure                          1.1

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Thu May 21 21:00:49 UTC 2020

   Modified Files:
        pkgsrc/audio/adplay: Makefile distinfo
   Added Files:
        pkgsrc/audio/adplay/patches: patch-configure

   Log Message:
   adplay: Work around breakage caused by adplug-2.3.2

   Pointed out by joerg


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 pkgsrc/audio/adplay/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 pkgsrc/audio/adplay/distinfo
cvs rdiff -u -r0 -r1.2.2.2 pkgsrc/audio/adplay/patches/patch-configure

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

Modified files:

Index: pkgsrc/audio/adplay/Makefile
diff -u pkgsrc/audio/adplay/Makefile:1.3 pkgsrc/audio/adplay/Makefile:1.3.2.1
--- pkgsrc/audio/adplay/Makefile:1.3    Sun Mar  8 16:48:35 2020
+++ pkgsrc/audio/adplay/Makefile        Tue May 26 18:37:29 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2020/03/08 16:48:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2020/05/26 18:37:29 bsiegert Exp $
 
 DISTNAME=      adplay-1.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=adplug/}
 GITHUB_PROJECT=        adplay-unix

Index: pkgsrc/audio/adplay/distinfo
diff -u pkgsrc/audio/adplay/distinfo:1.1 pkgsrc/audio/adplay/distinfo:1.1.4.1
--- pkgsrc/audio/adplay/distinfo:1.1    Tue Sep 10 12:34:55 2019
+++ pkgsrc/audio/adplay/distinfo        Tue May 26 18:37:29 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/09/10 12:34:55 fcambus Exp $
+$NetBSD: distinfo,v 1.1.4.1 2020/05/26 18:37:29 bsiegert Exp $
 
 SHA1 (adplay-1.8.tar.bz2) = 68957c7fb7a7803b8e9d784faf4158dd3fdf9154
 RMD160 (adplay-1.8.tar.bz2) = 169817211acd91037e5ca44e80de4487c3a9eb39
 SHA512 (adplay-1.8.tar.bz2) = 6a82b10fa73ad9317303da03d2fcb1fa97772d850f3f78f53c554b9daaa9ae5d04bc2f0a1b1d25fd5d3a1eab073641d6fa0589070721612987d57762f03363c7
 Size (adplay-1.8.tar.bz2) = 333582 bytes
+SHA1 (patch-configure) = f8b33e56e1b29ee446628ba7ffc1ec8bcdfdc5cb

Added files:

Index: pkgsrc/audio/adplay/patches/patch-configure
diff -u /dev/null pkgsrc/audio/adplay/patches/patch-configure:1.2.2.2
--- /dev/null   Tue May 26 18:37:30 2020
+++ pkgsrc/audio/adplay/patches/patch-configure Tue May 26 18:37:29 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.2.2.2 2020/05/26 18:37:29 bsiegert Exp $
+
+Broken with adplug-2.3.2
+
+--- configure.orig     2017-11-19 00:28:23.000000000 +0000
++++ configure
+@@ -17462,7 +17462,7 @@ CSurroundopl *dummy;
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ 
+-$as_echo "#define HAVE_ADPLUG_SURROUND /**/" >>confdefs.h
++#$as_echo "#define HAVE_ADPLUG_SURROUND /**/" >>confdefs.h
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }