Update to version 3.50.6.

PR:		14915
Submitted by:	maintainer

1 files changed, 49 insertions, 23 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} ""