 @@ -1,14 +1,14 @@
-/*	$NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $
+/*	$NetBSD: aout2elf.c,v 1.18 2012/01/07 18:54:30 christos Exp $
+ *
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -277,31 +277,31 @@ domove:
 		abort_libupdate();
 	if (run_program(0, "mkdir -p %s ", concat_paths(prefix, "etc")))
 		abort_libupdate();
 	strlcpy(src, target_expand("/etc/ld.so.conf"), sizeof(src));
 	if (run_program(0, "mv -f %s %s",
 	    src, concat_paths(prefix, "etc/ld.so.conf")))
 		abort_libupdate();
 	strlcpy(src, target_expand("/usr/lib"), sizeof(src));
 	n = handle_aout_libs(src, LIB_MOVE, concat_paths(prefix, "usr/lib"));
 	if (run_program(0, "mkdir -p %s ",
-	    concat_paths(prefix, "usr/X11R6/lib")))
+	    concat_paths(prefix, "usr/X11R7/lib")))
 		abort_libupdate();
-	strlcpy(src, target_expand("/usr/X11R6/lib"), sizeof(src));
+	strlcpy(src, target_expand("/usr/X11R7/lib"), sizeof(src));
-	handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R6/lib"));
+	handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R7/lib"));
 	if (backedup) {
 		msg_display(MSG_emulbackup);
 		process_menu(MENU_ok, NULL);
+	}
 	return n;
+}
 /*
  * XXXX had to include this to deal with symlinks in some places.
  * When the target * disk is mounted under /targetroot, absolute symlinks
  * on it don't work right.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.de,v 1.57 2011/04/17 12:33:42 martin Exp $	*/
+/*	$NetBSD: msg.mi.de,v 1.58 2012/01/07 18:54:30 christos Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -667,37 +667,37 @@ werden. Der Vorgang wird abgebrochen.
 message noetcfstab
 {Hilfe! Die Datei /etc/fstab konnte im Ziellaufwerk %s nicht gefunden
 werden. Die Aktualisierung wird abgebrochen.
+}
 message badetcfstab
 {Hilfe! Es besteht eine fehlerhafte /etc/fstab im Ziellaufwerk %s. Die
 Aktualisierung wird abgebrochen.
+}
 message X_oldexists
-{Der alte X Server /usr/X11R6/bin/X kann nicht als /usr/X11R6/bin/X.old
+{Der alte X Server /usr/X11R7/bin/X kann nicht als /usr/X11R7/bin/X.old
 gesichert werden, da eine Datei mit diesem Namen bereits existiert.
 Bitte korrigieren Sie dies, bevor Sie fortfahren.
 Eine M�glichkeit ist es, im Extras-Men� eine Shell zu starten,
-wodurch Sie /usr/X11R6/bin/X.old �berpr�fen k�nnen. Geh�rt diese Datei zu
+wodurch Sie /usr/X11R7/bin/X.old �berpr�fen k�nnen. Geh�rt diese Datei zu
 einer fr�heren Aktualisierung, so k�nnen Sie diese mit rm -f
-/usr/X11R6/bin/x.old l�schen und danach die Aktualisierung neu starten.
+/usr/X11R7/bin/x.old l�schen und danach die Aktualisierung neu starten.
-Geh�rt die Datei /usr/X11R6/bin/X.old aber zu einer aktuellen,
+Geh�rt die Datei /usr/X11R7/bin/X.old aber zu einer aktuellen,
-abgebrochenen Aktualisierung, so k�nnen Sie die Datei /usr/X11R6/bin/X mit
+abgebrochenen Aktualisierung, so k�nnen Sie die Datei /usr/X11R7/bin/X mit
-mv /usr/X11R6/bin/X.old /usr/X11R6/bin/X wieder herstellen und die
+mv /usr/X11R7/bin/X.old /usr/X11R7/bin/X wieder herstellen und die
 unvollst�ndige Aktualisierung fortsetzen.
 Aktualisierung wird abgebrochen.}
 message netnotup
 {Beim Testen des Netzwerks ist ein Problem aufgetreten. Entweder Ihr
 Gateway oder Ihr Nameserver hat nicht auf "ping" reagiert. Wollen Sie Ihre
 Netzwerkkonfiguration �berarbeiten?
 ("Nein" erm�glicht Ihnen die Fortsetzung oder den Abbruch der Installation.)
+}
 message netnotup_continueanyway

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.en,v 1.165 2011/04/17 12:33:42 martin Exp $	*/
+/*	$NetBSD: msg.mi.en,v 1.166 2012/01/07 18:54:30 christos Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -639,36 +639,36 @@ message createfstab
 {There is a big problem!  Can not create /mnt/etc/fstab.  Bailing out!
+}
 message noetcfstab
 {Help! No /etc/fstab in target disk %s.  Aborting upgrade.
+}
 message badetcfstab
 {Help! Can't parse /etc/fstab in target disk %s.  Aborting upgrade.
+}
 message X_oldexists
-{I cannot save /usr/X11R6/bin/X as /usr/X11R6/bin/X.old, because the
+{I cannot save /usr/X11R7/bin/X as /usr/X11R7/bin/X.old, because the
-target disk already has an /usr/X11R6/bin/X.old. Please fix this before
+target disk already has an /usr/X11R7/bin/X.old. Please fix this before
 continuing.
 One way is to start a shell from the Utilities menu, examine the
-target /usr/X11R6/bin/X and /usr/X11R6/bin/X.old.  If
+target /usr/X11R7/bin/X and /usr/X11R7/bin/X.old.  If
-/usr/X11R6/bin/X.old is from a completed upgrade, you can rm -f
+/usr/X11R7/bin/X.old is from a completed upgrade, you can rm -f
-/usr/X11R6/bin/X.old and restart.  Or if /usr/X11R6/bin/X.old is from
+/usr/X11R7/bin/X.old and restart.  Or if /usr/X11R7/bin/X.old is from
-a recent, incomplete upgrade, you can rm -f /usr/X11R6/bin/X and mv
+a recent, incomplete upgrade, you can rm -f /usr/X11R7/bin/X and mv
-/usr/X11R6/bin/X.old to /usr/X11R6/bin/X.
+/usr/X11R7/bin/X.old to /usr/X11R7/bin/X.
 Aborting upgrade.}
 message netnotup
 {There was a problem in setting up the network.  Either your gateway
 or your nameserver was not reachable by a ping.  Do you want to
 configure your network again?  (No allows you to continue anyway
 or abort the install process.)
+}
 message netnotup_continueanyway
 {Would you like to continue the install process anyway, and assume
 that the network is working?  (No aborts the install process.)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.es,v 1.35 2011/04/17 12:33:42 martin Exp $	*/
+/*	$NetBSD: msg.mi.es,v 1.36 2012/01/07 18:54:30 christos Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -659,36 +659,36 @@ message createfstab
 message noetcfstab
 {�Ayuda!  No hay /etc/fstab del disco objetivo %s.
 Interrumpiendo la actualizaci�n.
+}
 message badetcfstab
 {�Ayuda!  No se puede analizar /etc/fstab en el disco objetivo %s.
 Interrumpiendo la actualizaci�n.
+}
 message X_oldexists
-{No se puede guardar /usr/X11R6/bin/X como /usr/X11R6/bin/X.old, porque el
+{No se puede guardar /usr/X11R7/bin/X como /usr/X11R7/bin/X.old, porque el
-disco objetivo ya tiene un /usr/X11R6/bin/X.old.  Por favor, arregle esto
+disco objetivo ya tiene un /usr/X11R7/bin/X.old.  Por favor, arregle esto
 antes de continuar.
 Una manera es iniciando una shell desde el men� Utilidades, y examinar
-el objetivo /usr/X11R6/bin/X y /usr/X11R6/bin/X.old.  Si
+el objetivo /usr/X11R7/bin/X y /usr/X11R7/bin/X.old.  Si
-/usr/X11R6/bin/X.old es de una actualizaci�n completada, puede rm -f
+/usr/X11R7/bin/X.old es de una actualizaci�n completada, puede rm -f
-/usr/X11R6/bin/X.old y reiniciar.  O si /usr/X11R6/bin/X.old es de
+/usr/X11R7/bin/X.old y reiniciar.  O si /usr/X11R7/bin/X.old es de
-una actualizacion reciente e incompleta, puede rm -f /usr/X11R6/bin/X
+una actualizacion reciente e incompleta, puede rm -f /usr/X11R7/bin/X
-y mv /usr/X11R6/bin/X.old a /usr/X11R6/bin/X.
+y mv /usr/X11R7/bin/X.old a /usr/X11R7/bin/X.
 Interrumpiendo la actualizaci�n.}
 message netnotup
 {Ha habido un problema configurando la red.  O su pasarela o su servidor
 de nombres no son alcanzables por un ping.  �Quiere configurar la red
 de nuevo?  (�No� le permite continuar de todos modos o interrumpir el
 proceso de instalaci�n.)
+}
 message netnotup_continueanyway
 {�Le gustar�a continuar el proceso de instalaci�n de todos modos, y
 suponer que la red est� funcionando?  (�No� interrumpe el proceso de

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.fr,v 1.115 2011/04/17 12:33:42 martin Exp $	*/
+/*	$NetBSD: msg.mi.fr,v 1.116 2012/01/07 18:54:31 christos Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -693,36 +693,36 @@ Ceci est une erreur majeure : nous ne po
 �chec de l'installation.
+}
 message badetcfstab
+{
 Impossible de lire le contenu du fichier /etc/fstab pr�sent sur
 le disque cible %s
 Ceci est une erreur majeure : nous ne pouvons continuer.
 �chec de l'installation.
+}
 message X_oldexists
+{
-Impossible de sauvegarder /usr/X11R6/bin/X : le disque contient d�j�
+Impossible de sauvegarder /usr/X11R7/bin/X : le disque contient d�j�
-un fichier /usr/X11R6/bin/X.old et nous devons renommer l'actuel fichier
+un fichier /usr/X11R7/bin/X.old et nous devons renommer l'actuel fichier
 avec ce nom. Veuillez supprimer ou renommer le fichier X.old avant de
 recommencer.
 Vous pouvez d�marrer un shell depuis le menu "Utilitaires" afin
 de faire cette modification.
 Ce fichier provient probablement d'une ancienne mise � jour et
 il est possible de le supprimer. S'il provient d'une mise � jour
-incompl�te, vous pouvez effacer /usr/X11R6/bin/X et renommer
+incompl�te, vous pouvez effacer /usr/X11R7/bin/X et renommer
-/usr/X11R6/bin/X.old en /usr/X11R6/bin/X.
+/usr/X11R7/bin/X.old en /usr/X11R7/bin/X.
 Arr�t de la mise � jour.
+}
 message netnotup
+{
 Un probl�me est survenu lors de la configuration de votre interface
 r�seau. Votre serveur de noms ou bien votre passerelle ne semblent pas
 r�pondre aux pings.
 Souhaitez-vous configurer � nouveau les param�tres de votre
 connexion r�seau ?
 (un refus provoquera l'arr�t de la proc�dure d'installation)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg.mi.pl,v 1.74 2011/04/17 12:33:42 martin Exp $	*/
+/*	$NetBSD: msg.mi.pl,v 1.75 2012/01/07 18:54:31 christos Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp       */
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -638,35 +638,35 @@ message createfstab
 {Pojawil sie powazny problem! Nie mozna utworzyc /mnt/etc/fstab. Spadamy!
+}
 message noetcfstab
 {Pomocy! Na dysku docelowym %s nie ma /etc/fstab. Przerywamy aktualizacje.
+}
 message badetcfstab
 {Pomocy! Nie moge przeczytac /etc/fstab na dysku %s. Przerywamy aktualizacje.
+}
 message X_oldexists
-{Nie moge zapisac /usr/X11R6/bin/X jako /usr/X11R6/bin/X.old, poniewaz
+{Nie moge zapisac /usr/X11R7/bin/X jako /usr/X11R7/bin/X.old, poniewaz
-na docelowym dysku jest juz /usr/X11R6/bin/X.old. Napraw to przed kontynuacja.
+na docelowym dysku jest juz /usr/X11R7/bin/X.old. Napraw to przed kontynuacja.
 Jedyny sposob to uruchomic powloke z menu Narzedziowego i sprawdzic
-docelowe /usr/X11R6/bin/X oraz /usr/X11R6/bin/X.old. Jesli
+docelowe /usr/X11R7/bin/X oraz /usr/X11R7/bin/X.old. Jesli
-/usr/X11R6/bin/X.old pochodzi z zakonczonej aktualizacji, mozesz usunac
+/usr/X11R7/bin/X.old pochodzi z zakonczonej aktualizacji, mozesz usunac
-/usr/X11R6/bin/X.old i zrobic restart. Albo jesli /usr/X11R6/bin/X.old
+/usr/X11R7/bin/X.old i zrobic restart. Albo jesli /usr/X11R7/bin/X.old
 pochodzi z aktualnej niekompletnej aktualizacji, mozesz usunac
-/usr/X11R6/bin/X i przeniesc /usr/X11R6/bin/X.old na /usr/X11R6/bin/X.
+/usr/X11R7/bin/X i przeniesc /usr/X11R7/bin/X.old na /usr/X11R7/bin/X.
 Przerywamy aktualizacje.}
 message netnotup
 {Pojawil sie problem z konfiguracja twojej sieci. Albo twoja bramka
 albo serwer nazw nie byl osiagalny przez ping. Czy chcesz skonfigurowac
 siec jeszcze raz? (Nie pozwala ci kontynuowac lub przerwac instalacje.)
+}
 message netnotup_continueanyway
 {Czy chcesz kontynuowac proces instalacji i zalozyc, ze twoja siec dziala?
 (Nie przerywa procesu instalacji.)
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: upgrade.c,v 1.51 2011/04/04 08:30:14 mbalmer Exp $	*/
+/*	$NetBSD: upgrade.c,v 1.52 2012/01/07 18:54:31 christos Exp $	*/
 /*
  * Copyright 1997 Piermont Information Systems Inc.
  * All rights reserved.
+ *
  * Written by Philip A. Nelson for Piermont Information Systems Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -102,57 +102,57 @@ do_upgrade(void)
 	merge_X();
 	sanity_check();
+}
 /*
  * Save X symlink to X.old so it can be recovered later
  */
 static int
 save_X(void)
+{
 	/* Only care for X if it's a symlink */
-	if (target_symlink_exists_p("/usr/X11R6/bin/X")) {
+	if (target_symlink_exists_p("/usr/X11R7/bin/X")) {
-		if (target_symlink_exists_p("/usr/X11R6/bin/X.old")) {
+		if (target_symlink_exists_p("/usr/X11R7/bin/X.old")) {
 			msg_display(MSG_X_oldexists);
 			process_menu(MENU_ok, NULL);
 			return EEXIST;
+		}
 #ifdef DEBUG
-		printf("saving /usr/X11R6/bin/X as .../X.old ...");
+		printf("saving /usr/X11R7/bin/X as .../X.old ...");
 #endif
 		/* Move target .../X to .../X.old.  Abort on error. */
-		mv_within_target_or_die("/usr/X11R6/bin/X",
+		mv_within_target_or_die("/usr/X11R7/bin/X",
-					"/usr/X11R6/bin/X.old");
+					"/usr/X11R7/bin/X.old");
+	}
 	return 0;
+}
 /*
  * Merge back saved target X files after unpacking the new
  * sets has completed.
  */
 static int
 merge_X(void)
+{
-	if (target_symlink_exists_p("/usr/X11R6/bin/X.old")) {
+	if (target_symlink_exists_p("/usr/X11R7/bin/X.old")) {
 		/* Only move back X if it's a symlink - we don't want
 		 * to restore old binaries */
-		mv_within_target_or_die("/usr/X11R6/bin/X.old",
+		mv_within_target_or_die("/usr/X11R7/bin/X.old",
-					"/usr/X11R6/bin/X");
+					"/usr/X11R7/bin/X");
+	}
 	return 0;
+}
 /*
  * Unpacks sets,  clobbering existing contents.
  */
 void
 do_reinstall_sets(void)
+{
 	unwind_mounts();