[Gsrc-commit] trunk r4553: update motti to 3.1.1

[Carl Hansen]

------------------------------------------------------------
revno: 4553
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sun 2017-06-25 16:07:29 -0700
message:
  update motti to 3.1.1
removed:
  pkg/gnu/motti/files/           files-20160617014725-uokjfnggs70iry9h-1413
  pkg/gnu/motti/files/GamePersistanceService.cpp.patch 
gamepersistanceservi-20170504074230-o7cei9d4gzfu0wlj-1
modified:
  pkg/gnu/motti/Makefile         makefile-20160617014725-uokjfnggs70iry9h-1409
  pkg/gnu/motti/sha256sums       sha256sums-20160617014725-uokjfnggs70iry9h-1415

=== modified file 'pkg/gnu/motti/Makefile'
--- a/pkg/gnu/motti/Makefile    2017-05-04 07:43:18 +0000
+++ b/pkg/gnu/motti/Makefile    2017-06-25 23:07:29 +0000
@@ -22,16 +22,16 @@
 # Note, this program compiles, but doesn't install correctly. It
 # puts binary in $(prefix)/bin/games/
 # This will be fixed when I figure it out. see address@hidden
+# run by: $(prefix)/bin/games/motti
 
 NAME = Motti
 GARNAME = motti
-GARVERSION = 3.1.0
+GARVERSION = 3.1.1
 HOME_URL = http://www.gnu.org/software/motti/
 DESCRIPTION = Multiplayer strategy game
 define BLURB
 GNU Motti is a simple multiplayer strategy game played in a terminal.
-The objective of the game is to conquer enemy capitals by occupying and
-encircling territory. Now works, with patch.
+The objective of the game is to conquer enemy capitals by occupying and 
encircling territory. 
 endef
 
 ######################################################################
@@ -39,8 +39,7 @@
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-SIGFILES = $(DISTNAME).tar.gz.sig
-PATCHFILES = GamePersistanceService.cpp.patch
+SIGFILES  = $(DISTNAME).tar.gz.sig
 
 BUILDDEPS =
 LIBDEPS =

=== removed directory 'pkg/gnu/motti/files'
=== removed file 'pkg/gnu/motti/files/GamePersistanceService.cpp.patch'
--- a/pkg/gnu/motti/files/GamePersistanceService.cpp.patch      2017-05-04 
07:43:18 +0000
+++ b/pkg/gnu/motti/files/GamePersistanceService.cpp.patch      1970-01-01 
00:00:00 +0000
@@ -1,67 +0,0 @@
-*** work/motti-3.1.0/otti/GamePersistanceService.cpp   2014-03-28 
13:22:07.000000000 -0700
---- worknew/motti-3.1.0/otti/GamePersistanceService.cpp        2017-05-03 
23:24:00.783511716 -0700
-***************
-*** 155,161 ****
-  std::string ListGames::internalDispatch(std::string msg,std::string session){
-    std::vector<std::string> list=GamePersistanceService::loads();
-    std::stringstream ss;
-!   ss<"[";
-    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
-    {
-      std::cout<<*it<<std::endl;
---- 155,161 ----
-  std::string ListGames::internalDispatch(std::string msg,std::string session){
-    std::vector<std::string> list=GamePersistanceService::loads();
-    std::stringstream ss;
-!   ss<<"[";
-    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
-    {
-      std::cout<<*it<<std::endl;
-***************
-*** 163,169 ****
-        ss<<",";
-      ss<<*it;
-    }
-!   ss<"]";
-    return ss.str();
-  }
-  
---- 163,169 ----
-        ss<<",";
-      ss<<*it;
-    }
-!   ss<<"]";
-    return ss.str();
-  }
-  
-***************
-*** 171,184 ****
-    std::string user=SessionService::retrieveUserFromSession(session);
-    std::vector<std::string> list=GamePersistanceService::loads(user);
-    std::stringstream ss;
-!   ss<"[";
-    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
-    {
-      if (it!=list.begin())
-        ss<<",";
-      ss<<*it;
-    }
-!   ss<"]";
-    return ss.str();
-  }
-  
---- 171,184 ----
-    std::string user=SessionService::retrieveUserFromSession(session);
-    std::vector<std::string> list=GamePersistanceService::loads(user);
-    std::stringstream ss;
-!   ss<<"[";
-    for (std::vector<std::string>::iterator 
it=list.begin();it!=list.end();it++)
-    {
-      if (it!=list.begin())
-        ss<<",";
-      ss<<*it;
-    }
-!   ss<<"]";
-    return ss.str();
-  }
-  

=== modified file 'pkg/gnu/motti/sha256sums'
--- a/pkg/gnu/motti/sha256sums  2017-05-04 07:43:18 +0000
+++ b/pkg/gnu/motti/sha256sums  2017-06-25 23:07:29 +0000
@@ -1,3 +1,2 @@
-ced690665c05711b60dc8fc0841d12eae5da9104a16f32ef0f83cf30335fb09b  
download/motti-3.1.0.tar.gz
-46af16a00d84257659e7f388f4f9ad8bb935a1bb5c6cce766d9df3e72d87819d  
download/GamePersistanceService.cpp.patch
-79075c82f343040e1a65fa97232839bd96935f773a750a34dc7b35935b8e2481  
download/motti-3.1.0.tar.gz.sig
+632d9a84d3b2e3eee4c9d9199d66d42576516ea6c291058c01830ae2fb7de429  
download/motti-3.1.1.tar.gz
+25d06a351b779ddaf95683310b2b2ed83549675874c24be370bee23f68943ec2  
download/motti-3.1.1.tar.gz.sig