summaryrefslogtreecommitdiff
path: root/games/scummvm
diff options
context:
space:
mode:
Diffstat (limited to 'games/scummvm')
-rw-r--r--games/scummvm/Makefile5
-rw-r--r--games/scummvm/distinfo12
-rw-r--r--games/scummvm/patches/patch-aa12
-rw-r--r--games/scummvm/patches/patch-ab6
4 files changed, 17 insertions, 18 deletions
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index a5c47e03298..8ef47886d34 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2006/07/03 12:25:05 adam Exp $
-DISTNAME= scummvm-0.8.2
-PKGREVISION= 1
+DISTNAME= scummvm-0.9.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
EXTRACT_SUFX= .tar.bz2
diff --git a/games/scummvm/distinfo b/games/scummvm/distinfo
index fc568a96788..17f7d21fe38 100644
--- a/games/scummvm/distinfo
+++ b/games/scummvm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2006/02/09 08:24:48 adam Exp $
+$NetBSD: distinfo,v 1.22 2006/07/03 12:25:05 adam Exp $
-SHA1 (scummvm-0.8.2.tar.bz2) = c17605d761ea37c8fa49db1a4797b4b137629c56
-RMD160 (scummvm-0.8.2.tar.bz2) = dfc40778bee6156c816435086e5c5d42eef3e5de
-Size (scummvm-0.8.2.tar.bz2) = 2698022 bytes
-SHA1 (patch-aa) = 97356325935a406a8f19a6f594936b66a3231123
-SHA1 (patch-ab) = 370bd3585db73f9e8fd78e5d037ed7d2bdb23705
+SHA1 (scummvm-0.9.0.tar.bz2) = add7b5de06734326e9adacdd4d33264b1e563567
+RMD160 (scummvm-0.9.0.tar.bz2) = 3537c2c0c5ed92db50dea47836b1dca83b21e1f0
+Size (scummvm-0.9.0.tar.bz2) = 4305972 bytes
+SHA1 (patch-aa) = a0a0bfc0ddddb2c54044e2e667e6a8d2e5529a1c
+SHA1 (patch-ab) = 8769804560a8410da0a6f9e95a987fa6be630a6d
diff --git a/games/scummvm/patches/patch-aa b/games/scummvm/patches/patch-aa
index eb2fd6844cf..2cc5d49e52d 100644
--- a/games/scummvm/patches/patch-aa
+++ b/games/scummvm/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.15 2005/10/31 09:05:34 adam Exp $
+$NetBSD: patch-aa,v 1.16 2006/07/03 12:25:05 adam Exp $
---- Makefile.orig 2005-10-29 03:00:57.000000000 +0200
+--- Makefile.orig 2006-06-21 23:19:07.000000000 +0200
+++ Makefile
@@ -9,7 +9,7 @@ srcdir ?= .
DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
- INCLUDES := -I. -I$(srcdir)
+ INCLUDES := -I. -I$(srcdir) -I$(srcdir)/engines
-LIBS :=
+LIBS := ${LIBOSSAUDIO}
OBJS :=
MODULES :=
-@@ -21,8 +21,7 @@ include config.mak
- # Uncomment this for stricter compile time code verification
- # CXXFLAGS+= -Werror
+@@ -18,8 +18,7 @@ MODULE_DIRS :=
+ # Load the make rules generated by configure
+ include config.mak
-CXXFLAGS:= -Wall $(CXXFLAGS)
-CXXFLAGS+= -O -Wuninitialized
diff --git a/games/scummvm/patches/patch-ab b/games/scummvm/patches/patch-ab
index 10399111c48..1c81d2cbdb3 100644
--- a/games/scummvm/patches/patch-ab
+++ b/games/scummvm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/10/31 09:05:34 adam Exp $
+$NetBSD: patch-ab,v 1.6 2006/07/03 12:25:05 adam Exp $
---- common.rules.orig 2005-10-29 03:01:11.000000000 +0200
+--- common.rules.orig 2006-06-21 23:19:07.000000000 +0200
+++ common.rules
@@ -27,6 +27,8 @@ MODULE_LIB-$(MODULE) := $(MODULE)/lib$(n
# If not building as a plugin, add the object files to the main OBJS list
@@ -9,5 +9,5 @@ $NetBSD: patch-ab,v 1.5 2005/10/31 09:05:34 adam Exp $
+CPPFLAGS+= -I$(BUILDLINK_DIR)/include
+
# Convenience library target
- $(MODULE_LIB-$(MODULE)): $(MODULE_OBJS)
+ $(MODULE_LIB-$(MODULE)): $(MODULE_OBJS-$(MODULE))
-$(RM) $@