[Gsrc-commit] /srv/bzr/gsrc/trunk r989: clean up dominion and fix build

[Brandon Invergo]

------------------------------------------------------------
revno: 989
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 12:05:13 +0100
message:
  clean up dominion and fix build
added:
  gnu/dominion/files/
  gnu/dominion/files/fix-build.diff
modified:
  gnu/dominion/Makefile
  gnu/dominion/sha256sums

=== modified file 'gnu/dominion/Makefile'
--- a/gnu/dominion/Makefile     2010-06-10 20:16:29 +0000
+++ b/gnu/dominion/Makefile     2012-10-28 11:05:13 +0000
@@ -1,16 +1,20 @@
 GARNAME = dominion
 GARVERSION = 2.8.2
+HOME_URL = http://www.gnu.org/software/dominion
+DESCRIPTION = Dominion world simulation game
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = dominion/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/dominion
-DESCRIPTION = Dominion world simulation game
+PATCHFILES = fix-build.diff
+
+BUILDDEPS = 
+LIBDEPS = ncurses
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

=== added directory 'gnu/dominion/files'
=== added file 'gnu/dominion/files/fix-build.diff'
--- a/gnu/dominion/files/fix-build.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/dominion/files/fix-build.diff 2012-10-28 11:05:13 +0000
@@ -0,0 +1,61 @@
+diff -x config.log -x config.status -ru work/dominion-2.8.2/misc.c 
work/dominion-2.8.2/misc.c
+--- work/dominion-2.8.2/misc.c 2005-02-02 04:12:29.000000000 +0000
++++ work/dominion-2.8.2/misc.c 2012-10-28 11:01:06.212705264 +0000
+@@ -26,7 +26,6 @@
+ /* int interrupt() - handles interupts                             */
+ /* show_nation(np) - displays a nation's characteristics           */
+ /* free_nation_mark(wp,c) - tell us if the symbol is available     */
+-/* getline(s,n) - read a line from stdin, remove \n                */
+ /* get_crypt_pass(prompt,s,w) - get password and encrypt           */
+ /* critical() - while writing, don't bug me!!                      */
+ /* noncritical() - normal operation                                */
+@@ -161,14 +160,6 @@
+   return 1;
+ }
+ 
+-void getline(char s[], int n) /* read a line from stdin, remove \n */
+-{
+-  fgets(s, n, stdin);
+-  if (s[strlen(s)-1] == '\n') {       /* remove \n if it is there */
+-    s[strlen(s)-1] = '\0';
+-  }
+-}
+-
+   /* get a password and encrypt it.  if the parameter "default"
+      has a string in it, use that instead of getting it from
+      the terminal.  if "w" is not NULL, get the string from
+diff -x config.log -x config.status -ru work/dominion-2.8.2/printmap.c 
work/dominion-2.8.2/printmap.c
+--- work/dominion-2.8.2/printmap.c     2005-02-02 05:03:29.000000000 +0000
++++ work/dominion-2.8.2/printmap.c     2012-10-28 11:01:25.626043559 +0000
+@@ -470,7 +470,7 @@
+ 
+   read_world(&world, WORLD_FILE);
+   fprintf(stderr, "Enter nation name: ");
+-  getline(nation, NAMELEN);
++  getline(nation, NAMELEN, stdin);
+   user.id = get_nation_id(nation);
+   get_crypt_pass("Your password: ", passwd, NULL, NULL);
+   if (strcmp(world.nations[user.id].passwd, passwd)) {
+diff -x config.log -x config.status -ru work/dominion-2.8.2/proto.h 
work/dominion-2.8.2/proto.h
+--- work/dominion-2.8.2/proto.h        1997-05-22 19:39:19.000000000 +0000
++++ work/dominion-2.8.2/proto.h        2012-10-28 11:01:34.622712510 +0000
+@@ -100,7 +100,6 @@
+ int get_n_civil(Snation *np);
+ int free_nation_mark(Sworld *wp, Symbol c);
+ int get_n_soldiers(Snation *np);
+-void getline(char s[], int n);
+ void get_crypt_pass(char prompt[], char pass[], WINDOW *w, char def_pass[]);
+ void cpass(Snation *np, char pass[]);
+ int which_mark(int x, int y, Suser *up);
+diff -x config.log -x config.status -ru work/dominion-2.8.2/user.c 
work/dominion-2.8.2/user.c
+--- work/dominion-2.8.2/user.c 2005-02-02 04:11:58.000000000 +0000
++++ work/dominion-2.8.2/user.c 2012-10-28 11:01:47.406049115 +0000
+@@ -61,7 +61,7 @@
+   if (!innation)
+     {
+       printf("which nation would you like to play? ");
+-      getline(nation, NAMELEN);
++      getline(nation, NAMELEN, stdin);
+     }
+   if ((user.id = get_nation_id(nation)) == -1) {
+     printf ("\r\nnation does not exist, sorry\r\n");

=== modified file 'gnu/dominion/sha256sums'
--- a/gnu/dominion/sha256sums   2010-06-11 09:39:08 +0000
+++ b/gnu/dominion/sha256sums   2012-10-28 11:05:13 +0000
@@ -1,2 +1,3 @@
 93ef0a44776b65b513a664e77b160349bd17917a364300913ab0d6e2d312aab8  
download/dominion-2.8.2.tar.gz
+9d6a07c4d5a547d27ced291031c7d80a3f56cee012bcbad26715d2ee44879471  
download/fix-build.diff
 dea78755d63c4417c523b6947aa9edf4a039fcce791b4cd40f34128a77a11caf  
download/dominion-2.8.2.tar.gz.sig