diff options
author | Patrick Li <pat@FreeBSD.org> | 2002-05-14 21:21:26 +0000 |
---|---|---|
committer | Patrick Li <pat@FreeBSD.org> | 2002-05-14 21:21:26 +0000 |
commit | 281d91ce3a857aa98510c42bb56787936d2ac01b (patch) | |
tree | 44733691df4ffc1b79f3261403bb6b9641f18d5e /games/scummvm | |
parent | Update to 1.5.4 (diff) |
Update to 0.2.0
PR: 38072
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=59105
Diffstat (limited to 'games/scummvm')
-rw-r--r-- | games/scummvm/Makefile | 10 | ||||
-rw-r--r-- | games/scummvm/distinfo | 2 | ||||
-rw-r--r-- | games/scummvm/files/patch-Makefile | 38 | ||||
-rw-r--r-- | games/scummvm/files/patch-Makefile.common | 17 | ||||
-rw-r--r-- | games/scummvm/files/patch-Makefile.x11 | 21 |
5 files changed, 58 insertions, 30 deletions
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index 03e10d49363d..a06008b1b9ad 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -6,19 +6,21 @@ # PORTNAME= scummvm -PORTVERSION= 0.1.0 +PORTVERSION= 0.2.0 CATEGORIES= games emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}b +DISTNAME= ${PORTNAME}_${PORTVERSION}-src +EXTRACT_SUFX= .tgz MAINTAINER= flynn@energyhq.homeip.net LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 -USE_ZIP= yes USE_GMAKE= yes -NO_WRKSUBDIR= yes +WRKSRC= ${WRKDIR}/${PORTNAME} + +#MAKEFILE= Makefile.x11 pre-patch: @${FIND} -E ${WRKSRC} -type f -iregex ".*\.(cpp|h|txt)" \ diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo index fad7e696a774..6cbf86bff4b2 100644 --- a/games/scummvm/distinfo +++ b/games/scummvm/distinfo @@ -1 +1 @@ -MD5 (scummvm-0.1.0b.zip) = 890866eadd9bb577294c8cc08ea67261 +MD5 (scummvm_0.2.0-src.tgz) = faba7c1541c1e656813adeb65cc5fe72 diff --git a/games/scummvm/files/patch-Makefile b/games/scummvm/files/patch-Makefile index a724b8cb19b9..2b95d83fc14c 100644 --- a/games/scummvm/files/patch-Makefile +++ b/games/scummvm/files/patch-Makefile @@ -1,32 +1,20 @@ ---- Makefile.orig Tue Jan 15 08:06:24 2002 -+++ Makefile Tue Mar 26 13:17:48 2002 -@@ -1,12 +1,10 @@ - # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.19 2002/01/13 19:48:30 strigeus Exp $ +--- 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 = gcc --CFLAGS = -g -Wno-multichar - DEFINES = -DUNIX -DUSE_ADLIB +-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 + CPPFLAGS= $(DEFINES) $(INCLUDES) - INCS = scumm.h scummsys.h stdafx.h -@@ -22,12 +20,12 @@ - scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h + # Add -lmad for -DCOMPRESSED_SOUND_FILE +-LIBS = `sdl-config --libs` -lncurses ++LIBS = `sdl11-config --libs` -lncurses - .cpp.o: -- $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -+ $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o + OBJS = sdl.o - all: scummvm - - scummvm: $(OBJS) -- $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) -+ $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) - - $(OBJS): Makefile diff --git a/games/scummvm/files/patch-Makefile.common b/games/scummvm/files/patch-Makefile.common new file mode 100644 index 000000000000..4433617646c9 --- /dev/null +++ b/games/scummvm/files/patch-Makefile.common @@ -0,0 +1,17 @@ +--- 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) diff --git a/games/scummvm/files/patch-Makefile.x11 b/games/scummvm/files/patch-Makefile.x11 new file mode 100644 index 000000000000..f0fc01a326d9 --- /dev/null +++ b/games/scummvm/files/patch-Makefile.x11 @@ -0,0 +1,21 @@ +--- 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 + |