View | Details | Raw Unified | Return to bug 46944
Collapse All | Expand All

(-)emulators/stella/Makefile (-13 / +11 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	stella
8
PORTNAME=	stella
9
PORTVERSION=	1.2
9
PORTVERSION=	1.2
10
PORTREVISION=	1
10
CATEGORIES=	emulators
11
CATEGORIES=	emulators
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 14-30 Link Here
14
15
15
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
16
17
17
USE_XLIB=	yes
18
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
19
BUILD_WRKSRC=	${WRKSRC}/src/build
18
20
19
PORTTOP=	${WRKDIR}/${PKGNAME}
21
USE_XLIB=	yes
20
WRKSRC=		${PORTTOP}/src/build
21
USE_GMAKE=	yes
22
USE_GMAKE=	yes
23
MAKE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}"
22
MAKEFILE=	makefile
24
MAKEFILE=	makefile
23
ALL_TARGET=	freebsd-x
25
ALL_TARGET=	freebsd-x
24
26
25
USE_XLIB=	yes
26
27
DOCSDIR=	${PREFIX}/share/doc/stella
28
DOCS=		docs/stella.html
27
DOCS=		docs/stella.html
29
GFX=		docs/graphics/chucky_cheese.png \
28
GFX=		docs/graphics/chucky_cheese.png \
30
		docs/graphics/circuit.png \
29
		docs/graphics/circuit.png \
Lines 35-59 Link Here
35
		docs/graphics/space_invaders.png
34
		docs/graphics/space_invaders.png
36
35
37
post-build:
36
post-build:
38
	@(cd ${PORTTOP}/src/ui/sound && \
37
	@(cd ${WRKSRC}/src/ui/sound && \
39
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
38
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
40
		${MAKE_ARGS} oss)
39
		${MAKE_ARGS} oss)
41
40
42
do-install:
41
do-install:
43
.for exe in src/build/stella.x11 src/ui/sound/stella-sound
42
.for exe in src/build/stella.x11 src/ui/sound/stella-sound
44
	${INSTALL_PROGRAM} ${PORTTOP}/${exe} ${PREFIX}/bin/
43
	${INSTALL_PROGRAM} ${WRKSRC}/${exe} ${PREFIX}/bin/
45
.endfor
44
.endfor
46
	${MKDIR} ${PREFIX}/share/stella
45
	${MKDIR} ${DATADIR}
47
	${INSTALL_DATA} ${PORTTOP}/src/emucore/stella.pro \
46
	${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR}/
48
		${PREFIX}/share/stella/
49
.if !defined(NOPORTDOCS)
47
.if !defined(NOPORTDOCS)
50
	${MKDIR} ${DOCSDIR}
48
	${MKDIR} ${DOCSDIR}
51
.for doc in ${DOCS}
49
.for doc in ${DOCS}
52
	${INSTALL_DATA} ${PORTTOP}/${doc} ${DOCSDIR}/
50
	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}/
53
.endfor
51
.endfor
54
	${MKDIR} ${DOCSDIR}/graphics
52
	${MKDIR} ${DOCSDIR}/graphics
55
.for gfx in ${GFX}
53
.for gfx in ${GFX}
56
	${INSTALL_DATA} ${PORTTOP}/${gfx} ${DOCSDIR}/graphics/
54
	${INSTALL_DATA} ${WRKSRC}/${gfx} ${DOCSDIR}/graphics/
57
.endfor
55
.endfor
58
.endif
56
.endif
59
57
(-)emulators/stella/files/patch-OSS.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ../ui/sound/OSS.c.orig	Tue Jan  8 17:11:32 2002
1
--- src/ui/sound/OSS.c.orig	Tue Jan  8 17:11:32 2002
2
+++ ../ui/sound/OSS.c	Mon Dec 30 04:08:03 2002
2
+++ src/ui/sound/OSS.c	Mon Dec 30 04:08:03 2002
3
@@ -32,12 +32,7 @@
3
@@ -32,12 +32,7 @@
4
 #include <sys/types.h>
4
 #include <sys/types.h>
5
 #include <unistd.h>
5
 #include <unistd.h>
(-)emulators/stella/files/patch-ac (-10 / +30 lines)
Lines 1-18 Link Here
1
--- makefile.orig	Mon Apr 22 01:53:19 2002
1
--- src/build/makefile.orig	Mon Apr 22 09:53:19 2002
2
+++ makefile	Mon Dec 30 03:44:36 2002
2
+++ src/build/makefile	Tue Jan  7 09:08:53 2003
3
@@ -218,6 +218,15 @@
3
@@ -66,8 +66,8 @@
4
           LDLIBS+="$(LIBS.X11)" \
4
 ## No configurable options below this line ...
5
           OBJS="mainX11.o SndUnix.o"
5
 ##============================================================================
6
 
7
-CXX	= g++
8
-LD	= g++
9
+CXX	?= g++
10
+LD	= $(CXX)
11
 
12
 LDFLAGS = 
13
 LDLIBS	= 
14
@@ -90,7 +90,7 @@
6
 
15
 
16
 INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -I$(UI)/common
17
 
18
-CXXFLAGS = $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES)
19
+CXXFLAGS += $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES)
20
 
21
 ## set the user-defined options
22
 ifdef BSPF_BOOL
23
@@ -216,6 +216,15 @@
24
           LDFLAGS+="$(CFLAGS.X11)" \
25
           LDLIBS="-lX11 -lXext" \
26
           LDLIBS+="$(LIBS.X11)" \
27
+          OBJS="mainX11.o SndUnix.o"
28
+
7
+freebsd-x:
29
+freebsd-x:
8
+	gmake stella.x11 \
30
+	$(MAKE) stella.x11 \
9
+          INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \
31
+          INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \
10
+          SYS_INCLUDES="-I$(X11BASE)/include" \
32
+          SYS_INCLUDES="-I$(X11BASE)/include" \
11
+          OPTIONS="-DBSPF_UNIX -DSHOW_TIMING" \
33
+          OPTIONS="-DBSPF_UNIX -DSHOW_TIMING" \
12
+          LDFLAGS="-L$(X11BASE)/lib" \
34
+          LDFLAGS="-L$(X11BASE)/lib" \
13
+          LDLIBS="-lX11 -lXext" \
35
+          LDLIBS="-lX11 -lXext" \
14
+          OBJS="mainX11.o SndUnix.o"
36
           OBJS="mainX11.o SndUnix.o"
15
+
37
 
16
 ###############################################################################
17
 ## List of "core" object files
18
 ###############################################################################
38
 ###############################################################################
(-)emulators/stella/files/patch-ad (-2 / +2 lines)
Lines 1-5 Link Here
1
--- ../ui/sound/TIASound.c.orig	Sun Jan 21 11:26:38 2001
1
--- src/ui/sound/TIASound.c.orig	Sun Jan 21 11:26:38 2001
2
+++ ../ui/sound/TIASound.c	Mon Jan 22 06:37:37 2001
2
+++ src/ui/sound/TIASound.c	Mon Jan 22 06:37:37 2001
3
@@ -168,10 +168,12 @@
3
@@ -168,10 +168,12 @@
4
    uint8 chan;
4
    uint8 chan;
5
    int16 n;
5
    int16 n;
(-)emulators/stella/files/patch-src::ui::sound::makefile (+14 lines)
Line 0 Link Here
1
--- src/ui/sound/makefile.orig	Fri Dec 28 04:54:36 2001
2
+++ src/ui/sound/makefile	Tue Jan  7 09:10:08 2003
3
@@ -1,9 +1,9 @@
4
 ###############################################################################
5
 ## C compiler to use
6
 ###############################################################################
7
-CC = gcc
8
+CC ?= gcc
9
 
10
-CFLAGS = -DWIN32 -O -ansi -Wall
11
+CFLAGS += -DWIN32
12
 
13
 OBJS = TIASound.o
14

Return to bug 46944