17 files changed, 272 insertions, 93 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index fc76a2aeb0d4..a26d8c5f4684 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	stella
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,44 +15,33 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 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_XLIB=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAKEFILE=	makefile
-ALL_TARGET=	freebsd-x
-
-DOCS=		docs/stella.html
-GFX=		docs/graphics/chucky_cheese.png \
-		docs/graphics/circuit.png \
-		docs/graphics/console.png \
-		docs/graphics/jr_pacman.png \
-		docs/graphics/pacman.png \
-		docs/graphics/secret_quest.png \
-		docs/graphics/space_invaders.png
+PLIST_SUB=	STELLA_BIN="${STELLA_BIN}"
 
-post-build:
-	@(cd ${WRKSRC}/src/ui/sound && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-		${MAKE_ARGS} oss)
+.if defined(WITHOUT_SDL)
+ALL_TARGET=	freebsd-x
+STELLA_BIN=	stella.x11
+.else
+USE_SDL=	yes
+ALL_TARGET=	freebsd-sdl
+STELLA_BIN=	stella.sdl
+.endif
 
 do-install:
-.for exe in src/build/stella.x11 src/ui/sound/stella-sound
-	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${PREFIX}/bin/
-.endfor
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/build/${STELLA_BIN} ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for doc in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
-.endfor
-	${MKDIR} ${DOCSDIR}/graphics
-.for gfx in ${GFX}
-	${INSTALL_DATA} ${WRKSRC}/${gfx} ${DOCSDIR}/graphics/
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/stella/distinfo b/emulators/stella/distinfo
index 02ed6f4f5896..d43e82a7ad7b 100644
--- a/emulators/stella/distinfo
+++ b/emulators/stella/distinfo
@@ -1 +1 @@
-MD5 (stella-1.2-src.tar.gz) = 2c24c0fa2655a597b9e04742485e5ed8
+MD5 (stella-1.3-src.tar.gz) = b9318f82a180ff0a404fca78511b2772
diff --git a/emulators/stella/files/patch-OSS.c b/emulators/stella/files/patch-OSS.c
deleted file mode 100644
index 29c30645ce3d..000000000000
--- a/emulators/stella/files/patch-OSS.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/ui/sound/OSS.c.orig	Tue Jan  8 17:11:32 2002
-+++ src/ui/sound/OSS.c	Mon Dec 30 04:08:03 2002
-@@ -32,12 +32,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <string.h>
--
--#ifdef __FreeBSD__
--  #include <machine/soundcard.h>
--#else
--  #include <sys/soundcard.h>
--#endif
-+#include <sys/soundcard.h>
- 
- #include "TIASound.h"
diff --git a/emulators/stella/files/patch-ac b/emulators/stella/files/patch-ac
index 8c31e426bda1..13a3ea491c24 100644
--- a/emulators/stella/files/patch-ac
+++ b/emulators/stella/files/patch-ac
@@ -1,6 +1,24 @@
---- src/build/makefile.orig	Mon Apr 22 09:53:19 2002
-+++ src/build/makefile	Tue Jan  7 09:08:53 2003
-@@ -66,8 +66,8 @@
+--- src/build/makefile.orig	Tue Feb 18 10:19:44 2003
++++ src/build/makefile	Tue Sep 16 21:48:28 2003
+@@ -23,7 +23,7 @@
+ ## Comment a line out to disable that option, remove comment to enable it.
+ ##============================================================================
+ 
+-OPTIMIZATIONS    = -O2 -Wall -Wno-unused
++# OPTIMIZATIONS    = -O2 -Wall -Wno-unused
+ ### to get full optimization under gcc/x Intel based OS's..
+ # OPTIMIZATIONS    = -O3 -mcpu=pentiumpro -march=pentiumpro -Wall -Wno-unused \
+ #	-funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math \
+@@ -61,7 +61,7 @@
+ ### to include support for saving snapshots in png format
+ ### (requires PNG library)
+ ### Only X11 and SDL ports supported for now
+-# SNAPSHOT_SUPPORT = 1
++SNAPSHOT_SUPPORT = 1
+ 
+ ### comment this out if your system doesn't
+ ### have the gettimeofday function
+@@ -79,8 +79,8 @@
  ## No configurable options below this line ...
  ##============================================================================
  
@@ -11,7 +29,18 @@
  
  LDFLAGS = 
  LDLIBS	= 
-@@ -90,7 +90,7 @@
+@@ -92,8 +92,8 @@
+ 
+ OBJS.SDL   =
+ OPTS.SDL   =
+-LIBS.SDL   = `sdl-config --libs`
+-CFLAGS.SDL = `sdl-config --cflags`
++LIBS.SDL   = `${SDL_CONFIG} --libs`
++CFLAGS.SDL = `${SDL_CONFIG} --cflags`
+ 
+ OPTS.DOS   =
+ 
+@@ -103,7 +103,7 @@
  
  INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -I$(UI)/common
  
@@ -20,19 +49,36 @@
  
  ## set the user-defined options
  ifdef BSPF_BOOL
-@@ -216,6 +216,15 @@
-           LDFLAGS+="$(CFLAGS.X11)" \
-           LDLIBS="-lX11 -lXext" \
+@@ -265,6 +265,32 @@
            LDLIBS+="$(LIBS.X11)" \
-+          OBJS="mainX11.o SndUnix.o"
+           OBJS="mainX11.o"
+           OBJS+="$(OBJS.X11)"
 +
 +freebsd-x:
 +	$(MAKE) stella.x11 \
 +          INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \
-+          SYS_INCLUDES="-I$(X11BASE)/include" \
-+          OPTIONS="-DBSPF_UNIX -DSHOW_TIMING" \
-+          LDFLAGS="-L$(X11BASE)/lib" \
++          SYS_INCLUDES="-I$(X11BASE)/include -I$(LOCALBASE)/include/libpng" \
++          OPTIONS="-DBSPF_UNIX=1" \
++          OPTIONS+="$(OPTS.X11)" \
++          LDFLAGS="-L$(X11BASE)/lib -L$(LOCALBASE)/lib" \
++          LDFLAGS+="$(CFLAGS.X11)" \
++          LDLIBS="-lX11 -lXext" \
++          LDLIBS+="$(LIBS.X11)" \
++          OBJS="mainX11.o" \
++          OBJS+="$(OBJS.X11)"
++
++freebsd-sdl:
++	$(MAKE) stella.sdl \
++          INCLUDES="$(INCLUDES) -I$(UI)/sdl -I$(UI)/sound" \
++          SYS_INCLUDES="-I$(X11BASE)/include -I$(LOCALBASE)/include/libpng" \
++          OPTIONS="-DBSPF_UNIX=1" \
++          OPTIONS+="$(OPTS.SDL)" \
++          LDFLAGS="-L$(X11BASE)/lib -L$(LOCALBASE)/lib" \
++          LDFLAGS+="$(CFLAGS.SDL)" \
 +          LDLIBS="-lX11 -lXext" \
-           OBJS="mainX11.o SndUnix.o"
++          LDLIBS+="$(LIBS.SDL)" \
++          OBJS="mainSDL.o RectList.o" \
++          OBJS+="$(OBJS.SDL)"
  
  ###############################################################################
+ ## List of "core" object files
diff --git a/emulators/stella/files/patch-src::emucore::Props.cxx b/emulators/stella/files/patch-src::emucore::Props.cxx
new file mode 100644
index 000000000000..3cd76bdee02a
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::Props.cxx
@@ -0,0 +1,38 @@
+--- src/emucore/Props.cxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/Props.cxx	Wed Sep 17 00:42:05 2003
+@@ -103,7 +103,7 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-void Properties::load(istream& in)
++void Properties::load(std::istream& in)
+ {
+   // Empty my property array
+   mySize = 0;
+@@ -146,7 +146,7 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-void Properties::save(ostream& out)
++void Properties::save(std::ostream& out)
+ {
+   // Write out each of the key and value pairs
+   for(uInt32 i = 0; i < mySize; ++i)
+@@ -164,7 +164,7 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-string Properties::readQuotedString(istream& in)
++string Properties::readQuotedString(std::istream& in)
+ {
+   char c;
+ 
+@@ -205,7 +205,7 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-void Properties::writeQuotedString(ostream& out, const string& s)
++void Properties::writeQuotedString(std::ostream& out, const string& s)
+ {
+   out.put('"');
+   for(uInt32 i = 0; i < s.length(); ++i)
diff --git a/emulators/stella/files/patch-src::emucore::Props.hxx b/emulators/stella/files/patch-src::emucore::Props.hxx
new file mode 100644
index 000000000000..cd3eb971df64
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::Props.hxx
@@ -0,0 +1,37 @@
+--- src/emucore/Props.hxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/Props.hxx	Wed Sep 17 00:42:29 2003
+@@ -79,14 +79,14 @@
+ 
+       @param in The input stream to use
+     */
+-    void load(istream& in);
++    void load(std::istream& in);
+  
+     /**
+       Save properties to the specified output stream
+ 
+       @param out The output stream to use
+     */
+-    void save(ostream& out);
++    void save(std::ostream& out);
+ 
+     /**
+       Merge the given properties into this properties object
+@@ -103,7 +103,7 @@
+       @param in The input stream to use
+       @return The string inside the quotes
+     */ 
+-    static string readQuotedString(istream& in);
++    static string readQuotedString(std::istream& in);
+      
+     /**
+       Write the specified string to the given output stream as a 
+@@ -112,7 +112,7 @@
+       @param out The output stream to use
+       @param s The string to output
+     */ 
+-    static void writeQuotedString(ostream& out, const string& s);
++    static void writeQuotedString(std::ostream& out, const string& s);
+ 
+   public:
+     /**
diff --git a/emulators/stella/files/patch-src::emucore::PropsSet.cxx b/emulators/stella/files/patch-src::emucore::PropsSet.cxx
new file mode 100644
index 000000000000..ae88bc1b2389
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::PropsSet.cxx
@@ -0,0 +1,19 @@
+--- src/emucore/PropsSet.cxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/PropsSet.cxx	Wed Sep 17 00:47:25 2003
+@@ -203,14 +203,14 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-void PropertiesSet::save(ostream& out)
++void PropertiesSet::save(std::ostream& out)
+ {
+   saveNode(out, myRoot);
+ }
+ 
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-void PropertiesSet::saveNode(ostream& out, TreeNode *node)
++void PropertiesSet::saveNode(std::ostream& out, TreeNode *node)
+ {
+   if(node)
+   {
diff --git a/emulators/stella/files/patch-src::emucore::PropsSet.hxx b/emulators/stella/files/patch-src::emucore::PropsSet.hxx
new file mode 100644
index 000000000000..541310e9f7de
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::PropsSet.hxx
@@ -0,0 +1,20 @@
+--- src/emucore/PropsSet.hxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/PropsSet.hxx	Wed Sep 17 00:47:27 2003
+@@ -75,7 +75,7 @@
+ 
+       @param out The output stream to use
+     */
+-    void save(ostream& out);
++    void save(std::ostream& out);
+ 
+     /**
+       Get the number of properties in the collection.
+@@ -134,7 +134,7 @@
+       @param out The output stream to use
+       @param node The current subroot of the tree
+     */
+-    void saveNode(ostream& out, TreeNode *node);
++    void saveNode(std::ostream& out, TreeNode *node);
+ 
+     // The root of the BST
+     TreeNode* myRoot;
diff --git a/emulators/stella/files/patch-ad b/emulators/stella/files/patch-src::emucore::TIASound.c
index 6a349138cd75..5d38df64e83a 100644
--- a/emulators/stella/files/patch-ad
+++ b/emulators/stella/files/patch-src::emucore::TIASound.c
@@ -1,11 +1,13 @@
---- src/ui/sound/TIASound.c.orig	Sun Jan 21 11:26:38 2001
-+++ src/ui/sound/TIASound.c	Mon Jan 22 06:37:37 2001
-@@ -168,10 +168,12 @@
+--- src/emucore/TIASound.c.orig	Tue Feb 18 02:19:44 2003
++++ src/emucore/TIASound.c	Wed Sep 24 15:51:58 2003
+@@ -171,11 +171,13 @@
+ {

     uint8 chan;

     int16 n;

- 

-+   srandom(time(NULL));

-+

+-

++
++   srandom(time(NULL));
++
     /* fill the 9bit polynomial with random bits */

     for (n=0; n<POLY9_SIZE; n++)

     {

diff --git a/emulators/stella/files/patch-src::emucore::m6502::src::M6502.cxx b/emulators/stella/files/patch-src::emucore::m6502::src::M6502.cxx
new file mode 100644
index 000000000000..3a994e679b97
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::m6502::src::M6502.cxx
@@ -0,0 +1,11 @@
+--- src/emucore/m6502/src/M6502.cxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/m6502/src/M6502.cxx	Wed Sep 17 00:45:41 2003
+@@ -128,7 +128,7 @@
+ }
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-ostream& operator<<(ostream& out, const M6502::AddressingMode& mode)
++std::ostream& operator<<(std::ostream& out, const M6502::AddressingMode& mode)
+ {
+   switch(mode)
+   {
diff --git a/emulators/stella/files/patch-src::emucore::m6502::src::M6502.hxx b/emulators/stella/files/patch-src::emucore::m6502::src::M6502.hxx
new file mode 100644
index 000000000000..85705ba0ab6a
--- /dev/null
+++ b/emulators/stella/files/patch-src::emucore::m6502::src::M6502.hxx
@@ -0,0 +1,11 @@
+--- src/emucore/m6502/src/M6502.hxx.orig	Tue Feb 18 10:19:44 2003
++++ src/emucore/m6502/src/M6502.hxx	Wed Sep 17 00:45:41 2003
+@@ -164,7 +164,7 @@
+       @param out The stream to output the addressing mode to
+       @param mode The addressing mode to output
+     */
+-    friend ostream& operator<<(ostream& out, const AddressingMode& mode);
++    friend std::ostream& operator<<(std::ostream& out, const AddressingMode& mode);
+ 
+   protected:
+     /**
diff --git a/emulators/stella/files/patch-src::ui::common::Settiongs.cxx b/emulators/stella/files/patch-src::ui::common::Settiongs.cxx
new file mode 100644
index 000000000000..ec288d6e2e28
--- /dev/null
+++ b/emulators/stella/files/patch-src::ui::common::Settiongs.cxx
@@ -0,0 +1,11 @@
+--- src/ui/common/Settings.cxx.orig	Tue Feb 18 10:19:45 2003
++++ src/ui/common/Settings.cxx	Wed Sep 17 00:40:23 2003
+@@ -247,7 +247,7 @@
+   return true;
+ }
+ 
+-void Settings::handleRCFile(istream& in)
++void Settings::handleRCFile(std::istream& in)
+ {
+   string line, key, value;
+   uInt32 equalPos;
diff --git a/emulators/stella/files/patch-src::ui::common::Settiongs.hxx b/emulators/stella/files/patch-src::ui::common::Settiongs.hxx
new file mode 100644
index 000000000000..ec90ed2d8e49
--- /dev/null
+++ b/emulators/stella/files/patch-src::ui::common::Settiongs.hxx
@@ -0,0 +1,11 @@
+--- src/ui/common/Settings.hxx.orig	Tue Feb 18 10:19:45 2003
++++ src/ui/common/Settings.hxx	Wed Sep 17 00:40:23 2003
+@@ -32,7 +32,7 @@
+     ~Settings();
+ 
+     bool handleCommandLineArgs(int ac, char* av[]);
+-    void handleRCFile(istream& in);
++    void handleRCFile(std::istream& in);
+ 
+   public:
+     // Indicates whether to use fullscreen
diff --git a/emulators/stella/files/patch-src::ui::sound::SoundOSS.cxx b/emulators/stella/files/patch-src::ui::sound::SoundOSS.cxx
new file mode 100644
index 000000000000..3c042e19ba82
--- /dev/null
+++ b/emulators/stella/files/patch-src::ui::sound::SoundOSS.cxx
@@ -0,0 +1,15 @@
+--- src/ui/sound/SoundOSS.cxx.orig	Tue Feb 18 10:19:44 2003
++++ src/ui/sound/SoundOSS.cxx	Tue Sep 16 20:10:20 2003
+@@ -22,11 +22,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ 
+-#ifdef __FreeBSD__
+-  #include <machine/soundcard.h>
+-#else
+-  #include <sys/soundcard.h>
+-#endif
++#include <sys/soundcard.h>
+ 
+ #define DSP_DEVICE "/dev/dsp"
+ #define MIXER_DEVICE "/dev/mixer"
diff --git a/emulators/stella/files/patch-src::ui::sound::makefile b/emulators/stella/files/patch-src::ui::sound::makefile
deleted file mode 100644
index 037b08b5012f..000000000000
--- a/emulators/stella/files/patch-src::ui::sound::makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/ui/sound/makefile.orig	Fri Dec 28 04:54:36 2001
-+++ src/ui/sound/makefile	Tue Jan  7 09:10:08 2003
-@@ -1,9 +1,9 @@
- ###############################################################################
- ## C compiler to use
- ###############################################################################
--CC = gcc
-+CC ?= gcc
- 
--CFLAGS = -DWIN32 -O -ansi -Wall
-+CFLAGS += -DWIN32
- 
- OBJS = TIASound.o
- 
diff --git a/emulators/stella/pkg-descr b/emulators/stella/pkg-descr
index f2996adf649d..c1bdc3ea3c38 100644
--- a/emulators/stella/pkg-descr
+++ b/emulators/stella/pkg-descr
@@ -7,4 +7,4 @@ From the documentation:
   its original release Stella has been ported to AcornOS, AmigaOS, DOS,
   FreeBSD, IRIX, Linux, MacOS, OpenStep, OS/2, Unix, and Windows.
 
-See also: http://stella.sourceforge.net/
+WWW: http://stella.sourceforge.net/
diff --git a/emulators/stella/pkg-plist b/emulators/stella/pkg-plist
index 41749b422ddc..f878b6fe5c5e 100644
--- a/emulators/stella/pkg-plist
+++ b/emulators/stella/pkg-plist
@@ -1,14 +1,13 @@
-bin/stella.x11
-bin/stella-sound
-share/stella/stella.pro
-@dirrm share/stella
-share/doc/stella/graphics/chucky_cheese.png
-share/doc/stella/graphics/circuit.png
-share/doc/stella/graphics/console.png
-share/doc/stella/graphics/jr_pacman.png
-share/doc/stella/graphics/pacman.png
-share/doc/stella/graphics/secret_quest.png
-share/doc/stella/graphics/space_invaders.png
-@dirrm share/doc/stella/graphics
-share/doc/stella/stella.html
-@dirrm share/doc/stella
+bin/%%STELLA_BIN%%
+%%PORTDOCS%%%%DOCSDIR%%/graphics/chucky_cheese.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/circuit.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/console.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/jr_pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/pacman.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/secret_quest.png
+%%PORTDOCS%%%%DOCSDIR%%/graphics/space_invaders.png
+%%PORTDOCS%%%%DOCSDIR%%/stella.html
+%%DATADIR%%/stella.pro
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/graphics
+%%PORTDOCS%%@dirrm %%DOCSDIR%%