cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.6.0

Browse Source
This commit is contained in:
jolan 2004-03-31 02:49:36 +00:00
parent c5629968df
commit 5c3cad1933
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
games/scummvm/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2003/12/10 21:28:58 naddy Exp $ # $OpenBSD: Makefile,v 1.7 2004/03/31 02:49:36 jolan Exp $
COMMENT= "play games built around LucasArts' SCUMM" COMMENT= "play games built around LucasArts' SCUMM"
DISTNAME= scummvm-0.5.1 DISTNAME= scummvm-0.6.0
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tar.bz2
CATEGORIES= games x11 emulators CATEGORIES= games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
@ -20,11 +20,20 @@ LIB_DEPENDS= SDL::devel/sdl \
mad.2::audio/libmad \ mad.2::audio/libmad \
vorbis.0,vorbisfile.1::audio/libvorbis vorbis.0,vorbisfile.1::audio/libvorbis
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--disable-alsa
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
NO_REGRESS= Yes NO_REGRESS= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
USE_X11= Yes USE_X11= Yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS} -DSCUMM_NEED_ALIGNMENT" CXX="${CXX}" MAKE_ENV+= CXXFLAGS="${CXXFLAGS}" CXX="${CXX}"
# XXX gcc3 compiling compact.cpp with -O2 gobbles 800MB
.if ${MACHINE_ARCH} == "sparc64"
CXXFLAGS+= -O0
.endif
do-install: do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm

6
games/scummvm/distinfo
View File

@ -1,3 +1,3 @@
MD5 (scummvm-0.5.1.tgz) = 4d56473cceb36b0271a97986b91a4089 MD5 (scummvm-0.6.0.tar.bz2) = efc4207a7f10b24e9fc5afa10ed9c455
RMD160 (scummvm-0.5.1.tgz) = ee64a78ff790894268e8c7608752087c993191d7 RMD160 (scummvm-0.6.0.tar.bz2) = f0ab6a9d739885d2084bee46fc5e4cbae46454c5
SHA1 (scummvm-0.5.1.tgz) = b1b40ec5673ca2e6f3593d955611817ef140b6ed SHA1 (scummvm-0.6.0.tar.bz2) = ff273d23a9cf75a14ffb4d859e6d9e22a6b44548

40
games/scummvm/patches/patch-Makefile
View File

@ -1,35 +1,29 @@
$OpenBSD: patch-Makefile,v 1.4 2004/01/26 21:54:30 naddy Exp $ $OpenBSD: patch-Makefile,v 1.5 2004/03/31 02:49:36 jolan Exp $
--- Makefile.orig 2003-07-16 22:36:38.000000000 +0200 --- Makefile.orig 2004-02-25 04:00:07.000000000 -0600
+++ Makefile 2004-01-26 22:34:01.000000000 +0100 +++ Makefile 2004-03-16 15:50:02.000000000 -0600
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
# $Header: /home/cvs/ports/games/scummvm/patches/Attic/patch-Makefile,v 1.4 2004/01/26 21:54:30 naddy Exp $ # $Header: /home/cvs/ports/games/scummvm/patches/Attic/patch-Makefile,v 1.5 2004/03/31 02:49:36 jolan Exp $
-CXX := c++ -CXX := c++
+#CXX := c++ +#CXX := c++
AR := ar cru AR := ar cru
RANLIB := ranlib RANLIB := ranlib
RM := rm -f MKDIR := mkdir -p
@@ -17,10 +17,10 @@ CP := cp @@ -19,7 +19,7 @@ srcdir ?= .
# Default compilation parameters. Normally don't edit these #
#######################################################################
-CXXFLAGS:= -g -O DEFINES := -DHAVE_CONFIG_H
+#CXXFLAGS:= -g -O
DEFINES :=
LDFLAGS := LDFLAGS :=
-INCLUDES:= -I. -Icommon -INCLUDES := -I$(srcdir) -I$(srcdir)/common
+INCLUDES:= -I. -Icommon -I${LOCALBASE}/include +INCLUDES := -I$(srcdir) -I$(srcdir)/common -I${LOCALBASE}/include
LIBS := LIBS :=
OBJS := OBJS :=
@@ -53,8 +53,8 @@ DEFINES += -DUSE_MAD @@ -33,7 +33,7 @@ include config.mak
LIBS += -lmad # CXXFLAGS+= -Werror
# Uncomment this to activate the Ogg Vorbis lib for compressed sound files CXXFLAGS:= -Wall $(CXXFLAGS)
-# DEFINES += -DUSE_VORBIS -CXXFLAGS+= -O -Wuninitialized
-# LIBS += -lvorbisfile -lvorbis +#CXXFLAGS+= -O -Wuninitialized
+DEFINES += -DUSE_VORBIS CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
+LIBS += -lvorbisfile -lvorbis -lm -logg # Even more warnings...
CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion
# Uncomment this to activate the ALSA lib for midi
# DEFINES += -DUSE_ALSA