6 files changed, 6 insertions, 8 deletions

diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 9b786df787c40..347293080ebcb 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -332,7 +332,7 @@ whichMouse(dialogMenuItem *self)
     
     if (!file_readable("/dev/mouse"))
 	return FALSE;
-    if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
+    if (readlink("/dev/mouse", buf, sizeof buf) == -1)
 	return FALSE;
     if (!strcmp(self->prompt, "COM1"))
 	return !strcmp(buf, "/dev/cuaa0");
@@ -369,7 +369,7 @@ DMenu MenuMouse = {
 	"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
       { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
-      { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
+      { "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
       { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index c429beb159853..ed168b029c702 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -56,7 +56,7 @@
 
 /* Different packages we depend on - update this when package version change! */
 #define PACKAGE_GATED	"gated-3.5b3"
-#define PACKAGE_APACHE	"apache-1.1.1"
+#define PACKAGE_APACHE	"apache-1.2b4"
 #define PACKAGE_NETCON	"commerce/netcon/bsd61"
 #define PACKAGE_PCNFSD	"pcnfsd-93.02.16"
 #define PACKAGE_SAMBA	"samba-1.9.15p8"
diff --git a/usr.sbin/sade/variable.c b/usr.sbin/sade/variable.c
index 824b0cbe1f6ec..525dfbff4d018 100644
--- a/usr.sbin/sade/variable.c
+++ b/usr.sbin/sade/variable.c
@@ -42,7 +42,6 @@ static void
 make_variable(char *var, char *value)
 {
     Variable *vp;
-    char *cp;
 
     /* Trim leading and trailing whitespace */
     var = string_skipwhite(string_prune(var));
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 9b786df787c40..347293080ebcb 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -332,7 +332,7 @@ whichMouse(dialogMenuItem *self)
     
     if (!file_readable("/dev/mouse"))
 	return FALSE;
-    if (readlink("/dev/mouse", buf, BUFSIZ) == -1)
+    if (readlink("/dev/mouse", buf, sizeof buf) == -1)
 	return FALSE;
     if (!strcmp(self->prompt, "COM1"))
 	return !strcmp(buf, "/dev/cuaa0");
@@ -369,7 +369,7 @@ DMenu MenuMouse = {
 	"ln -fs /dev/cuaa2 /dev/mouse", '(', '*', ')', 1 },
       { "COM4",	"Serial mouse on COM4", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/cuaa3 /dev/mouse", '(', '*', ')', 1 },
-      { "BusMouse",	"Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
+      { "BusMouse", "Logitech or ATI bus mouse", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/mse0 /dev/mouse", '(', '*', ')', 1 },
       { "PS/2",	"PS/2 style mouse (must enable psm0 device)", whichMouse, dmenuSystemCommand, NULL,
 	"ln -fs /dev/psm0 /dev/mouse", '(', '*', ')', 1 },
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index c429beb159853..ed168b029c702 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -56,7 +56,7 @@
 
 /* Different packages we depend on - update this when package version change! */
 #define PACKAGE_GATED	"gated-3.5b3"
-#define PACKAGE_APACHE	"apache-1.1.1"
+#define PACKAGE_APACHE	"apache-1.2b4"
 #define PACKAGE_NETCON	"commerce/netcon/bsd61"
 #define PACKAGE_PCNFSD	"pcnfsd-93.02.16"
 #define PACKAGE_SAMBA	"samba-1.9.15p8"
diff --git a/usr.sbin/sysinstall/variable.c b/usr.sbin/sysinstall/variable.c
index 824b0cbe1f6ec..525dfbff4d018 100644
--- a/usr.sbin/sysinstall/variable.c
+++ b/usr.sbin/sysinstall/variable.c
@@ -42,7 +42,6 @@ static void
 make_variable(char *var, char *value)
 {
     Variable *vp;
-    char *cp;
 
     /* Trim leading and trailing whitespace */
     var = string_skipwhite(string_prune(var));