svn commit: r346454 - branches/2014Q1/games/seahaven/files

[Warner Losh]

Author: imp
Date: Fri Feb 28 08:15:51 2014
New Revision: 346454
URL: http://svnweb.freebsd.org/changeset/ports/346454
QAT: https://qat.redports.org/buildarchive/r346454/

Log:
  MFH: r346232
  
  Tighten up C++ to work with clang.
  
  Approved by: portmgr (bapt)

Added:
  branches/2014Q1/games/seahaven/files/patch-auto-C
     - copied unchanged from r346232, head/games/seahaven/files/patch-auto-C
  branches/2014Q1/games/seahaven/files/patch-main-C
     - copied unchanged from r346232, head/games/seahaven/files/patch-main-C
  branches/2014Q1/games/seahaven/files/patch-seahaven-h
     - copied unchanged from r346232, head/games/seahaven/files/patch-seahaven-h
Modified:
Directory Properties:
  branches/2014Q1/   (props changed)

Copied: branches/2014Q1/games/seahaven/files/patch-auto-C (from r346232, head/games/seahaven/files/patch-auto-C)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/seahaven/files/patch-auto-C	Fri Feb 28 08:15:51 2014	(r346454, copy of r346232, head/games/seahaven/files/patch-auto-C)
@@ -0,0 +1,18 @@
+diff -ru work/seahaven-1.60/auto.C work.new/seahaven-1.60/auto.C
+--- auto.C	2011-07-10 00:23:59.000000000 -0600
++++ auto.C	2014-02-25 15:10:30.000000000 -0700
+@@ -486,12 +486,10 @@
+ 
+ class MoveCard : public Move {
+     Card& from;
+-    MoveCardToMemberFunction mcmf;
+   public:
+-    MoveCard(Card& f, Dest& d, MoveCardToMemberFunction mf)
+-	: Move(d), from(f), mcmf(mf) { }
++    MoveCard(Card& f, Dest& d)
++	: Move(d), from(f) { }
+     void DoIt() { dest.MoveTo(from); }
+-//  void DoIt() { dest.*mcmf(from); }
+ };
+ 
+ class MoveCardRange : public Move {

Copied: branches/2014Q1/games/seahaven/files/patch-main-C (from r346232, head/games/seahaven/files/patch-main-C)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/seahaven/files/patch-main-C	Fri Feb 28 08:15:51 2014	(r346454, copy of r346232, head/games/seahaven/files/patch-main-C)
@@ -0,0 +1,11 @@
+diff -ru work/seahaven-1.60/main.C work.new/seahaven-1.60/main.C
+--- main.C	2011-07-10 19:35:12.000000000 -0600
++++ main.C	2014-02-25 15:07:08.000000000 -0700
+@@ -31,6 +31,7 @@
+     exit(0);
+ }
+ 
++int
+ main(int argc, char **argv) {
+     const char *displayname = NULL;
+     const char *name = NULL;

Copied: branches/2014Q1/games/seahaven/files/patch-seahaven-h (from r346232, head/games/seahaven/files/patch-seahaven-h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/games/seahaven/files/patch-seahaven-h	Fri Feb 28 08:15:51 2014	(r346454, copy of r346232, head/games/seahaven/files/patch-seahaven-h)
@@ -0,0 +1,12 @@
+diff -ru work/seahaven-1.60/seahaven.h work.new/seahaven-1.60/seahaven.h
+--- seahaven.h	2011-07-10 18:42:44.000000000 -0600
++++ seahaven.h	2014-02-25 15:07:22.000000000 -0700
+@@ -117,7 +117,7 @@
+     const char *message;
+ };
+ 
+-typedef struct ScoreRec *Score;
++typedef class ScoreRec *Score;
+ 
+ class UndoListRec {
+   public: