[pkgsrc/trunk]: pkgsrc/emulators/dosbox On Solaris 10, I had to disable joyst...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc65bfb6a0f6
branches:  trunk
changeset: 524166:fc65bfb6a0f6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jan 20 02:25:31 2007 +0000

description:
On Solaris 10, I had to disable joystick and scancodes support.

PKGREVISION++

diffstat:

 emulators/dosbox/Makefile         |   7 ++++---
 emulators/dosbox/distinfo         |   3 ++-
 emulators/dosbox/patches/patch-ad |  19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diffs (67 lines):

diff -r 2de2d4d20e52 -r fc65bfb6a0f6 emulators/dosbox/Makefile
--- a/emulators/dosbox/Makefile Sat Jan 20 02:19:40 2007 +0000
+++ b/emulators/dosbox/Makefile Sat Jan 20 02:25:31 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/06/12 16:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/20 02:25:31 rillig Exp $
 
 DISTNAME=      dosbox-0.65
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=dosbox/}
 
@@ -11,6 +11,8 @@
 
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
+CPPFLAGS.SunOS+=       -DDISABLE_JOYSTICK
+INSTALLATION_DIRS=     share/doc/dosbox
 
 SUBST_CLASSES+=                fixme
 SUBST_STAGE.fixme=     post-patch
@@ -18,7 +20,6 @@
 SUBST_SED.fixme=       -e s,/usr/share/,${PREFIX}/share/,g
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dosbox
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dosbox
 
 .include "../../audio/SDL_sound/buildlink3.mk"
diff -r 2de2d4d20e52 -r fc65bfb6a0f6 emulators/dosbox/distinfo
--- a/emulators/dosbox/distinfo Sat Jan 20 02:19:40 2007 +0000
+++ b/emulators/dosbox/distinfo Sat Jan 20 02:25:31 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/01/16 11:42:02 rillig Exp $
+$NetBSD: distinfo,v 1.11 2007/01/20 02:25:31 rillig Exp $
 
 SHA1 (dosbox-0.65.tar.gz) = 4e9b65c9c2091ab30a952e3b7e63b74df605f419
 RMD160 (dosbox-0.65.tar.gz) = 1d05002ae0ddcac74071180d0fa81aba3092e6f1
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 3393501f0d438e53a55481dc0e237c2bb2a75d3e
 SHA1 (patch-ab) = c4555ed9e6337380f52f271025d8f55ed7602aa6
 SHA1 (patch-ac) = 84c2a3173a483ccb62917da0b48fd2083963a13b
+SHA1 (patch-ad) = 3c0c0eabceb4cefa07918ae1d558e553ff18d592
diff -r 2de2d4d20e52 -r fc65bfb6a0f6 emulators/dosbox/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/dosbox/patches/patch-ad Sat Jan 20 02:25:31 2007 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2007/01/20 02:25:31 rillig Exp $
+
+Scancodes do not work on SunOS-2.10-sparc.
+
+--- src/gui/sdlmain.cpp.orig   2006-03-29 14:54:42.000000000 +0200
++++ src/gui/sdlmain.cpp        2007-01-16 14:15:35.312830340 +0100
+@@ -1291,7 +1291,12 @@ int main(int argc, char* argv[]) {
+               sdl_sec->Add_bool("waitonerror",true);
+               sdl_sec->Add_string("priority","higher,normal");
+               sdl_sec->Add_string("mapperfile","mapper.txt");
++#if defined(__sun)
++              sdl_sec->Add_bool("usescancodes", false);
++#else
+               sdl_sec->Add_bool("usescancodes",true);
++#endif
++
+ 
+               MSG_Add("SDL_CONFIGFILE_HELP",
+                       "fullscreen -- Start dosbox directly in fullscreen.\n"