Update to 2.1.

A huge number of improvements since last pkgsrc version.

2 files changed, 13 insertions, 58 deletions

diff --git a/emulators/stella/patches/patch-aa b/emulators/stella/patches/patch-aa
index 959426743b9..b397b461210 100644
--- a/emulators/stella/patches/patch-aa
+++ b/emulators/stella/patches/patch-aa
@@ -1,32 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2004/08/13 16:12:25 dillo Exp $
+$NetBSD: patch-aa,v 1.5 2006/04/07 06:28:44 dillo Exp $
 
---- makefile.orig	2004-07-14 18:49:45.000000000 +0200
-+++ makefile
-@@ -48,13 +48,13 @@ OPTIMIZATIONS  = 
- ## No configurable options below this line ...
- ##============================================================================
- 
--CXX	= g++
--LD	= g++
-+#CXX	= g++
-+#LD	= g++
- 
--LDFLAGS  = `sdl-config --cflags`
-+LDFLAGS  += `sdl-config --cflags`
- LDLIBS   = `sdl-config --libs`
- OBJECTS  =  mainSDL.o SoundSDL.o FrameBufferSDL.o FrameBufferSoft.o
--OPTIONS  =
-+OPTIONS  = -DPKG_SYSCONFDIR=\\\"${PKG_SYSCONFDIR}\\\" -DDATADIR=\\\"${PREFIX}/share/stella\\\"
- EXE_NAME =
- SMP      =
- 
-@@ -155,8 +155,7 @@ CORE_OBJS = Booster.o Cart.o Cart2K.o Ca
-             $(M6502_OBJS)
- 
- stella: $(CORE_OBJS) $(OBJS)
--	$(LD) -o $(EXE_NAME) $(CORE_OBJS) $(OBJS) $(LDFLAGS) $(LDLIBS)
--	strip $(EXE_NAME)
-+	$(CXX) -o $(EXE_NAME) $(CORE_OBJS) $(OBJS) $(LDLIBS)
- 
- M6502Low.ins: $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4
- 	m4 $(CORE)/m6502/src/M6502Low.m4 $(CORE)/m6502/src/M6502.m4 > $(CORE)/m6502/src/M6502Low.ins
+--- src/emucore/unzip.h.orig	2005-05-18 18:02:53.000000000 +0200
++++ src/emucore/unzip.h
+@@ -58,6 +58,9 @@ typedef unzFile__ *unzFile;
+ typedef voidp unzFile;
+ #endif
+ 
++#ifndef OF
++#define OF(X)	X
++#endif
+ 
+ #define UNZ_OK                                  (0)
+ #define UNZ_END_OF_LIST_OF_FILE (-100)
diff --git a/emulators/stella/patches/patch-ab b/emulators/stella/patches/patch-ab
deleted file mode 100644
index 8119a3938d1..00000000000
--- a/emulators/stella/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2004/08/16 22:23:58 dillo Exp $
-
---- ../unix/SettingsUNIX.cxx.orig	2004-07-05 02:53:48.000000000 +0200
-+++ ../unix/SettingsUNIX.cxx
-@@ -43,9 +43,9 @@ SettingsUNIX::SettingsUNIX()
-     mkdir(myStateDir.c_str(), 0777);
- 
-   myUserPropertiesFile   = stelladir + "/stella.pro";
--  mySystemPropertiesFile = "/etc/stella.pro";
-+  mySystemPropertiesFile = DATADIR "/stella.pro";
-   myUserConfigFile       = stelladir + "/stellarc";
--  mySystemConfigFile     = "/etc/stellarc";
-+  mySystemConfigFile     = PKG_SYSCONFDIR "/stellarc";
- 
-   // Set up the names of the input and output config files
-   mySettingsOutputFilename = myUserConfigFile;
-@@ -54,6 +54,10 @@ SettingsUNIX::SettingsUNIX()
-   else
-     mySettingsInputFilename = mySystemConfigFile;
- 
-+  // otherwise the system properties file is never used
-+  if(!fileExists(myUserPropertiesFile))
-+    myUserPropertiesFile = "";
-+
-   mySnapshotFile = "";
-   myStateFile    = "";
- }