[Midnightbsd-cvs] src: usr.sbin/sysinstall: remove pc98

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 2 01:29:07 EDT 2008


Log Message:
-----------
remove pc98

Modified Files:
--------------
    src/usr.sbin/sysinstall:
        Makefile (r1.1.1.1 -> r1.2)
        disks.c (r1.2 -> r1.3)
        ftp.c (r1.2 -> r1.3)
        menus.c (r1.9 -> r1.10)

-------------- next part --------------
Index: menus.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/menus.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -L usr.sbin/sysinstall/menus.c -L usr.sbin/sysinstall/menus.c -u -r1.9 -r1.10
--- usr.sbin/sysinstall/menus.c
+++ usr.sbin/sysinstall/menus.c
@@ -1422,23 +1422,6 @@
       { NULL } },
 };
 
-#ifdef PC98
-DMenu MenuSysconsKeymap = {
-    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
-    "System Console Keymap",
-    "The default system console driver for MidnightBSD (syscons) defaults\n"
-    "to a standard \"PC-98x1\" keyboard map.  Users may wish to choose\n"
-    "one of the other keymaps below.\n"
-    "Note that sysinstall itself only uses the part of the keyboard map\n"
-    "which is required to generate the ANSI character subset, but your\n"
-    "choice of keymap will also be saved for later (fuller) use.",
-    "Choose a keyboard map",
-    NULL,
-    { { "Japanese PC-98x1",		"Japanese PC-98x1 keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98" },
-      { " Japanese PC-98x1 (ISO)",	"Japanese PC-98x1 (ISO) keymap",  dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=jp.pc98.iso" },
-      { NULL } },
-};
-#else
 DMenu MenuSysconsKeymap = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "System Console Keymap",
@@ -1512,7 +1495,6 @@
       { " USA UNIX",	"US traditional UNIX-workstation",	dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.unix" },
       { NULL } },
 };
-#endif /* PC98 */
 
 DMenu MenuSysconsKeyrate = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
Index: disks.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/disks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.sbin/sysinstall/disks.c -L usr.sbin/sysinstall/disks.c -u -r1.2 -r1.3
--- usr.sbin/sysinstall/disks.c
+++ usr.sbin/sysinstall/disks.c
@@ -470,11 +470,7 @@
 			else if (subtype == SUBTYPE_EFI)
 			    partitiontype = efi;
 			else
-#ifdef PC98
-			    partitiontype = pc98;
-#else
 			    partitiontype = mbr;
-#endif
 			Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype,
 				     (chunk_info[current_chunk]->flags & CHUNK_ALIGN), name);
 			variable_set2(DISK_PARTITIONED, "yes", 0);
@@ -518,11 +514,7 @@
 		    else if (subtype == SUBTYPE_EFI)
 			partitiontype = efi;
 		    else
-#ifdef PC98
-			partitiontype = pc98;
-#else
 			partitiontype = mbr;
-#endif
 		    chunk_info[current_chunk]->type = partitiontype;
 		    chunk_info[current_chunk]->subtype = subtype;
 		}
Index: ftp.c
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/ftp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.sbin/sysinstall/ftp.c -L usr.sbin/sysinstall/ftp.c -u -r1.2 -r1.3
--- usr.sbin/sysinstall/ftp.c
+++ usr.sbin/sysinstall/ftp.c
@@ -50,15 +50,9 @@
 int FtpPort;
 
 /* List of sub directories to look for under a given FTP server. */
-#ifdef PC98
-const char *ftp_dirs[] = { ".", "releases/pc98", "snapshots/pc98",
-    "pub/MidnightBSD", "pub/MidnightBSD/releases/pc98",
-    "pub/MidnightBSD/snapshots/pc98", NULL };
-#else
 const char *ftp_dirs[] = { ".", "releases/"MACHINE, "snapshots/"MACHINE,
     "pub/MidnightBSD", "pub/MidnightBSD/releases/"MACHINE,
     "pub/MidnightBSD/snapshots/"MACHINE, NULL };
-#endif
 
 /* Brings up attached network device, if any - takes FTP device as arg */
 static Boolean
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.sbin/sysinstall/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L usr.sbin/sysinstall/Makefile -L usr.sbin/sysinstall/Makefile -u -r1.1.1.1 -r1.2
--- usr.sbin/sysinstall/Makefile
+++ usr.sbin/sysinstall/Makefile
@@ -15,9 +15,6 @@
 	variable.c ${_wizard} keymap.h
 
 CFLAGS+= -DUSE_GZIP=1
-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
 CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
 
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
@@ -70,9 +67,6 @@
 rtermcap:	rtermcap.c
 	${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap
 
-.if ${MACHINE} == "pc98"
-KEYMAPS= jp.pc98 jp.pc98.iso
-.else
 KEYMAPS= be.iso bg.bds.ctrlcaps bg.phonetic.ctrlcaps br275.iso \
 	ce.iso2 cs.latin2.qwertz danish.iso el.iso07 \
 	estonian.cp850 estonian.iso estonian.iso15 finnish.iso fr.iso \
@@ -82,7 +76,6 @@
 	swissfrench.iso \
 	swissgerman.iso ua.koi8-u ua.koi8-u.shift.alt uk.iso us.dvorak \
 	us.iso us.pc-ctrl us.unix
-.endif
 
 keymap.h:
 	rm -f keymap.tmp


More information about the Midnightbsd-cvs mailing list