asc: Update to 2.6.1.0

Unknown changes

9 files changed, 15 insertions, 119 deletions

diff --git a/games/asc/patches/patch-configure b/games/asc/patches/patch-configure
new file mode 100644
index 00000000000..61ab13c092d
--- /dev/null
+++ b/games/asc/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2019/10/28 12:38:35 nia Exp $
+
+Shell portability.
+
+--- configure.orig	2015-12-06 14:12:04.000000000 +0000
++++ configure
+@@ -22981,7 +22981,7 @@ fi
+ 
+ 
+ 
+-if test "x$missingmusic" == xx ; then
++if test "x$missingmusic" = xx ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
+ The music files could not be found. These are not distributed together with the
+ source code because of their size.
diff --git a/games/asc/patches/patch-source_ASCStringHelpers.h b/games/asc/patches/patch-source_ASCStringHelpers.h
deleted file mode 100644
index 457cd1c18c1..00000000000
--- a/games/asc/patches/patch-source_ASCStringHelpers.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-source_ASCStringHelpers.h,v 1.2 2011/12/03 20:17:47 cheusov Exp $
-
---- source/ASCStringHelpers.h.orig	2005-08-17 19:08:19.000000000 +0000
-+++ source/ASCStringHelpers.h
-@@ -4,11 +4,13 @@
- #include <cassert>
- #include <cstdarg>
- #include <cstdio>
-+#include <cstdlib>
- #include <memory>
- #include <string>
- #include <wchar.h>
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- using std::auto_ptr;
- using std::string;
diff --git a/games/asc/patches/patch-source_Property.cpp b/games/asc/patches/patch-source_Property.cpp
deleted file mode 100644
index 8135213ad72..00000000000
--- a/games/asc/patches/patch-source_Property.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-source_Property.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $
-
---- source/Property.cpp.orig	2011-11-23 16:22:56.000000000 +0000
-+++ source/Property.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "Property.h"
- 
- TextProperty::TextProperty()
diff --git a/games/asc/patches/patch-source_errors.h b/games/asc/patches/patch-source_errors.h
deleted file mode 100644
index 87117a86b2c..00000000000
--- a/games/asc/patches/patch-source_errors.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-source_errors.h,v 1.1 2012/07/03 18:46:16 joerg Exp $
-
---- source/errors.h.orig	2006-05-13 13:05:00.000000000 +0000
-+++ source/errors.h
-@@ -73,7 +73,7 @@
-         AssertionException ( const ASCString& check, const ASCString& file, int line ) : ASCmsgException ( ASCString("Assertion failed: ") + check + " at " + file + ":" + ASCString::toString(line)  ) {};
-   };
- 
--#define assertOrThrow(expr)  (static_cast<void> ( (expr) ? 0 : (throw AssertionException (#expr, __FILE__, __LINE__))))
-+#define assertOrThrow(expr)  do { if (expr) {} else throw AssertionException (#expr, __FILE__, __LINE__); } while (0)
-   
-   
- 
diff --git a/games/asc/patches/patch-source_gui.cpp b/games/asc/patches/patch-source_gui.cpp
deleted file mode 100644
index 19915cace38..00000000000
--- a/games/asc/patches/patch-source_gui.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-source_gui.cpp,v 1.1 2012/07/03 18:46:16 joerg Exp $
-
---- source/gui.cpp.orig	2012-07-03 10:55:47.000000000 +0000
-+++ source/gui.cpp
-@@ -153,16 +153,6 @@ void   GuiHost<T>::returncoordinates ( v
-    }
- }
- 
--template<class T> 
--void   GuiHost<T>::chainiconstohost ( T icn )
--{
--   if ( icn ) {
--      setfirsticon( (T) icn->frst() );
--      getfirsticon()->sethost ( this );
--   }
--}
--
--
- template<class T>
- void   GuiHost<T>::savebackground ( void )
- {
diff --git a/games/asc/patches/patch-source_gui.h b/games/asc/patches/patch-source_gui.h
deleted file mode 100644
index 95ea7b786f6..00000000000
--- a/games/asc/patches/patch-source_gui.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-source_gui.h,v 1.1 2012/07/03 18:46:16 joerg Exp $
-
---- source/gui.h.orig	2012-07-03 10:55:50.000000000 +0000
-+++ source/gui.h
-@@ -221,7 +221,12 @@ class GuiHost : public BasicGuiHost {
-         void   savebackground ( void );
-         virtual int    painticons ( void );
-         virtual void   paintsmallicons ( int taste, int up );
--        void   chainiconstohost ( T icn );
-+        void   chainiconstohost ( T icn ) {
-+          if ( icn ) {
-+             setfirsticon( (T) icn->frst() );
-+             getfirsticon()->sethost ( this );
-+          }
-+        }
-         void   runpressedmouse ( int taste );
-         void   cleanup ( void ) ;    // wird zum entfernen der kleinen guiicons aufgerufen, bevor das icon ausgef�hrt wird
-         virtual void   restorebackground ( void );
diff --git a/games/asc/patches/patch-source_password.cpp b/games/asc/patches/patch-source_password.cpp
deleted file mode 100644
index 9a1d22992f2..00000000000
--- a/games/asc/patches/patch-source_password.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-source_password.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $
-
---- source/password.cpp.orig	2011-11-23 16:24:05.000000000 +0000
-+++ source/password.cpp
-@@ -20,6 +20,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <stdlib.h>
- #include "password.h"
- #include "misc.h"
- 
diff --git a/games/asc/patches/patch-source_strtmesg.cpp b/games/asc/patches/patch-source_strtmesg.cpp
deleted file mode 100644
index 6c37abc6035..00000000000
--- a/games/asc/patches/patch-source_strtmesg.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-source_strtmesg.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $
-
---- source/strtmesg.cpp.orig	2011-11-23 16:19:17.000000000 +0000
-+++ source/strtmesg.cpp
-@@ -25,6 +25,8 @@
- const char* asc_release="ASC1.16.4.0";
- 
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
- #include "strtmesg.h"
- #include "stringtokenizer.h"
- #include "misc.h"
diff --git a/games/asc/patches/patch-source_tools_lib_errorout.cpp b/games/asc/patches/patch-source_tools_lib_errorout.cpp
deleted file mode 100644
index 7c1187fe6e8..00000000000
--- a/games/asc/patches/patch-source_tools_lib_errorout.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-source_tools_lib_errorout.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $
-
---- source/tools/lib/errorout.cpp.orig	2011-11-23 16:28:24.000000000 +0000
-+++ source/tools/lib/errorout.cpp
-@@ -10,6 +10,7 @@
- #include <iostream>
- #include <cstdio>
- #include <cstdarg>
-+#include <cstdlib>
- 
- #ifdef _WIN32_
- # include <windows.h>