4 files changed, 71 insertions, 22 deletions

diff --git a/net/generic-nqs/files/i386-unknown-freebsd2.2.6 b/net/generic-nqs/files/i386-unknown-freebsd2.2.6
index 508756bfd079..e3f2c5735b2c 100644
--- a/net/generic-nqs/files/i386-unknown-freebsd2.2.6
+++ b/net/generic-nqs/files/i386-unknown-freebsd2.2.6
@@ -3,7 +3,7 @@
 # PLATFORM DESCRIPTION FILE
 
 C_COMPILER                      "cc"
-C_COMPILER_FLAGS_OPTIMISE       "${CFLAGS}"
+C_COMPILER_FLAGS_OPTIMISE       "-O2"
 C_COMPILER_FLAGS_DEBUG          ""
 C_COMPILER_FLAGS_COMMON         ""
 C_COMPILER_FLAGS_INCLUDE        ""
diff --git a/net/generic-nqs/files/patch-ab b/net/generic-nqs/files/patch-ab
index 4b20f2d6afda..d79fc57ceb94 100644
--- a/net/generic-nqs/files/patch-ab
+++ b/net/generic-nqs/files/patch-ab
@@ -1,21 +1,20 @@
---- Source-Tree/nqsdaemon/all-systems/nqs_reqser.c.orig	Wed Sep 11 05:32:26 1996
-+++ Source-Tree/nqsdaemon/all-systems/nqs_reqser.c	Sat May  2 11:09:26 1998
-@@ -1746,7 +1746,7 @@
-     char    *cp;
-     
-     environment_file = fopen("/etc/environment",  "r");
--    if ( environment_file != (FILE *) 0 ) {
-+    if ( environment_file > (FILE *) 0 ) {
- 	while ( (fgets (env_line, sizeof(env_line), environment_file )
- 		!= (char *) 0) ) {
- 	    if (env_line[0] == '#') continue;
-@@ -1758,8 +1758,8 @@
- 		 return (the_path); 
- 	    }   
- 	}
-+    	fclose ( environment_file );
-     }
--    fclose ( environment_file );
-     /*
-      * The file was not found, or the path was not in it.
-      */
+--- SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig	Sat Nov 13 19:32:02 1999
++++ SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh	Sat Nov 13 19:32:36 1999
+@@ -72,7 +72,7 @@
+ 		F_ECHO_LN     "egcs"
+ 
+ 		F_DEFINE_STRING  GPORT_CC_FLAGS_DEBUG "-Wpointer-arith -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
+-		F_DEFINE_STRING  GPORT_CC_FLAGS_OPTIMISE "-O6 -fno-strength-reduce"
++		F_DEFINE_STRING  GPORT_CC_FLAGS_OPTIMISE "-O2"
+ 		F_DEFINE_STRING  GPORT_CC_FLAGS_COMMON "-Wall"
+ 	elif [ "$GPORT_HAS_GCC" = 1 ]; then
+ 		F_TEST_TYPE BLANK
+@@ -80,7 +80,7 @@
+ 		F_ECHO_LN     "gcc"
+ 
+ 		F_DEFINE_STRING  GPORT_CC_FLAGS_DEBUG "-Wpointer-arith -Wbad-function-cast -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
+-		F_DEFINE_STRING  GPORT_CC_FLAGS_OPTIMISE "-O6 -fno-strength-reduce"
++		F_DEFINE_STRING  GPORT_CC_FLAGS_OPTIMISE "-O2"
+ 		F_DEFINE_STRING  GPORT_CC_FLAGS_COMMON "-Wall"
+ 	fi
+ }
diff --git a/net/generic-nqs/files/patch-ad b/net/generic-nqs/files/patch-ad
new file mode 100644
index 000000000000..f70fc494eac1
--- /dev/null
+++ b/net/generic-nqs/files/patch-ad
@@ -0,0 +1,31 @@
+--- Source-Tree/SETUP/all-systems/General.inst.orig	Sun Nov 14 11:52:32 1999
++++ Source-Tree/SETUP/all-systems/General.inst	Sun Nov 14 11:56:57 1999
+@@ -46,17 +46,21 @@
+   Boolean "  Do you want nmapmgr to automatically allocate a machine ID?" nmapmgr_allocate "y"
+   echo
+   if [ "$nmapmgr_allocate" = "y" ]; then
+-    echo "  Okay.  I need to know what the fully-qualified hostname of this machine"
+-    echo "  is.  For example, my workstation is called 'lanfear'.  It's fully-"
+-    echo "  qualified hostname is 'lanfear.shef.ac.uk'."
+-    echo
+-    String "  What is your machine's full name?" nmapmgr_fqdn ""
++    fqdn=`hostname`
++    short=`hostname | cut -d. -f 1`
++    if [ $fqdn = $short ]; then
++      echo "  Okay.  I need to know what the fully-qualified hostname of this"
++      echo "  machine is. For example, my workstation is called 'zen'."
++      echo "  It's fully-qualified hostname is 'zen.my.domain'."
++      echo
++      String "  What is your machine's full name?" fqdn ""
++    fi
+     echo
+     echo "  Okay.  I will now run nmapmgr; when the nmapmgr prompt appears, please"
+     echo "  type in the commands below."
+     echo
+-    echo "      add host `hostname`"
+-    echo "      add alias $nmapmgr_fqdn `hostname`"
++    echo "      add host $fqdn"
++    echo "      add alias $short $fqdn"
+     echo "      list"
+     echo "      exit"
+   else
diff --git a/net/generic-nqs/files/patch-ae b/net/generic-nqs/files/patch-ae
new file mode 100644
index 000000000000..46a51ccda2a8
--- /dev/null
+++ b/net/generic-nqs/files/patch-ae
@@ -0,0 +1,19 @@
+--- SETUP.orig	Sun Nov 14 21:18:57 1999
++++ SETUP	Sun Nov 14 21:19:31 1999
+@@ -1,16 +1,6 @@
+ #!/bin/sh
+ 
+-our_path="`echo $PATH | tr ':' ' '`"
+ our_shell="/bin/sh"
+-
+-for x in ksh bash ; do
+-  for y in $our_path ; do
+-    if [ -f "$y/$x" ]; then
+-      our_shell="$y/$x"
+-    fi
+-  done
+-done
+-
+ export our_shell
+ SETUP_CC="$CC"
+ export SETUP_CC