Date: Sat, 2 Nov 2013 14:18:59 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332486 - head/games/adonthell/files Message-ID: <201311021418.rA2EIxVi003420@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Nov 2 14:18:58 2013 New Revision: 332486 URL: http://svnweb.freebsd.org/changeset/ports/332486 Log: games/adonthell: Fix C++ to build on gcc 4.6+ and clang The makefile was also patched because it was programmed to exit 100% of the time. Taken from: Debian Approved by: portmgr (bapt, implicit) Added: head/games/adonthell/files/patch-src_Makefile.in (contents, props changed) head/games/adonthell/files/patch-src_label.cc (contents, props changed) head/games/adonthell/files/patch-src_label.h (contents, props changed) head/games/adonthell/files/patch-src_win__event.cc (contents, props changed) Added: head/games/adonthell/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/adonthell/files/patch-src_Makefile.in Sat Nov 2 14:18:58 2013 (r332486) @@ -0,0 +1,17 @@ +--- src/Makefile.in.orig 2008-05-29 19:00:50.000000000 +0000 ++++ src/Makefile.in +@@ -769,13 +769,12 @@ uninstall-am: uninstall-binPROGRAMS + + # Note: adonthell.py is also built by this target. + py_adonthell_wrap.cc : py_adonthell.i $(headers) +- @if test "${P_SWIG}"; then \ ++ @if [ "${P_SWIG}" != "no" ]; then \ + echo ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \ + ${P_SWIG} -python -modern -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(top_srcdir) -c++ -makedefault -o $(srcdir)/$*.cc $(srcdir)/py_adonthell.i; \ + mv $(srcdir)/adonthell.py modules/adonthell.py; \ + else \ + echo "You need swig >= ${SWIG_MINVER} in order to re-build this file."; \ +- exit 1; \ + fi; + + lex.prefs.cc : prefs.l Added: head/games/adonthell/files/patch-src_label.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/adonthell/files/patch-src_label.cc Sat Nov 2 14:18:58 2013 (r332486) @@ -0,0 +1,11 @@ +--- src/label.cc.orig 2008-05-29 18:42:50.000000000 +0000 ++++ src/label.cc +@@ -645,7 +645,7 @@ void label::cursor_previous () + } + + +-const string label::text_string () const ++const string & label::text_string () const + { + return my_text_; + } Added: head/games/adonthell/files/patch-src_label.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/adonthell/files/patch-src_label.h Sat Nov 2 14:18:58 2013 (r332486) @@ -0,0 +1,11 @@ +--- src/label.h.orig 2005-04-16 17:56:32.000000000 +0000 ++++ src/label.h +@@ -90,7 +90,7 @@ public : + /** + Get the text in string + */ +- const string text_string () const; ++ const string & text_string () const; + + + /** Added: head/games/adonthell/files/patch-src_win__event.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/adonthell/files/patch-src_win__event.cc Sat Nov 2 14:18:58 2013 (r332486) @@ -0,0 +1,11 @@ +--- src/win_event.cc.orig 2002-12-16 19:09:54.000000000 +0000 ++++ src/win_event.cc +@@ -35,7 +35,7 @@ void win_event::py_signal_connect (PyObj + case DESTROY: + { + set_callback_destroy ( +- makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret)); ++ makeFunctor (new Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret)); + break; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311021418.rA2EIxVi003420>