CVS commit: pkgsrc/games/xnibbles

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Apr 27 18:31:36 UTC 2020

Modified Files:
        pkgsrc/games/xnibbles: Makefile distinfo
        pkgsrc/games/xnibbles/patches: patch-aa

Log Message:
games/xnibbles: fix path to audio device


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/xnibbles/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/games/xnibbles/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/xnibbles/patches/patch-aa

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

Modified files:

Index: pkgsrc/games/xnibbles/Makefile
diff -u pkgsrc/games/xnibbles/Makefile:1.23 pkgsrc/games/xnibbles/Makefile:1.24
--- pkgsrc/games/xnibbles/Makefile:1.23 Wed Jul 18 00:06:17 2018
+++ pkgsrc/games/xnibbles/Makefile      Mon Apr 27 18:31:36 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2018/07/18 00:06:17 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2020/04/27 18:31:36 rillig Exp $
 #
 
 DISTNAME=              xnibbles-1.0BETA4
 PKGNAME=               xnibbles-1.0b4
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            games x11
 MASTER_SITES=          http://www.tjhsst.edu/xnibbles/
 
@@ -18,11 +18,15 @@ USE_LANGUAGES=              c c++03
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man6
 
+.include "../../mk/oss.buildlink3.mk"
+
+.if ${DEVOSSAUDIO} != /dev/dsp
 SUBST_CLASSES+=                audio
 SUBST_STAGE.audio=     pre-build
 SUBST_MESSAGE.audio=   Adjusting path to audio device
 SUBST_FILES.audio=     Makefile
 SUBST_SED.audio=       -e "s|/dev/dsp|${DEVOSSAUDIO}|"
+.endif
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"

Index: pkgsrc/games/xnibbles/distinfo
diff -u pkgsrc/games/xnibbles/distinfo:1.12 pkgsrc/games/xnibbles/distinfo:1.13
--- pkgsrc/games/xnibbles/distinfo:1.12 Tue Nov  3 20:57:08 2015
+++ pkgsrc/games/xnibbles/distinfo      Mon Apr 27 18:31:36 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 20:57:08 agc Exp $
+$NetBSD: distinfo,v 1.13 2020/04/27 18:31:36 rillig Exp $
 
 SHA1 (xnibbles-1.0BETA4.tar.gz) = 2f0ed0ea1184cb3e81fa56a430d3c53e96618452
 RMD160 (xnibbles-1.0BETA4.tar.gz) = a07ae907d72a5b4aac093cfe5a3cf7d02a4024e9
 SHA512 (xnibbles-1.0BETA4.tar.gz) = 8d0981f6eb359c17c764f105c78bed78f77e19261ea680bd81192db390c1710bf0b8f783f4a722fd07b5c482404072cd64299bdb700aae620d557f2e4517ed74
 Size (xnibbles-1.0BETA4.tar.gz) = 134982 bytes
-SHA1 (patch-aa) = 2917223959062c339df0ffb9666d4420e511c602
+SHA1 (patch-aa) = af6f02b9285fe586d2f26c9e44bbe4c70853fb7e
 SHA1 (patch-ab) = b3d5062ec5ab7cdce85a2cd279dd882e1946b295
 SHA1 (patch-ac) = ce907c27ea5211a46b7f3a3eaa5f13ca22ee4da5
 SHA1 (patch-ad) = beb17a68983e9312b0874ff6deea351dba27fc32

Index: pkgsrc/games/xnibbles/patches/patch-aa
diff -u pkgsrc/games/xnibbles/patches/patch-aa:1.6 pkgsrc/games/xnibbles/patches/patch-aa:1.7
--- pkgsrc/games/xnibbles/patches/patch-aa:1.6  Sun Sep 21 08:17:40 2008
+++ pkgsrc/games/xnibbles/patches/patch-aa      Mon Apr 27 18:31:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2008/09/21 08:17:40 dholland Exp $
+$NetBSD: patch-aa,v 1.7 2020/04/27 18:31:36 rillig Exp $
 
 --- Makefile.orig      1998-03-05 17:06:19.000000000 -0500
 +++ Makefile   2008-09-21 02:02:55.000000000 -0400
@@ -21,12 +21,8 @@ $NetBSD: patch-aa,v 1.6 2008/09/21 08:17
  
    # Install program
    INSTALL = /usr/bin/install
-@@ -41,10 +42,10 @@
- 
-   # Requires kernel sound support, change from 0 to 1 if you want it
-   SOUND = 1
--  SOUNDDEV = /dev/dsp
-+  SOUNDDEV = /dev/audio
+@@ -38,7 +39,7 @@
+   SOUNDDEV = /dev/dsp
  
    # Requires kernel joystick support, change from 0 to 1 if you want it
 -  JOYSTICK = 1