Index: server/civserver.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/civserver.c,v
retrieving revision 1.208
diff -u -r1.208 civserver.c
--- server/civserver.c	2002/03/02 20:37:17	1.208
+++ server/civserver.c	2002/05/16 10:54:54
@@ -99,9 +99,9 @@
 	showhelp = TRUE;
 	break;
       }
-    } else if ((option = get_option("--server", argv, &inx, argc)))
-      sz_strlcpy(srvarg.metaserver_servername, option);
-    else if ((option = get_option("--debug", argv, &inx, argc))) {
+    } else if ((option = get_option("--extrametainfo", argv, &inx, argc))) {
+      sz_strlcpy(srvarg.extra_metaserver_info, option);
+    } else if ((option = get_option("--debug", argv, &inx, argc))) {
       srvarg.loglevel = log_parse_level_str(option);
       if (srvarg.loglevel == -1) {
 	srvarg.loglevel = LOG_NORMAL;
@@ -128,22 +128,23 @@
 
   if (showhelp) {
     fprintf(stderr, _("Usage: %s [option ...]\nValid options are:\n"), argv[0]);
-    fprintf(stderr, _("  -h, --help\t\tPrint a summary of the options\n"));
-    fprintf(stderr, _("  -r, --read FILE\tRead startup script FILE\n"));
-    fprintf(stderr, _("  -f, --file FILE\tLoad saved game FILE\n"));
-    fprintf(stderr, _("  -p, --port PORT\tListen for clients on port PORT\n"));
-    fprintf(stderr, _("  -g, --gamelog FILE\tUse FILE as game logfile\n"));
-    fprintf(stderr, _("  -l, --log FILE\tUse FILE as logfile\n"));
-    fprintf(stderr, _("  -m, --meta\t\tSend info to metaserver\n"));
-    fprintf(stderr, _("  -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"));
-    fprintf(stderr, _("  -s, --server HOST\tList this server as host HOST\n"));
-    fprintf(stderr, _("  -q, --quitidle TIME\tQuit if no players for TIME seconds\n"));
 #ifdef DEBUG
     fprintf(stderr, _("  -d, --debug NUM\tSet debug log level (0 to 4,"
 		      " or 4:file1,min,max:...)\n"));
 #else
     fprintf(stderr, _("  -d, --debug NUM\tSet debug log level (0 to 3)\n"));
 #endif
+    fprintf(stderr, _("  -e, --extrainfo INFO\tExtra info for the metaserver\n"));
+    fprintf(stderr, _("  -f, --file FILE\tLoad saved game FILE\n"));
+    fprintf(stderr, _("  -g, --gamelog FILE\tUse FILE as game logfile\n"));
+    fprintf(stderr, _("  -h, --help\t\tPrint a summary of the options\n"));
+    fprintf(stderr, _("  -l, --log FILE\tUse FILE as logfile\n"));
+    fprintf(stderr, _("  -m, --meta\t\tSend info to metaserver\n"));
+    fprintf(stderr, _("  -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"));
+
+    fprintf(stderr, _("  -p, --port PORT\tListen for clients on port PORT\n"));
+    fprintf(stderr, _("  -q, --quitidle TIME\tQuit if no players for TIME seconds\n"));
+    fprintf(stderr, _("  -r, --read FILE\tRead startup script FILE\n"));
     fprintf(stderr, _("  -v, --version\t\tPrint the version number\n"));
     fprintf(stderr, _("Report bugs to <%s>.\n"), BUG_EMAIL_ADDRESS);
     exit(EXIT_SUCCESS);
Index: server/meta.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/meta.c,v
retrieving revision 1.51
diff -u -r1.51 meta.c
--- server/meta.c	2002/03/05 15:46:26	1.51
+++ server/meta.c	2002/05/16 10:54:54
@@ -310,10 +310,11 @@
     cat_snprintf(desc, sizeof(desc), N_("Waiting"));
   }
   cat_snprintf(desc, sizeof(desc), "\n");
-  cat_snprintf(desc, sizeof(desc), "%s\n", srvarg.metaserver_servername);
+  cat_snprintf(desc, sizeof(desc), "%s\n", "UNSET");
   cat_snprintf(desc, sizeof(desc), "%d\n", srvarg.port);
   cat_snprintf(desc, sizeof(desc), "%d\n", num_nonbarbarians);
-  cat_snprintf(desc, sizeof(desc), "%s", srvarg.metaserver_info_line);
+  cat_snprintf(desc, sizeof(desc), "%s %s", srvarg.metaserver_info_line,
+	       srvarg.extra_metaserver_info);
 
   /* now build the info block */
   info[0]='\0';
Index: server/srv_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.c,v
retrieving revision 1.79
diff -u -r1.79 srv_main.c
--- server/srv_main.c	2002/04/25 14:09:38	1.79
+++ server/srv_main.c	2002/05/16 10:54:55
@@ -173,7 +173,7 @@
 
   srvarg.quitidle = 0;
 
-  *(srvarg.metaserver_servername) = '\0';
+  srvarg.extra_metaserver_info[0] = '\0';
 
   /* mark as initialized */
   has_been_srv_init = TRUE;
Index: server/srv_main.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/srv_main.h,v
retrieving revision 1.9
diff -u -r1.9 srv_main.h
--- server/srv_main.h	2002/02/27 10:33:10	1.9
+++ server/srv_main.h	2002/05/16 10:54:55
@@ -34,8 +34,8 @@
   char *gamelog_filename;
   char *load_filename;
   char *script_filename;
-  /* server name for metaserver to use for us */
-  char metaserver_servername[64];
+  /* extra info for the metaserver */
+  char extra_metaserver_info[256];
   /* quit if there no players after a given time interval */
   int quitidle;
 };