[pkgsrc/trunk]: pkgsrc/emulators/snes9x Fix build on NetBSD-1.6.2. Problems ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/608683916209
branches:  trunk
changeset: 511511:608683916209
user:      ben <ben%pkgsrc.org@localhost>
date:      Sun Apr 16 01:21:08 2006 +0000

description:
Fix build on NetBSD-1.6.2.  Problems all related to C++ compiler.
* some header files contained DOS \r\n newlines
* some header files contained the word "pair"
* some optimizer flags caused the compiler to exhaust my virtual memory

diffstat:

 emulators/snes9x/Makefile         |  13 ++++++++++++-
 emulators/snes9x/distinfo         |   4 ++--
 emulators/snes9x/patches/patch-aa |  13 +++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r 640ce8001fdb -r 608683916209 emulators/snes9x/Makefile
--- a/emulators/snes9x/Makefile Sun Apr 16 01:00:06 2006 +0000
+++ b/emulators/snes9x/Makefile Sun Apr 16 01:21:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/03/18 15:56:00 ben Exp $
+# $NetBSD: Makefile,v 1.36 2006/04/16 01:21:08 ben Exp $
 
 SNESVER=               1.43
 DISTNAME=              snes9x-${SNESVER}-src
@@ -18,6 +18,17 @@
 INSTALLATION_DIRS=     bin
 GNU_CONFIGURE=         YES
 
+SUBST_CLASSES+=                nodos
+SUBST_STAGE.nodos=     pre-patch
+SUBST_FILES.nodos=     ../language.h
+SUBST_FILES.nodos+=    dsp1.h dsp3emu.cpp dsp4emu.cpp
+SUBST_SED.nodos=       -e 's|
||g'
+
+SUBST_CLASSES+=                paircpp
+SUBST_STAGE.paircpp=   pre-patch
+SUBST_FILES.paircpp=   65c816.h sa1.h
+SUBST_SED.paircpp=     -e 's|pair|snes9x_pair|g'
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
        ${INSTALL_PROGRAM} ${WRKSRC}/offsets ${PREFIX}/bin
diff -r 640ce8001fdb -r 608683916209 emulators/snes9x/distinfo
--- a/emulators/snes9x/distinfo Sun Apr 16 01:00:06 2006 +0000
+++ b/emulators/snes9x/distinfo Sun Apr 16 01:21:08 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2006/03/18 15:56:00 ben Exp $
+$NetBSD: distinfo,v 1.13 2006/04/16 01:21:08 ben Exp $
 
 SHA1 (snes9x-1.43-src.tar.gz) = c6883c451aeb442030862ec19a8dca25ee02d82c
 RMD160 (snes9x-1.43-src.tar.gz) = d2003f7afb208109405b41f4eec586b93518f9b2
 Size (snes9x-1.43-src.tar.gz) = 1016251 bytes
-SHA1 (patch-aa) = a21b9902095de675cbff28787a2f3cd7af3292cb
+SHA1 (patch-aa) = 3eee1abe554f9ef4e81b22a4c75a04c8c109acd3
 SHA1 (patch-ab) = 7dfd2d7a92caceed82549fed3f175746871b3985
 SHA1 (patch-ac) = c1e35daa7e53536d05c1633b78c00d511ae7feb5
 SHA1 (patch-ad) = c5febcdd6b5bf0f3b4b5d8b0bc19c4716434a23e
diff -r 640ce8001fdb -r 608683916209 emulators/snes9x/patches/patch-aa
--- a/emulators/snes9x/patches/patch-aa Sun Apr 16 01:00:06 2006 +0000
+++ b/emulators/snes9x/patches/patch-aa Sun Apr 16 01:21:08 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.12 2006/03/18 15:56:00 ben Exp $
+$NetBSD: patch-aa,v 1.13 2006/04/16 01:21:08 ben Exp $
 
---- Makefile.in.orig   2006-03-18 05:54:27.000000000 -0800
+--- Makefile.in.orig   2004-12-30 14:15:44.000000000 -0800
 +++ Makefile.in
 @@ -113,6 +113,20 @@ SPC7110OBJ=spc7110.o
  OBC1OBJ=obc1.o
@@ -36,6 +36,15 @@
  endif
  
  ifdef GLIDE
+@@ -186,7 +201,7 @@ ifdef DREAMCAST
+ OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks 
-fno-exceptions
+ CPUFLAGS=-ml  -m4-single-only
+ else
+-OPTIMISE = @OPTIMIZE@
++OPTIMISE=
+ endif
+ 
+ DEFS += \
 @@ -206,6 +221,8 @@ $(AIDODEFINES) \
  $(KREEDDEFINES) \
  $(SDD1DEFINES) \