Update to 1.30:

1.30
Added game data dir knowledge.
Added fopen error checking.
Corrected 64bit builds.
Added OSX Makefile to tarballs.
Fixed uninitialized update function crash.
Adjusted configure to abort when libraries are missing.
Compiler warning cleanups.

7 files changed, 33 insertions, 70 deletions

diff --git a/games/orbital_eunuchs_sniper/Makefile b/games/orbital_eunuchs_sniper/Makefile
index d1cff743641..074cc3f0924 100644
--- a/games/orbital_eunuchs_sniper/Makefile
+++ b/games/orbital_eunuchs_sniper/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2008/08/12 16:08:19 wiz Exp $
 #
 
-DISTNAME=		orbital_eunuchs_sniper-1.29
-PKGREVISION=		7
+DISTNAME=		orbital_eunuchs_sniper-1.30
 CATEGORIES=		games
-MASTER_SITES=		http://filesingularity.timedoctor.org/
+MASTER_SITES=		http://icculus.org/oes/
 
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://icculus.org/oes/
@@ -19,6 +18,12 @@ REPLACE.bash.old=	.*/bin/bash
 REPLACE.bash.new=	${SH}
 REPLACE_FILES.bash=	src/snipe2d.in
 
+.if ${MACHINE_ARCH} == "x86_64"
+PLIST_SUBST+=		CPU=amd64
+.else
+PLIST_SUBST+=		CPU=${MACHINE_ARCH}
+.endif
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/orbital_eunuchs_sniper
 	${INSTALL_DATA} ${WRKSRC}/README \
diff --git a/games/orbital_eunuchs_sniper/PLIST b/games/orbital_eunuchs_sniper/PLIST
index ebb196e949b..c0bdb61fa57 100644
--- a/games/orbital_eunuchs_sniper/PLIST
+++ b/games/orbital_eunuchs_sniper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/08/04 16:21:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/08/12 16:08:19 wiz Exp $
 bin/snipe2d
 libexec/orbital_eunuchs_sniper/aimap.png
 libexec/orbital_eunuchs_sniper/audiooff.png
@@ -42,7 +42,7 @@ libexec/orbital_eunuchs_sniper/quith.png
 libexec/orbital_eunuchs_sniper/recharge.ogg
 libexec/orbital_eunuchs_sniper/resumegame.png
 libexec/orbital_eunuchs_sniper/resumegameh.png
-libexec/orbital_eunuchs_sniper/snipe2d.x86.dynamic
+libexec/orbital_eunuchs_sniper/snipe2d.${CPU}.dynamic
 libexec/orbital_eunuchs_sniper/twang.wav
 libexec/orbital_eunuchs_sniper/window.png
 libexec/orbital_eunuchs_sniper/windowh.png
diff --git a/games/orbital_eunuchs_sniper/distinfo b/games/orbital_eunuchs_sniper/distinfo
index fd3991c9741..c2d05e4e999 100644
--- a/games/orbital_eunuchs_sniper/distinfo
+++ b/games/orbital_eunuchs_sniper/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/10/17 23:44:59 wiz Exp $
+$NetBSD: distinfo,v 1.8 2008/08/12 16:08:19 wiz Exp $
 
-SHA1 (orbital_eunuchs_sniper-1.29.tar.gz) = c5c33de0645c717b35e6eff7c88946e9de65b866
-RMD160 (orbital_eunuchs_sniper-1.29.tar.gz) = 49520028f6f21e9163c37fcf14030a4868a01b01
-Size (orbital_eunuchs_sniper-1.29.tar.gz) = 4043177 bytes
-SHA1 (patch-aa) = 05ce263d290c8508c49d0902418ed56d9f129cb9
-SHA1 (patch-ab) = 23fc32880df6c5457fd2f303988e24d9de76b587
-SHA1 (patch-ac) = 1f33c3bf6f8e310d92b47b9916ef28d2a9396308
+SHA1 (orbital_eunuchs_sniper-1.30.tar.gz) = 67f5cec96179faabefe475cbea0c3b45f0b5f7c2
+RMD160 (orbital_eunuchs_sniper-1.30.tar.gz) = 6014dbdb5567054763349226c46412ac665761aa
+Size (orbital_eunuchs_sniper-1.30.tar.gz) = 4056847 bytes
+SHA1 (patch-aa) = a668a76fccf25326df64642c3e294d4d11d2e770
+SHA1 (patch-ac) = 51acd5acb96420f8fc2069a793f1adb7d3068464
 SHA1 (patch-ad) = 94d479604dad6737ab85b7260f2b0e125de24df9
-SHA1 (patch-af) = 7df3074576f5b0ee5d0a9d516c72ad995d937fb9
diff --git a/games/orbital_eunuchs_sniper/patches/patch-aa b/games/orbital_eunuchs_sniper/patches/patch-aa
index 8c18cd28bb6..61a4299d03c 100644
--- a/games/orbital_eunuchs_sniper/patches/patch-aa
+++ b/games/orbital_eunuchs_sniper/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/23 16:07:15 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2008/08/12 16:08:19 wiz Exp $
 
---- src/Makefile.in.orig	2003-04-21 16:33:08.000000000 +0200
+--- src/Makefile.in.orig	2006-10-19 03:38:42.000000000 +0000
 +++ src/Makefile.in
-@@ -126,8 +126,7 @@ subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = snipe2d
+@@ -38,8 +38,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
 -pkgdata_PROGRAMS = snipe2d.@CPU_IS@.dynamic$(EXEEXT) \
 -	snipe2d.@CPU_IS@.static$(EXEEXT)
 +pkgdata_PROGRAMS = snipe2d.@CPU_IS@.dynamic$(EXEEXT)
- PROGRAMS = $(pkgdata_PROGRAMS)
- 
- am__objects_1 = ai.$(OBJEXT) binds.$(OBJEXT) gameover.$(OBJEXT) \
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(srcdir)/snipe2d.in
diff --git a/games/orbital_eunuchs_sniper/patches/patch-ab b/games/orbital_eunuchs_sniper/patches/patch-ab
deleted file mode 100644
index 5f3b794acc5..00000000000
--- a/games/orbital_eunuchs_sniper/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/23 16:07:15 wiz Exp $
-
---- src/snipe2d.h.orig	2003-04-21 13:18:47.000000000 +0200
-+++ src/snipe2d.h
-@@ -36,7 +36,9 @@
- //
- //#include <windows.h>
- #include <iostream>
-+#ifdef __linux__
- #include <linux/limits.h>
-+#endif
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
diff --git a/games/orbital_eunuchs_sniper/patches/patch-ac b/games/orbital_eunuchs_sniper/patches/patch-ac
index 0c67d3dcfe3..c950eaf8601 100644
--- a/games/orbital_eunuchs_sniper/patches/patch-ac
+++ b/games/orbital_eunuchs_sniper/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/03/28 22:02:38 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2008/08/12 16:08:19 wiz Exp $
 
---- configure.orig	2006-03-28 21:53:00.000000000 +0000
+--- configure.orig	2006-10-19 03:38:43.000000000 +0000
 +++ configure
-@@ -4700,12 +4700,12 @@ fi
+@@ -5149,12 +5149,12 @@ fi
  
  
  echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
@@ -15,14 +15,14 @@ $NetBSD: patch-ac,v 1.3 2006/03/28 22:02:38 joerg Exp $
 -LIBS="-lSDL  $LIBS"
 +LIBS="-lSDL ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -4758,7 +4758,7 @@ if test $ac_cv_lib_SDL_SDL_Init = yes; t
+ _ACEOF
+@@ -5217,7 +5217,7 @@ if test $ac_cv_lib_SDL_SDL_Init = yes; t
  #define HAVE_LIBSDL 1
  _ACEOF
  
 -  LIBS="-lSDL $LIBS"
 +  LIBS="-lSDL ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  
- fi
- 
+ else
+   { { echo "$as_me:$LINENO: error: SDL is required" >&5
diff --git a/games/orbital_eunuchs_sniper/patches/patch-af b/games/orbital_eunuchs_sniper/patches/patch-af
deleted file mode 100644
index ea534a724fc..00000000000
--- a/games/orbital_eunuchs_sniper/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/10/17 23:44:59 wiz Exp $
-
---- src/target.cpp.orig	2003-03-16 14:38:31.000000000 +0000
-+++ src/target.cpp
-@@ -186,9 +186,9 @@ void target()
-             print(238, row, COLOR_YELLOW, "%20s", "VPB file ID");
-             row += 7;
-             print(238, row, COLOR_YELLOW, "      %03X-%07X/%02X", 
--                        ((((unsigned int)Game.SightedCharacter) * 7001337) & 0xfff),
--                        (((unsigned int)Game.SightedCharacter) * 1337357) & 0xfffffff,
--                        (((unsigned int)Game.SightedCharacter) * 70741)  & 0xff);
-+                        ((((unsigned long)Game.SightedCharacter) * 7001337) & 0xfff),
-+                        (((unsigned long)Game.SightedCharacter) * 1337357) & 0xfffffff,
-+                        (((unsigned long)Game.SightedCharacter) * 70741)  & 0xff);
- 
- 
-             break;
-@@ -217,7 +217,7 @@ void target()
-             row += 7;
-             print(238, row, COLOR_YELLOW, "%20s", "Net worth");
-             row += 7;
--            print(238, row, COLOR_YELLOW, "%17u KC", (((unsigned int)Game.SightedCharacter) * 1337357) % 71937);
-+            print(238, row, COLOR_YELLOW, "%17u KC", (((unsigned long)Game.SightedCharacter) * 1337357) % 71937);
-             break;
-         case 3:
-             print(238, row, COLOR_YELLOW, "%20s", "Splat.");