11 files changed, 159 insertions, 51 deletions

diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile
index 05292c8f5d60..ee2a62f511a6 100644
--- a/net/generic-nqs/Makefile
+++ b/net/generic-nqs/Makefile
@@ -1,21 +1,25 @@
 # New ports collection makefile for:	nqs (Generic NQS)
-# Version required:     3.50.4
+# Version required:     3.50.6
 # Date created:         01 May 1998
 # Whom:                 tonym
 #
 # $FreeBSD$
 #
+# View this file with tabstop=4
+#
+
+DISTNAME=		Generic-NQS-3.50.6
+CATEGORIES=		net
+MASTER_SITES=	http://ftp.gnqs.org/pub/gnqs/v3.50/
 
-DISTNAME=       Generic-NQS-3.50.4
-CATEGORIES=	net
-MASTER_SITES=   ftp://ftp.shef.ac.uk/pub/uni/projects/nqs/v3.5x/
+MAINTAINER=		tony.maher@ebioinformatics.com
 
-MAINTAINER=	tonym@angis.org.au
+Y2K=			http://www.gnqs.org/Year2000.htm
 
 IS_INTERACTIVE=	yes
-NO_PACKAGE=	have to build on site due to the descriptors created in\
-		/var/spool/nqs (default location) and the configuration\
-		procedure
+NO_PACKAGE=		have to build on site due to the descriptors created in\
+				/var/spool/nqs (default location) and the configuration\
+				procedure
 
 #
 # NQS gets configured, built and installed via its own SETUP script
@@ -30,12 +34,12 @@ NO_PACKAGE=	have to build on site due to the descriptors created in\
 # from there on in
 #
 
-HOSTNAME=		`uname -n`
-RELEASE=		`uname -r | cut -d'-' -f 1`
-HARDWARE=		`uname -m`
+HOSTNAME=	`uname -n`
+RELEASE=	`uname -r | cut -d'-' -f 1`
+HARDWARE=	`uname -m`
 
-HAS_CONFIGURE=          yes
-CONFIGURE_SCRIPT=       SETUP
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	SETUP
 CONFIGURE_ARGS=		--fbconfig
 
 #
@@ -46,14 +50,15 @@ DUMMYMAKE=	Makefile
 STARTUP=	nqs.sh
 TEMPLATE=	i386-unknown-freebsd2.2.6
 
+#
 # We rename TEMPLATE (which is known to work for 2.2.6 up to and including
-#	4.0-CURRENT as of Jan 26) to the release number of this machine.
+#   4.0 current Mar 07) to the release number of this machine.
 # Maybe this is a mistake. NQS will auto generate a file from a similar
 #	Platorm description file, but you would have to run make twice
 #	in this case.
 #
 
-PLATFORMDIR=	${WRKSRC}/SETUPDir/Platforms
+PLATFORMDIR=${WRKSRC}/SETUPDir/Platforms
 PLATFORM=	${HARDWARE}-unknown-freebsd${RELEASE}
 
 #
@@ -65,16 +70,17 @@ PLATFORM=	${HARDWARE}-unknown-freebsd${RELEASE}
 #
 
 CONFIGFILE=	${WRKSRC}/Build-Tree/${PLATFORM}/${HOSTNAME}/SETUP/General.h
+MANDIR=		${WRKSRC}/Source-Tree/man/man1/all-systems
 RCDIR=		${PREFIX}/etc/rc.d
 SYSINST=	${SCRIPTDIR}/create-nqs-rc.sh
 SYSLOGFIX=	${SCRIPTDIR}/syslog-add.sh
+PLISTFIX=	${SCRIPTDIR}/fix-PLIST.mktmp.sh
 CREATEQ=	${SCRIPTDIR}/create-example-batch-queues
 
-MAN1=	nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\
-	qacct.1 qalter.1 qcat.1 qcmplx.1 qdel.1 qdev.1\
-	qhold.1 qjob.1 qlimit.1 qmsg.1 qpr.1\
-	qresume.1 qrls.1 qstat.1 qstatc.1 qsub.1 qsuspend.1
-
+MAN1=		nmapmgr.1 nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\
+			qacct.1 qalter.1 qcat.1 qcmplx.1 qdel.1 qdev.1\
+			qhold.1 qjob.1 qlimit.1 qmgr.1m qmsg.1 qpr.1\
+			qresume.1 qrls.1 qstat.1 qstatc.1 qsub.1 qsuspend.1
 #
 # Thus ends the definitions
 #
@@ -84,22 +90,42 @@ MAN1=	nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\
 # We need a dummy top level Makefile as NQS will put its Makefile
 # in Build-Tree/${PLATFORM}/${HOSTNAME}
 # Need to have the SETUP scripts executable.
+# Remove the dross *.man files qcat.man and list_nqs_queues.man
+# Rename man page to fit BSD extensions
 #
 
 pre-configure:
 	@ ${CP} ${FILESDIR}/${TEMPLATE} ${PLATFORMDIR}/${PLATFORM}; \
 	${CP}   ${FILESDIR}/${DUMMYMAKE} ${WRKSRC}; \
 	${CHMOD} 555 ${WRKDIR}/${DISTNAME}/Source-Tree/SETUP/all-systems/*
+	${RM} 	${MANDIR}/*.man ; \
+	${MV}	${MANDIR}/nmapmgr.1m ${MANDIR}/nmapmgr.1
 
 #
 # Install system boot startup file but need to find out exactly where
 #	the nqs stuff was installed as this is set in nqs' own install script
-# Modify syslog.conf to hqndle nqs
+# Modify syslog.conf to handle nqs
 #
 
 post-install:
-	@ ${SH} ${SYSINST} ${CONFIGFILE} ${FILESDIR}/${STARTUP} ${RCDIR}/${STARTUP}; \
-	${SH} ${SYSLOGFIX} ;\
+	@ strip ${PREFIX}/sbin/loaddaemon	${PREFIX}/sbin/finish_autoinst \
+			${PREFIX}/sbin/lpserver		${PREFIX}/sbin/netclient \
+			${PREFIX}/sbin/netdaemon	${PREFIX}/sbin/netserver \
+			${PREFIX}/sbin/nqsdaemon	${PREFIX}/sbin/nqsexejob \
+			${PREFIX}/sbin/nqsmkdirs	${PREFIX}/sbin/nqsmkfile \
+			${PREFIX}/sbin/nqsmktrans	${PREFIX}/sbin/nqssetargv \
+			${PREFIX}/sbin/pipeclient	${PREFIX}/sbin/shlexefai; \
+	strip	${PREFIX}/bin/nmapmgr		${PREFIX}/bin/qacct \
+			${PREFIX}/bin/qalter		${PREFIX}/bin/qcat \
+			${PREFIX}/bin/qdel			${PREFIX}/bin/qdev \
+			${PREFIX}/bin/qhold			${PREFIX}/bin/qlimit \
+			${PREFIX}/bin/qmgr			${PREFIX}/bin/qmsg \
+			${PREFIX}/bin/qpr			${PREFIX}/bin/qrls \
+			${PREFIX}/bin/qstat			${PREFIX}/bin/qsub \
+			${PREFIX}/bin/qsuspend; \
+	${SYSINST} ${CONFIGFILE} ${FILESDIR}/${STARTUP} ${RCDIR}/${STARTUP}; \
+	${SYSLOGFIX}; \
+	${PLISTFIX} ${CONFIGFILE} ${WRKDIR}; \
 	${ECHO} "You may want run ${CREATEQ} to actually make some queues"; \
 	${ECHO} ""
 
diff --git a/net/generic-nqs/distinfo b/net/generic-nqs/distinfo
index 412070440053..363aeb60424e 100644
--- a/net/generic-nqs/distinfo
+++ b/net/generic-nqs/distinfo
@@ -1 +1 @@
-MD5 (Generic-NQS-3.50.4.tar.gz) = 2c0bd7a28b976674e71530aa79fa47d1
+MD5 (Generic-NQS-3.50.6.tar.gz) = 61c14b782f8a487221bdd21a3b225685
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
diff --git a/net/generic-nqs/pkg-descr b/net/generic-nqs/pkg-descr
index af390e9d1127..7329a8001bb3 100644
--- a/net/generic-nqs/pkg-descr
+++ b/net/generic-nqs/pkg-descr
@@ -1,7 +1,7 @@
 NQS (or more properly Generic NQS) is a Network Queuing System available
 for multiple platforms.
-It provides for configurable limits on jobs on a per queue basis
-as well as for the total queue system.
-As it's name suggests it allows jobs to be submitted on one machine and
+It provides for configurable limits on jobs on a per queue basis as well
+as for the total queue system.
+As its name suggests it allows jobs to be submitted on one machine and
 transferred to run on another machine. It can be configured so jobs are
 automatically transferred to the least loaded machine in the cluster.
diff --git a/net/generic-nqs/pkg-plist b/net/generic-nqs/pkg-plist
index e1dc96660125..721ca40d0d40 100644
--- a/net/generic-nqs/pkg-plist
+++ b/net/generic-nqs/pkg-plist
@@ -26,8 +26,15 @@ sbin/nqsmkdirs
 sbin/nqsmktrans
 sbin/pipeclient
 sbin/shlexefai
+sbin/OLDloaddaemon
+sbin/OLDnetdaemon
+sbin/OLDnetserver
+sbin/OLDnqsdaemon
+sbin/OLDnqsmkdirs
+sbin/OLDnqsmktrans
 lib/nqs/GNQS.VERSION
 lib/nqs/General.conf.def
 lib/nqs/qmgr.hlp
 lib/nqs/nmap/machines
 @unexec rm -rf %D/lib/nqs
+@unexec rm -rf XXXX
diff --git a/net/generic-nqs/scripts/create-nqs-rc.sh b/net/generic-nqs/scripts/create-nqs-rc.sh
index 6087fae4b88f..3929ec03c6f8 100644
--- a/net/generic-nqs/scripts/create-nqs-rc.sh
+++ b/net/generic-nqs/scripts/create-nqs-rc.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+PATH="/usr/bin:/bin"; export PATH
 me=`basename $0`
 
 if [ $# -lt 3 ]; then
@@ -11,5 +12,7 @@ root=`grep NQS_ROOTDIR $1 | cut -f2 -d\"`
 sed -e"s#XXXX#$root#" $2 > $3
 chmod 755 $3
 echo ""
-echo "created $3 startup file"
+echo "Created $3 boot startup file." 
+echo "    -  it will startup the 2 NQS daemons"
+echo "    -  run this script manually now before attempting to create queues"
 echo ""
diff --git a/net/generic-nqs/scripts/fix-PLIST.mktmp.sh b/net/generic-nqs/scripts/fix-PLIST.mktmp.sh
new file mode 100644
index 000000000000..2a70066fc110
--- /dev/null
+++ b/net/generic-nqs/scripts/fix-PLIST.mktmp.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Where did they actually store the spool area?
+# Check the NQS config file!
+#
+# Fortunately the ports system creates a temporary packing list that we can
+# modify post-install before the install gets officially recorded.
+#
+
+PATH="/usr/bin:/bin"; export PATH       
+
+me=`basename $0`
+
+if [ $# -lt 2 ]; then
+	echo usage: $me configfile workdir >&2
+	exit 1
+fi
+
+root=`grep NQS_ROOTPRIV $1 | cut -f2 -d\"`
+mv $2/.PLIST.mktmp $2/.PLIST.mktmp.orig
+sed -e"s#XXXX#$root#" $2/.PLIST.mktmp.orig > $2/.PLIST.mktmp
diff --git a/net/generic-nqs/scripts/syslog-add.sh b/net/generic-nqs/scripts/syslog-add.sh
index d3e810b5685c..c9e5968abc75 100644
--- a/net/generic-nqs/scripts/syslog-add.sh
+++ b/net/generic-nqs/scripts/syslog-add.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+PATH="/usr/bin:/bin"; export PATH       
+
 if grep -q nqs /etc/syslog.conf
 then :
 else
 	echo "local0.*					/var/log/nqs" >> /etc/syslog.conf  
 	echo ""
-	echo "/etc/syslog modified to support nqs"
+	echo "/etc/syslog.conf modified to support nqs (using local0.*)"
 	echo ""
 fi