6 files changed, 27 insertions, 58 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 107c76514974..ca0cbcf31655 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stella
-PORTVERSION=	1.4.2
+PORTVERSION=	2.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,23 +18,23 @@ COMMENT=	A multi-platform Atari 2600 VCS emulator
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-BUILD_WRKSRC=	${WRKSRC}/src/build
 
-USE_GNOME=	pkgconfig
+USE_GCC=	3.4+
 USE_SDL=	sdl
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKEFILE=	makefile
-MAKE_ARGS=	CXX="${CXX}" LD="${CXX}" OPTIMIZATIONS="${CXXFLAGS}" \
-		SYS_INCLUDES="${CPPFLAGS}" LDFLAGS="" LDLIBS="${LDFLAGS}"
-ALL_TARGET=	linux-gl
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-CPPFLAGS=	`${SDL_CONFIG} --cflags` `pkg-config --cflags libpng12` \
-		-I${X11BASE}/include
-LDFLAGS=	`${SDL_CONFIG} --libs` `pkg-config --libs libpng12` \
-		-L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|sdlconfigs=.*$$|sdlconfigs=${SDL_CONFIG:T}|g' \
+		${WRKSRC}/configure
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/build/stella ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/stella ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR}
 .if !defined(NOPORTDOCS)
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 21c56e74d7ed..b61f3e8901eb 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1,2 +1,2 @@
-MD5 (stella-1.4.2-src.tar.gz) = c23614f5fd3d963e308dc82916b98734
-SIZE (stella-1.4.2-src.tar.gz) = 706631
+MD5 (stella-2.0-src.tar.gz) = f506069ede75eda38d657d7c32d3b182
+SIZE (stella-2.0-src.tar.gz) = 1000574
diff --git a/emulators/stella/files/patch-src::common::Snapshot.cxx b/emulators/stella/files/patch-src::common::Snapshot.cxx
deleted file mode 100644
index 1fba5e21b94f..000000000000
--- a/emulators/stella/files/patch-src::common::Snapshot.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/common/Snapshot.cxx.orig	Wed Jun 23 09:15:32 2004
-+++ src/common/Snapshot.cxx	Thu Sep 30 21:01:54 2004
-@@ -73,7 +73,11 @@
-   uInt32 width  = myFrameBuffer.imageWidth();
-   uInt32 height = myFrameBuffer.imageHeight();
- 
-+#if defined(__GNUC__) && __GNUC__ < 3
-+  ofstream* out = new ofstream(filename.c_str(), ios::binary);
-+#else
-   ofstream* out = new ofstream(filename.c_str(), ios_base::binary);
-+#endif
-   if(!out)
-     return "Couldn't create snapshot file";
- 
diff --git a/emulators/stella/files/patch-src::common::mainSDL.cxx b/emulators/stella/files/patch-src::common::mainSDL.cxx
deleted file mode 100644
index f6a8539d7c6f..000000000000
--- a/emulators/stella/files/patch-src::common::mainSDL.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/common/mainSDL.cxx.orig	Fri Aug  6 10:51:15 2004
-+++ src/common/mainSDL.cxx	Thu Sep 30 21:00:45 2004
-@@ -822,7 +822,11 @@
-   const char* file = argv[argc - 1];
- 
-   // Open the cartridge image and read it in
-+#if defined(__GNUC__) && __GNUC__ < 3
-+  ifstream in(file, ios::binary);
-+#else
-   ifstream in(file, ios_base::binary);
-+#endif
-   if(!in)
-   {
-     cerr << "ERROR: Couldn't open " << file << "..." << endl;
diff --git a/emulators/stella/files/patch-src::emucore::TIASound.c b/emulators/stella/files/patch-src::emucore::TIASound.c
deleted file mode 100644
index 25c28f8fa398..000000000000
--- a/emulators/stella/files/patch-src::emucore::TIASound.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/emucore/TIASound.c.orig	Mon Jun 14 04:22:45 2004
-+++ src/emucore/TIASound.c	Sun Jul 18 18:43:44 2004
-@@ -173,10 +173,12 @@
-    uint8 chan;
-    int16 n;
- 
-+   srandom(time(NULL));
-+
-    /* fill the 9bit polynomial with random bits */
-    for (n=0; n<POLY9_SIZE; n++)
-    {
--      Bit9[n] = rand() & 0x01;       /* fill poly9 with random bits */
-+      Bit9[n] = random() & 0x01;       /* fill poly9 with random bits */
-    }
- 
-    /* calculate the sample 'divide by N' value based on the playback freq. */
diff --git a/emulators/stella/pkg-plist b/emulators/stella/pkg-plist
index c50b6ecab2fc..70086c76c308 100644
--- a/emulators/stella/pkg-plist
+++ b/emulators/stella/pkg-plist
@@ -1,9 +1,22 @@
 bin/stella
+%%PORTDOCS%%%%DOCSDIR%%/cheat.html
+%%PORTDOCS%%%%DOCSDIR%%/debugger.html
 %%PORTDOCS%%%%DOCSDIR%%/graphics/chucky_cheese.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/circuit.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/console.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/eventmapping_remap.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/jr_pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_rom.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/launcher_options_snap.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_about.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_audio.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_gameinfo.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_help.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/options_video.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/rom_browser.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/secret_quest.png
 %%PORTDOCS%%%%DOCSDIR%%/graphics/space_invaders.png
 %%PORTDOCS%%%%DOCSDIR%%/stella.html