5 files changed, 59 insertions, 27 deletions

diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index ff4e8995fbcd..fb6e3c7916eb 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stella
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,17 +15,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_XLIB=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+BUILD_WRKSRC=	${WRKSRC}/src/build
 
-PORTTOP=	${WRKDIR}/${PKGNAME}
-WRKSRC=		${PORTTOP}/src/build
+USE_XLIB=	yes
 USE_GMAKE=	yes
+MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAKEFILE=	makefile
 ALL_TARGET=	freebsd-x
 
-USE_XLIB=	yes
-
-DOCSDIR=	${PREFIX}/share/doc/stella
 DOCS=		docs/stella.html
 GFX=		docs/graphics/chucky_cheese.png \
 		docs/graphics/circuit.png \
@@ -35,25 +34,24 @@ GFX=		docs/graphics/chucky_cheese.png \
 		docs/graphics/space_invaders.png
 
 post-build:
-	@(cd ${PORTTOP}/src/ui/sound && \
+	@(cd ${WRKSRC}/src/ui/sound && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} oss)
 
 do-install:
 .for exe in src/build/stella.x11 src/ui/sound/stella-sound
-	${INSTALL_PROGRAM} ${PORTTOP}/${exe} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${PREFIX}/bin/
 .endfor
-	${MKDIR} ${PREFIX}/share/stella
-	${INSTALL_DATA} ${PORTTOP}/src/emucore/stella.pro \
-		${PREFIX}/share/stella/
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR}/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for doc in ${DOCS}
-	${INSTALL_DATA} ${PORTTOP}/${doc} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
 .endfor
 	${MKDIR} ${DOCSDIR}/graphics
 .for gfx in ${GFX}
-	${INSTALL_DATA} ${PORTTOP}/${gfx} ${DOCSDIR}/graphics/
+	${INSTALL_DATA} ${WRKSRC}/${gfx} ${DOCSDIR}/graphics/
 .endfor
 .endif
 
diff --git a/emulators/stella/files/patch-OSS.c b/emulators/stella/files/patch-OSS.c
index df0899b821dc..29c30645ce3d 100644
--- a/emulators/stella/files/patch-OSS.c
+++ b/emulators/stella/files/patch-OSS.c
@@ -1,5 +1,5 @@
---- ../ui/sound/OSS.c.orig	Tue Jan  8 17:11:32 2002
-+++ ../ui/sound/OSS.c	Mon Dec 30 04:08:03 2002
+--- 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>
diff --git a/emulators/stella/files/patch-ac b/emulators/stella/files/patch-ac
index b34fb7a2de8f..8c31e426bda1 100644
--- a/emulators/stella/files/patch-ac
+++ b/emulators/stella/files/patch-ac
@@ -1,18 +1,38 @@
---- makefile.orig	Mon Apr 22 01:53:19 2002
-+++ makefile	Mon Dec 30 03:44:36 2002
-@@ -218,6 +218,15 @@
-           LDLIBS+="$(LIBS.X11)" \
-           OBJS="mainX11.o SndUnix.o"
+--- 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 @@
+ ## No configurable options below this line ...
+ ##============================================================================
+ 
+-CXX	= g++
+-LD	= g++
++CXX	?= g++
++LD	= $(CXX)
+ 
+ LDFLAGS = 
+ LDLIBS	= 
+@@ -90,7 +90,7 @@
  
+ INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -I$(UI)/common
+ 
+-CXXFLAGS = $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES)
++CXXFLAGS += $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES)
+ 
+ ## set the user-defined options
+ ifdef BSPF_BOOL
+@@ -216,6 +216,15 @@
+           LDFLAGS+="$(CFLAGS.X11)" \
+           LDLIBS="-lX11 -lXext" \
+           LDLIBS+="$(LIBS.X11)" \
++          OBJS="mainX11.o SndUnix.o"
++
 +freebsd-x:
-+	gmake stella.x11 \
++	$(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" \
 +          LDLIBS="-lX11 -lXext" \
-+          OBJS="mainX11.o SndUnix.o"
-+
- ###############################################################################
- ## List of "core" object files
+           OBJS="mainX11.o SndUnix.o"
+ 
  ###############################################################################
diff --git a/emulators/stella/files/patch-ad b/emulators/stella/files/patch-ad
index 0916c9cff0af..6a349138cd75 100644
--- a/emulators/stella/files/patch-ad
+++ b/emulators/stella/files/patch-ad
@@ -1,5 +1,5 @@
---- ../ui/sound/TIASound.c.orig	Sun Jan 21 11:26:38 2001
-+++ ../ui/sound/TIASound.c	Mon Jan 22 06:37:37 2001
+--- 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 @@
     uint8 chan;

     int16 n;

diff --git a/emulators/stella/files/patch-src::ui::sound::makefile b/emulators/stella/files/patch-src::ui::sound::makefile
new file mode 100644
index 000000000000..037b08b5012f
--- /dev/null
+++ b/emulators/stella/files/patch-src::ui::sound::makefile
@@ -0,0 +1,14 @@
+--- 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
+