Attachment #27163 for bug #46150

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




#

PORTNAME=	scummvm
PORTVERSION=	0.3.0b
CATEGORIES=	games emulators
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}_${PORTVERSION}-src
EXTRACT_SUFX=	.tgz

MAINTAINER=	adamw@FreeBSD.org

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

USE_GMAKE=	yes
WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
GNU_CONFIGURE=	yes
USE_REINPLACE=  yes

MAN6=		scummvm.6

pre-patch:
	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \
		-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
	@${REINPLACE_CMD} -e 's|\r\n|\n|' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's@sdl-config@sdl11-config@g' ${WRKSRC}/backends/sdl/build.rules

post-configure:
	@${REINPLACE_CMD} -e 's@-lmad@@g' ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' ${WRKSRC}/Makefile

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
	@${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6

.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for docs in README
	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
.endfor
.endif

Line 1 Link Here

(-)scummvm/distinfo (-1 / +1 lines)
1	MD5 (scummvm_0.2.0-src.tgz) = faba7c1541c1e656813adeb65cc5fe72	1	MD5 (scummvm_0.3.0b-src.tar.gz) = 2192a22fb40f7c63c4f6f862ad60897c




--- Makefile.orig	Tue May 14 17:11:37 2002
+++ Makefile	Tue May 14 17:12:23 2002
@@ -1,14 +1,13 @@
 # $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
+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
 CPPFLAGS= $(DEFINES) $(INCLUDES)
 
 # Add -lmad for -DCOMPRESSED_SOUND_FILE
-LIBS	= `sdl-config --libs` -lncurses
+LIBS	= `sdl11-config --libs` -lncurses
 
 OBJS	= sdl.o
 




--- Makefile.common.orig	Tue May 14 17:14:18 2002
+++ Makefile.common	Tue May 14 17:14:28 2002
@@ -19,12 +19,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
 
 all: scummvm$(EXEEXT)
 
 scummvm$(EXEEXT): $(OBJS)
-	$(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
+	$(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
 
 clean:
 	rm -f $(OBJS) scummvm$(EXEEXT)




--- Makefile.x11.orig	Sat Apr 27 07:06:27 2002
+++ Makefile.x11	Tue May 14 17:12:04 2002
@@ -1,14 +1,13 @@
 # $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${LOCALBASE}/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
 

Line 0 Link Here

(-)scummvm/files/patch-sound::mixer.h (+11 lines)
	1	--- sound/mixer.h.orig Mon Dec 9 22:12:31 2002
	2	+++ sound/mixer.h Mon Dec 9 22:12:50 2002
	3	@@ -25,6 +25,8 @@
	4
	5	#include <stdio.h>
	6
	7	+#undef USE_MAD
	8	+
	9	#ifdef USE_MAD
	10	#include <mad.h>
	11	#endif

Lines 1-5 Link Here

(-)scummvm/pkg-plist (-3 / +1 lines)
1	bin/scummvm	1	bin/scummvm
2	%%PORTDOCS%%share/doc/scummvm/copying.txt	2	%%PORTDOCS%%share/doc/scummvm/README
3	%%PORTDOCS%%share/doc/scummvm/readme.txt
4	%%PORTDOCS%%share/doc/scummvm/whatsnew.txt
5	%%PORTDOCS%%@dirrm share/doc/scummvm	3	%%PORTDOCS%%@dirrm share/doc/scummvm

Return to bug 46150

Lines 6-37 Link Here

(-)scummvm/Makefile (-6 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= scummvm	8	PORTNAME= scummvm
9	PORTVERSION= 0.2.0	9	PORTVERSION= 0.3.0b
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}-src	13	DISTNAME= ${PORTNAME}_${PORTVERSION}-src
14	EXTRACT_SUFX= .tgz
15		14
16	MAINTAINER= adamw@FreeBSD.org	15	MAINTAINER= adamw@FreeBSD.org
17		16
18	LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12	17	LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12
19		18
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}-0.3.0
		21	GNU_CONFIGURE= yes
		22	USE_REINPLACE= yes
22		23
23	#MAKEFILE= Makefile.x11	24	MAN6= scummvm.6
24		25
25	pre-patch:	26	pre-patch:
26	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp\|h\|txt)" \	27	@${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp\|h\|txt)" \
27	-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;	28	-exec ${PERL} -pi -ne 's!\r\n!\n!' {} 1>/dev/null 2>&1 \;
28	@${PERL} -pi -e 's\|\r\n\|\n\|' ${WRKSRC}/Makefile	29	@${REINPLACE_CMD} -e 's\|\r\n\|\n\|' ${WRKSRC}/Makefile
		30	@${REINPLACE_CMD} -e 's@sdl-config@sdl11-config@g' ${WRKSRC}/backends/sdl/build.rules
		31
		32	post-configure:
		33	@${REINPLACE_CMD} -e 's@-lmad@@g' ${WRKSRC}/Makefile
		34	@${REINPLACE_CMD} -e 's@:= -g -O@+= ${CFLAGS}@' ${WRKSRC}/Makefile
29		35
30	do-install:	36	do-install:
31	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin	37	@${INSTALL_PROGRAM} ${WRKSRC}/scummvm ${PREFIX}/bin
		38	@${INSTALL_MAN} ${WRKSRC}/scummvm.6 ${PREFIX}/man/man6
		39
32	.if !defined(NOPORTDOCS)	40	.if !defined(NOPORTDOCS)
33	@${MKDIR} ${DOCSDIR}	41	@${MKDIR} ${DOCSDIR}
34	.for docs in copying.txt readme.txt whatsnew.txt	42	.for docs in README
35	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}	43	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
36	.endfor	44	.endfor
37	.endif	45	.endif

Lines 1-20 Link Here

(-)scummvm/files/patch-Makefile (-20 lines)
1	--- Makefile.orig Tue May 14 17:11:37 2002
2	+++ Makefile Tue May 14 17:12:23 2002
3	@@ -1,14 +1,13 @@
4	# $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.41 2002/04/27 16:58:28 ender Exp $
5
6	-CC = g++
7	-CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
8	+CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
9	DEFINES = -DUNIX
10	LDFLAGS :=
11	-INCLUDES:= `sdl-config --cflags` -I./ -I./sound
12	+INCLUDES:= `sdl11-config --cflags` -I./ -I./sound
13	CPPFLAGS= $(DEFINES) $(INCLUDES)
14
15	# Add -lmad for -DCOMPRESSED_SOUND_FILE
16	-LIBS = `sdl-config --libs` -lncurses
17	+LIBS = `sdl11-config --libs` -lncurses
18
19	OBJS = sdl.o
20

Lines 1-17 Link Here

(-)scummvm/files/patch-Makefile.common (-17 lines)
1	--- Makefile.common.orig Tue May 14 17:14:18 2002
2	+++ Makefile.common Tue May 14 17:14:28 2002
3	@@ -19,12 +19,12 @@
4	scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h
5
6	.cpp.o:
7	- $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
8	+ $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
9
10	all: scummvm$(EXEEXT)
11
12	scummvm$(EXEEXT): $(OBJS)
13	- $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
14	+ $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS)
15
16	clean:
17	rm -f $(OBJS) scummvm$(EXEEXT)

Lines 1-21 Link Here

(-)scummvm/files/patch-Makefile.x11 (-21 lines)
1	--- Makefile.x11.orig Sat Apr 27 07:06:27 2002
2	+++ Makefile.x11 Tue May 14 17:12:04 2002
3	@@ -1,14 +1,13 @@
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${LOCALBASE}/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