Attachment #21800 for bug #38072

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




#

PORTNAME=	scummvm
PORTVERSION=	0.2.0
CATEGORIES=	games emulators
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}_${PORTVERSION}-src

MAINTAINER=	flynn@energyhq.homeip.net

EXTRACT_SUFX=	.tgz

LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12
USE_GMAKE=	yes

WRKSRC=         ${WRKDIR}/${PORTNAME}

#MAKEFILE=	Makefile.x11

pre-patch:
	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \

Line 1 Link Here

(-)scummvm/distinfo (-1 / +1 lines)
1	MD5 (scummvm-0.1.0b.zip) = 890866eadd9bb577294c8cc08ea67261	1	MD5 (scummvm_0.2.0-src.tgz) = faba7c1541c1e656813adeb65cc5fe72




--- Makefile.orig	Tue May 14 13:56:04 2002
+++ Makefile	Tue May 14 13:59:12 2002
@@ -1,14 +1,14 @@
 # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
 
 CC      = g++
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
+CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
 DEFINES = -DUNIX
 LDFLAGS :=
-INCLUDES:= `sdl-config --cflags` -I./ -I./sound
-CPPFLAGS= $(DEFINES) $(INCLUDES)
-LIBS	= `sdl-config --libs` -lreadline -lncurses -lhistory -lm
+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
 CPPFLAGS= $(DEFINES) $(INCLUDES)
+LIBS	= `sdl11-config --libs` -lreadline -lncurses -lhistory -lm
 ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
 
 INCS	= scumm.h scummsys.h stdafx.h
@@ -22,12 +20,12 @@
 	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
 
 .cpp.o:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
+	$(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
 
 # Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS	= `sdl-config --libs` -lncurses
+LIBS	= `sdl11-config --libs` -lncurses
 
 OBJS	= sdl.o
-	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
 
 $(OBJS): Makefile 




--- Makefile.x11.orig	Tue May 14 13:56:11 2002
+++ Makefile.x11	Tue May 14 14:01:06 2002
@@ -1,14 +1,14 @@
 # $Header: /cvsroot/scummvm/scummvm/Makefile.x11,v 1.4 2002/04/27 11:06:27 fingolfin Exp $
 
 CC      = gcc
-CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
+CFLAGS  += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
 DEFINES = -DUNIX_X11
-LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
-INCLUDES:= -I/usr/X11R6/include -I./ -I./sound -I/usr/local/include
+LDFLAGS := -L${X11BASE}/lib -L${LOCALBASE}/lib
+INCLUDES:= -I${X11BASE}/include -I./ -I./sound -I/usr/local/include
 CPPFLAGS= $(DEFINES) $(INCLUDES)
 
 # Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS	= -lXext -lX11 -lncurses -lm -lmad -lpthread
+LIBS	= -lXext -lX11 -lncurses -lm -lmad ${PTHREAD_LIBS}
 
 OBJS	= x11.o
 

Return to bug 38072

Lines 6-24 Link Here

(-)scummvm/Makefile (-5 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= scummvm	8	PORTNAME= scummvm
9	PORTVERSION= 0.1.0	9	PORTVERSION= 0.2.0
10	CATEGORIES= games emulators	10	CATEGORIES= games emulators
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13	DISTNAME= ${PORTNAME}-${PORTVERSION}b	13	DISTNAME= ${PORTNAME}_${PORTVERSION}-src
14		14
15	MAINTAINER= flynn@energyhq.homeip.net	15	MAINTAINER= flynn@energyhq.homeip.net
16		16
17	LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12	17	EXTRACT_SUFX= .tgz
18		18
19	USE_ZIP= yes	19	LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12
20	USE_GMAKE= yes	20	USE_GMAKE= yes
21	NO_WRKSUBDIR= yes	21
		22	WRKSRC= ${WRKDIR}/${PORTNAME}
		23
		24	#MAKEFILE= Makefile.x11
22		25
23	pre-patch:	26	pre-patch:
24	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp\|h\|txt)" \	27	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp\|h\|txt)" \

Lines 1-32 Link Here

(-)scummvm/files/patch-Makefile (-26 / +14 lines)
1	--- Makefile.orig Tue Jan 15 08:06:24 2002	1	--- Makefile.orig Tue May 14 13:56:04 2002
2	+++ Makefile Tue Mar 26 13:17:48 2002	2	+++ Makefile Tue May 14 13:59:12 2002
3	@@ -1,12 +1,10 @@	3	@@ -1,14 +1,14 @@
4	# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.19 2002/01/13 19:48:30 strigeus Exp $	4	# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
5		5
6	-CC = gcc	6	CC = g++
7	-CFLAGS = -g -Wno-multichar	7	-CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
8	DEFINES = -DUNIX -DUSE_ADLIB	8	+CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
		9	DEFINES = -DUNIX
9	LDFLAGS :=	10	LDFLAGS :=
10	-INCLUDES:= `sdl-config --cflags` -I./ -I./sound	11	-INCLUDES:= `sdl-config --cflags` -I./ -I./sound
11	-CPPFLAGS= $(DEFINES) $(INCLUDES)
12	-LIBS = `sdl-config --libs` -lreadline -lncurses -lhistory -lm
13	+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound	12	+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
14	+CPPFLAGS+= $(DEFINES) $(INCLUDES)	13	CPPFLAGS= $(DEFINES) $(INCLUDES)
15	+LIBS = `sdl11-config --libs` -lreadline -lncurses -lhistory -lm
16	ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
17
18	INCS = scumm.h scummsys.h stdafx.h
19	@@ -22,12 +20,12 @@
20	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
21
22	.cpp.o:
23	- $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
24	+ $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
25		14
26	all: scummvm	15	# Add -lmad for -DCOMPRESSED_SOUND_FILE
		16	-LIBS = `sdl-config --libs` -lncurses
		17	+LIBS = `sdl11-config --libs` -lncurses
27		18
28	scummvm: $(OBJS)	19	OBJS = sdl.o
29	- $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
30	+ $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
31		20
32	$(OBJS): Makefile

Line 0 Link Here

(-)scummvm/files/patch-Makefile.x11 (+21 lines)
	1	--- Makefile.x11.orig Tue May 14 13:56:11 2002
	2	+++ Makefile.x11 Tue May 14 14:01:06 2002
	3	@@ -1,14 +1,14 @@
	4	# $Header: /cvsroot/scummvm/scummvm/Makefile.x11,v 1.4 2002/04/27 11:06:27 fingolfin Exp $
	5
	6	CC = gcc
	7	-CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
	8	+CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE
	9	DEFINES = -DUNIX_X11
	10	-LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
	11	-INCLUDES:= -I/usr/X11R6/include -I./ -I./sound -I/usr/local/include
	12	+LDFLAGS := -L${X11BASE}/lib -L${LOCALBASE}/lib
	13	+INCLUDES:= -I${X11BASE}/include -I./ -I./sound -I/usr/local/include
	14	CPPFLAGS= $(DEFINES) $(INCLUDES)
	15
	16	# Add -lmad for -DCOMPRESSED_SOUND_FILE
	17	-LIBS = -lXext -lX11 -lncurses -lm -lmad -lpthread
	18	+LIBS = -lXext -lX11 -lncurses -lm -lmad ${PTHREAD_LIBS}
	19
	20	OBJS = x11.o
	21