update to 1.1.1

games/scummvm/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.35 2010/06/15 13:11:17 landry Exp $
+# $OpenBSD: Makefile,v 1.36 2010/07/13 21:23:39 jsg Exp $
 
 BROKEN-hppa=	gcc bug
 
 COMMENT=	graphical adventure game interpreter
-DISTNAME=	scummvm-1.0.0
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	scummvm-1.1.1
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scummvm/}
 
@@ -58,6 +57,8 @@ CXXFLAGS+=	-O0
 CXXFLAGS+=	-O1
 .endif
 
+CXXFLAGS+=	-fno-stack-protector
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scummvm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/icons

games/scummvm/distinfo

@@ -1,5 +1,5 @@
-MD5 (scummvm-1.0.0.tar.gz) = 3foHTMZfenQXKthk+7Wrpw==
-RMD160 (scummvm-1.0.0.tar.gz) = m7FYT1XPAZ+/2LfUnMEbnnWhlLc=
-SHA1 (scummvm-1.0.0.tar.gz) = FGyj725M3udNtySnY8x8ASWaET4=
-SHA256 (scummvm-1.0.0.tar.gz) = n4v2aT2Pbl2eHIxrJThD/F2rKc+7rC6up7xjQkW6Dlg=
-SIZE (scummvm-1.0.0.tar.gz) = 9598325
+MD5 (scummvm-1.1.1.tar.gz) = //omalIQZtDKjYmSPYRvDw==
+RMD160 (scummvm-1.1.1.tar.gz) = 3eUuZKmMSiOACM83Ist1YwI5ugY=
+SHA1 (scummvm-1.1.1.tar.gz) = sIxi09QiwtKViA6ge9usyh4Lhuo=
+SHA256 (scummvm-1.1.1.tar.gz) = umXscE7dUEUYWKukoHk4qoYp564Ur1F7mgJPaLoYRpc=
+SIZE (scummvm-1.1.1.tar.gz) = 10310047

games/scummvm/patches/patch-Makefile_common

@@ -0,0 +1,32 @@
+$OpenBSD: patch-Makefile_common,v 1.3 2010/07/13 21:23:39 jsg Exp $
+--- Makefile.common.orig	Mon Jul 12 22:02:10 2010
++++ Makefile.common	Mon Jul 12 22:03:00 2010
+@@ -164,28 +164,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
+ VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
+ VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
+ 
+-
+-######################################################################
+-# Get Subversion's working copy information
+-######################################################################
+-
+-ifeq ($(shell LANG=C svn stat $(srcdir) 2>&1 | grep "is not a working copy"),)
+-SVNROOT := $(srcdir)
+-ifeq ($(origin SVNREV), undefined)
+-# Get the working copy base revision
+-VER_SVNREV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
+-endif
+-else
+-SVNROOT := https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/
+-endif
+-
+-# Define the Subversion revision if available, either autodetected or
+-# specified by the user
+-ifneq ($(origin VER_SVNREV), undefined)
+-CXXFLAGS+= -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
+-endif
+-
+-
+ ######################################################################
+ # Distribution settings
+ ######################################################################

games/scummvm/patches/patch-common_hashmap_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-common_hashmap_h,v 1.2 2007/07/07 01:37:53 jsg Exp $
---- common/hashmap.h.orig	Tue Jun 26 21:57:02 2007
-+++ common/hashmap.h	Tue Jun 26 21:57:37 2007
-@@ -88,10 +88,7 @@ template <class Key, class Val, class HashFunc = Hash<
+$OpenBSD: patch-common_hashmap_h,v 1.3 2010/07/13 21:23:39 jsg Exp $
+--- common/hashmap.h.orig	Mon Jan 25 02:39:44 2010
++++ common/hashmap.h	Mon Jul 12 21:58:22 2010
+@@ -68,10 +68,7 @@ template<class T> class IteratorImpl;
+ template<class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
  class HashMap {
- 	friend class const_iterator;
  private:
 -#if defined (PALMOS_MODE)
  public:

games/scummvm/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2008/10/19 10:23:09 jsg Exp $
---- configure.orig	Mon Sep 15 05:08:08 2008
-+++ configure	Mon Sep 15 05:07:48 2008
-@@ -1417,9 +1417,11 @@ fi
+$OpenBSD: patch-configure,v 1.5 2010/07/13 21:23:39 jsg Exp $
+--- configure.orig	Thu Apr  1 00:51:54 2010
++++ configure	Mon Jul 12 21:58:22 2010
+@@ -1949,9 +1949,11 @@ fi
  if test "$_flac" = yes ; then
  	_def_flac='#define USE_FLAC'
  	if test "$_vorbis" = yes ; then