Honour buildlink. Request C++11 with clang. Fix C++ usage.

5 files changed, 55 insertions, 2 deletions

diff --git a/games/pingus/patches/patch-aa b/games/pingus/patches/patch-aa
index a3bef4eea4d..35224c0f8aa 100644
--- a/games/pingus/patches/patch-aa
+++ b/games/pingus/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2011/01/20 23:41:02 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2012/11/23 12:35:01 joerg Exp $
 
 NetBSD config & path fixes
 
@@ -48,13 +48,14 @@ NetBSD config & path fixes
  
      if config.CheckMyProgram('sdl-config'):
         env.ParseConfig('sdl-config  --cflags --libs')
-@@ -539,7 +545,8 @@
+@@ -539,7 +545,9 @@
      Help(opts.GenerateHelpText(env))
  
      opts.Update(env)
 -    env['CPPPATH'] += ['.', 'src/']
 +    env['CPPPATH'] += ['.', 'src/', 'BUILDLINK_DIR/include']
 +    env['LIBPATH'] += ['BUILDLINK_DIR/lib', '/usr/lib/i18n']
++    env['ENV']['PATH'] = os.environ['PATH']
      Default(env.Program('pingus', pingus_sources + env['optional_sources']))
      Clean('pingus', ['config.py', 'config.h'])
  
diff --git a/games/pingus/patches/patch-src_font.cpp b/games/pingus/patches/patch-src_font.cpp
new file mode 100644
index 00000000000..e68172d51af
--- /dev/null
+++ b/games/pingus/patches/patch-src_font.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_font.cpp,v 1.1 2012/11/23 12:35:01 joerg Exp $
+
+--- src/font.cpp.orig	2012-11-22 20:41:19.000000000 +0000
++++ src/font.cpp
+@@ -198,7 +198,7 @@ public:
+             SDL_Rect& srcrect = chrs[static_cast<unsigned char>(text[i])];
+             if (srcrect.w != 0 && srcrect.h != 0)
+               {
+-		SDL_Rect dstrect = { int(dstx), int(dsty), 0, 0 };
++		SDL_Rect dstrect = { static_cast<Sint16>(dstx), static_cast<Sint16>(dsty), 0, 0 };
+                 SDL_BlitSurface(surface, &srcrect, target, &dstrect);
+                 dstx += srcrect.w + char_spacing;
+               }
diff --git a/games/pingus/patches/patch-src_lisp_getters.hpp b/games/pingus/patches/patch-src_lisp_getters.hpp
new file mode 100644
index 00000000000..d298758c5f7
--- /dev/null
+++ b/games/pingus/patches/patch-src_lisp_getters.hpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_lisp_getters.hpp,v 1.1 2012/11/23 12:35:01 joerg Exp $
+
+--- src/lisp/getters.hpp.orig	2012-11-22 20:43:25.000000000 +0000
++++ src/lisp/getters.hpp
+@@ -30,7 +30,7 @@ static inline bool property_get(const Li
+   if(lisp->get_list_size() != 2)
+     return false;
+   
+-  const Lisp* el = lisp->get_list_elem(1);
++  const Lisp* el = lisp->get_list_elem(1).get();
+   return get(el, val);
+ }
+ 
diff --git a/games/pingus/patches/patch-src_pingus__main.cpp b/games/pingus/patches/patch-src_pingus__main.cpp
new file mode 100644
index 00000000000..bc843695882
--- /dev/null
+++ b/games/pingus/patches/patch-src_pingus__main.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_pingus__main.cpp,v 1.1 2012/11/23 12:35:01 joerg Exp $
+
+--- src/pingus_main.cpp.orig	2012-11-22 20:46:56.000000000 +0000
++++ src/pingus_main.cpp
+@@ -626,7 +626,7 @@ PingusMain::init_path_finder()
+ void
+ PingusMain::print_greeting_message()
+ {
+-  std::string greeting = "Welcome to Pingus "VERSION;
++  std::string greeting = "Welcome to Pingus " VERSION;
+   greeting += "!";
+   std::cout <<  greeting << std::endl;
+   for (unsigned int i = 0; i < greeting.length(); ++i)
diff --git a/games/pingus/patches/patch-src_pingus__menu.cpp b/games/pingus/patches/patch-src_pingus__menu.cpp
new file mode 100644
index 00000000000..20fad955fcd
--- /dev/null
+++ b/games/pingus/patches/patch-src_pingus__menu.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_pingus__menu.cpp,v 1.1 2012/11/23 12:35:01 joerg Exp $
+
+--- src/pingus_menu.cpp.orig	2012-11-22 20:47:42.000000000 +0000
++++ src/pingus_menu.cpp
+@@ -234,7 +234,7 @@ PingusMenu::draw_foreground(DrawingConte
+ 
+   gc.print_left(Fonts::pingus_small, 25, 
+                 Display::get_height()-130,
+-                "Pingus "VERSION", Copyright (C) 1998-2007 Ingo Ruhnke <grumbel@gmx.de>\n"
++                "Pingus " VERSION ", Copyright (C) 1998-2007 Ingo Ruhnke <grumbel@gmx.de>\n"
+                 "See the file AUTHORS for a complete list of contributors.\n");
+   gc.print_left(Fonts::pingus_small, 25, 
+                 Display::get_height()-80,