Update to 2.1.

A huge number of improvements since last pkgsrc version.

5 files changed, 60 insertions, 105 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 30d3445b70b..1d9c96fd775 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2006/02/05 23:09:03 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/04/07 06:28:44 dillo Exp $
 
-STELLA_VERSION=	1.4.1
+STELLA_VERSION=	2.1
 DISTNAME=	stella-${STELLA_VERSION}-src
 PKGNAME=	stella-${STELLA_VERSION}
-PKGREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=stella/}
 
@@ -11,39 +10,19 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://stella.sourceforge.net/
 COMMENT=	Multi-platform Atari 2600 VCS emulator
 
-PATCHDIR=               ${.CURDIR}/../stella/patches
-DISTINFO_FILE=          ${.CURDIR}/../stella/distinfo
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
+USE_DIRS+=		xdg-1.1
+UNLIMIT_RESOURCES=	datasize
 
-WRKSRC=		${WRKDIR}/stella-${STELLA_VERSION}/src/build
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	gmake
-USE_INSTALL=	YES
-UNLIMIT_RESOURCES=datasize
-
-MAKEFILE=	makefile
-BUILD_TARGET=	linux
+HAS_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=	3.0
 .endif
 
-MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:Q}\ -fno-rtti
-
-DOCDIR=${PREFIX}/share/doc/html/stella
-DATADIR=${PREFIX}/share/stella
-
-INSTALLATION_DIRS=	bin
-
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/stella ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}/graphics
-	${INSTALL_DATA} ${WRKSRC}/../../docs/stella.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/../../docs/graphics/* ${DOCDIR}/graphics
-	${INSTALL_DATA_DIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../emucore/stella.pro ${DATADIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/stella/PLIST b/emulators/stella/PLIST
index 56de74177e4..3e7f49ada16 100644
--- a/emulators/stella/PLIST
+++ b/emulators/stella/PLIST
@@ -1,14 +1,36 @@
-@comment $NetBSD: PLIST,v 1.3 2004/08/13 16:12:25 dillo Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/04/07 06:28:44 dillo Exp $
 bin/stella
-share/doc/html/stella/graphics/chucky_cheese.png
-share/doc/html/stella/graphics/circuit.png
-share/doc/html/stella/graphics/console.png
-share/doc/html/stella/graphics/jr_pacman.png
-share/doc/html/stella/graphics/pacman.png
-share/doc/html/stella/graphics/secret_quest.png
-share/doc/html/stella/graphics/space_invaders.png
-share/doc/html/stella/stella.html
+share/doc/stella/Announce.txt
+share/doc/stella/Changes.txt
+share/doc/stella/Copyright.txt
+share/doc/stella/License.txt
+share/doc/stella/README-PSP.txt
+share/doc/stella/README-SDL.txt
+share/doc/stella/Readme.txt
+share/doc/stella/Todo.txt
+share/doc/stella/debugger.html
+share/doc/stella/graphics/chucky_cheese.png
+share/doc/stella/graphics/circuit.png
+share/doc/stella/graphics/console.png
+share/doc/stella/graphics/eventmapping.png
+share/doc/stella/graphics/eventmapping_remap.png
+share/doc/stella/graphics/jr_pacman.png
+share/doc/stella/graphics/launcher.png
+share/doc/stella/graphics/launcher_options_rom.png
+share/doc/stella/graphics/launcher_options_snap.png
+share/doc/stella/graphics/options_about.png
+share/doc/stella/graphics/options_audio.png
+share/doc/stella/graphics/options_gameinfo.png
+share/doc/stella/graphics/options_help.png
+share/doc/stella/graphics/options_video.png
+share/doc/stella/graphics/pacman.png
+share/doc/stella/graphics/rom_browser.png
+share/doc/stella/graphics/secret_quest.png
+share/doc/stella/graphics/space_invaders.png
+share/doc/stella/stella.html
+share/icons/stella.xpm
 share/stella/stella.pro
-@dirrm share/doc/html/stella/graphics
-@dirrm share/doc/html/stella
 @dirrm share/stella
+@comment in xdg-dirs: @dirrm share/icons
+@dirrm share/doc/stella/graphics
+@dirrm share/doc/stella
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 7a92f76875f..e48b5ae7d65 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 18:49:20 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/04/07 06:28:44 dillo Exp $
 
-SHA1 (stella-1.4.1-src.tar.gz) = 085650e00b7d077f9da0069b327f9c9bbec893e4
-RMD160 (stella-1.4.1-src.tar.gz) = b000bd9e7b5c7cb9c29ebec519adff6479250663
-Size (stella-1.4.1-src.tar.gz) = 707079 bytes
-SHA1 (patch-aa) = 893d5ad5165f02c2dfde5d07c348362aba36d340
-SHA1 (patch-ab) = a7d13dd26b7656385c09fda306b8272dd3feae4c
+SHA1 (stella-2.1-src.tar.gz) = 2ab0163a24ad877d81dc8f9ee77cfd1482194e14
+RMD160 (stella-2.1-src.tar.gz) = 7ddecbcc78bf0ddd3a0aedf924f00b69e2ec6013
+Size (stella-2.1-src.tar.gz) = 1062215 bytes
+SHA1 (patch-aa) = 76545aaaf3fa320b8b83396c0a90588cd7b404af
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    = "";
- }