Attachment 27163 Details for Bug 46150 – scummvm.diff

[patch] scummvm.diff

scummvm.diff (text/plain), 5.19 KB, created by Miguel Mendez on 2002-12-09 22:00:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Mendez

Created: 2002-12-09 22:00:13 UTC

Size: 5.19 KB

patch

obsolete

>diff -ruN scummvm.old/Makefile scummvm/Makefile
>--- scummvm.old/Makefile	Sun Nov 10 17:46:09 2002
>+++ scummvm/Makefile	Mon Dec  9 22:49:59 2002
>@@ -6,32 +6,40 @@
> #
> 
> PORTNAME=	scummvm
>-PORTVERSION=	0.2.0
>+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}
>+WRKSRC=         ${WRKDIR}/${PORTNAME}-0.3.0
>+GNU_CONFIGURE=	yes
>+USE_REINPLACE=  yes
> 
>-#MAKEFILE=	Makefile.x11
>+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 \;
>-	@${PERL} -pi -e 's|\r\n|\n|' ${WRKSRC}/Makefile
>+	@${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 copying.txt readme.txt whatsnew.txt
>+.for docs in README
> 	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
> .endfor
> .endif
>diff -ruN scummvm.old/distinfo scummvm/distinfo
>--- scummvm.old/distinfo	Tue May 14 23:21:18 2002
>+++ scummvm/distinfo	Mon Dec  9 21:58:01 2002
>@@ -1 +1 @@
>-MD5 (scummvm_0.2.0-src.tgz) = faba7c1541c1e656813adeb65cc5fe72
>+MD5 (scummvm_0.3.0b-src.tar.gz) = 2192a22fb40f7c63c4f6f862ad60897c
>diff -ruN scummvm.old/files/patch-Makefile scummvm/files/patch-Makefile
>--- scummvm.old/files/patch-Makefile	Tue May 14 23:21:26 2002
>+++ scummvm/files/patch-Makefile	Thu Jan  1 01:00:00 1970
>@@ -1,20 +0,0 @@
>---- 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
>- 
>diff -ruN scummvm.old/files/patch-Makefile.common scummvm/files/patch-Makefile.common
>--- scummvm.old/files/patch-Makefile.common	Tue May 14 23:21:26 2002
>+++ scummvm/files/patch-Makefile.common	Thu Jan  1 01:00:00 1970
>@@ -1,17 +0,0 @@
>---- 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 -ruN scummvm.old/files/patch-Makefile.x11 scummvm/files/patch-Makefile.x11
>--- scummvm.old/files/patch-Makefile.x11	Tue May 14 23:21:26 2002
>+++ scummvm/files/patch-Makefile.x11	Thu Jan  1 01:00:00 1970
>@@ -1,21 +0,0 @@
>---- 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
>- 
>diff -ruN scummvm.old/files/patch-sound::mixer.h scummvm/files/patch-sound::mixer.h
>--- scummvm.old/files/patch-sound::mixer.h	Thu Jan  1 01:00:00 1970
>+++ scummvm/files/patch-sound::mixer.h	Mon Dec  9 22:13:37 2002
>@@ -0,0 +1,11 @@
>+--- sound/mixer.h.orig	Mon Dec  9 22:12:31 2002
>++++ sound/mixer.h	Mon Dec  9 22:12:50 2002
>+@@ -25,6 +25,8 @@
>+ 
>+ #include <stdio.h>
>+ 
>++#undef USE_MAD
>++
>+ #ifdef USE_MAD
>+ #include <mad.h>
>+ #endif
>diff -ruN scummvm.old/pkg-plist scummvm/pkg-plist
>--- scummvm.old/pkg-plist	Tue Mar 26 20:28:45 2002
>+++ scummvm/pkg-plist	Mon Dec  9 22:49:21 2002
>@@ -1,5 +1,3 @@
> bin/scummvm
>-%%PORTDOCS%%share/doc/scummvm/copying.txt
>-%%PORTDOCS%%share/doc/scummvm/readme.txt
>-%%PORTDOCS%%share/doc/scummvm/whatsnew.txt
>+%%PORTDOCS%%share/doc/scummvm/README
> %%PORTDOCS%%@dirrm share/doc/scummvm

Actions: View | Diff

Attachments on bug 46150: 27163