CVS commit: pkgsrc/games/exult

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

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Oct 16 17:10:49 UTC 2016

Modified Files:
        pkgsrc/games/exult: Makefile distinfo
Added Files:
        pkgsrc/games/exult/patches: patch-audio_midi__drivers_forked__player.cc

Log Message:
Use midiplay instead of playmidi on NetBSD. Bump revision.
PR pkg/28924, from 2005.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/exult/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/exult/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/exult/patches/patch-audio_midi__drivers_forked__player.cc

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

Modified files:

Index: pkgsrc/games/exult/Makefile
diff -u pkgsrc/games/exult/Makefile:1.22 pkgsrc/games/exult/Makefile:1.23
--- pkgsrc/games/exult/Makefile:1.22    Fri Sep 16 22:36:21 2016
+++ pkgsrc/games/exult/Makefile Sun Oct 16 17:10:49 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/09/16 22:36:21 wiedi Exp $
+# $NetBSD: Makefile,v 1.23 2016/10/16 17:10:49 bsiegert Exp $
 
 DISTNAME=      exult-1.4.9rc1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=exult/exult-all-versions/}
 

Index: pkgsrc/games/exult/distinfo
diff -u pkgsrc/games/exult/distinfo:1.11 pkgsrc/games/exult/distinfo:1.12
--- pkgsrc/games/exult/distinfo:1.11    Tue Nov  3 20:56:48 2015
+++ pkgsrc/games/exult/distinfo Sun Oct 16 17:10:49 2016
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 20:56:48 agc Exp $
+$NetBSD: distinfo,v 1.12 2016/10/16 17:10:49 bsiegert Exp $
 
 SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792
 RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914
 SHA512 (exult-1.4.9rc1.tar.gz) = 0da559ce574a07eba597b44e6ed6ddd72d3db45dfa8f546ef6668277ef178700f4b92bce43b87ad238815eaf64d5ef0fcf6c09b31477e52ea69edce1aa05e302
 Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes
+SHA1 (patch-audio_midi__drivers_forked__player.cc) = 058c77900828cc75643237e5ddbc1d21e67a2337
 SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093
 SHA1 (patch-imagewin_manip.h) = d9a90c7fbe046a4079618aeda4c428ef1672525e
 SHA1 (patch-istring.h) = 18e8b49932f7317e6c978c585e1dfe855ac05a51

Added files:

Index: pkgsrc/games/exult/patches/patch-audio_midi__drivers_forked__player.cc
diff -u /dev/null pkgsrc/games/exult/patches/patch-audio_midi__drivers_forked__player.cc:1.1
--- /dev/null   Sun Oct 16 17:10:49 2016
+++ pkgsrc/games/exult/patches/patch-audio_midi__drivers_forked__player.cc      Sun Oct 16 17:10:49 2016
@@ -0,0 +1,16 @@
+$NetBSD: patch-audio_midi__drivers_forked__player.cc,v 1.1 2016/10/16 17:10:49 bsiegert Exp $
+
+--- audio/midi_drivers/forked_player.cc.orig   2009-04-21 03:04:37.000000000 +0000
++++ audio/midi_drivers/forked_player.cc
+@@ -41,7 +41,11 @@ const MidiDriver::MidiDriverDesc forked_
+ // NB: This function doesn't return unless execlp fails!
+ static  void    playFJmidifile(const char *name)
+ {
++#ifdef __NetBSD__
++      execlp("midiplay","midiplay","-v","-v",name,(char *)0);
++#else
+       execlp("playmidi","playmidi","-v","-v","-e",name,(char *)0);
++#endif
+ }
+ 
+ forked_player::forked_player() : repeat_(false), forked_job(-1)