Index: head/net/generic-nqs/Makefile =================================================================== --- head/net/generic-nqs/Makefile (revision 48647) +++ head/net/generic-nqs/Makefile (revision 48648) @@ -1,133 +1,140 @@ # New ports collection makefile for: nqs (Generic NQS) # Date created: 01 May 1998 # Whom: tonym # # $FreeBSD$ # # View this file with tabstop=4 # PORTNAME= Generic-NQS PORTVERSION= 3.50.9 PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= fenner MAINTAINER= tonym@biolateral.com.au USE_BZIP2= yes 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 # # NQS gets configured, built and installed via its own SETUP script # # can call with --config, --compile or --install (in that order) # and provided the previous steps have been done and it then goes thru # everything from the called argument # # In order to fit in with the FreeBSD ports, modified SETUP so it has # 3 new targets --fbconfig, --fbcompile, --fbinstall # these differ in that they only do the current stage and *not* everything # from there on in # HOSTNAME= `uname -n` RELEASE= `uname -r | cut -d'-' -f 1` HARDWARE= `uname -m` HAS_CONFIGURE= yes CONFIGURE_SCRIPT= SETUP CONFIGURE_ARGS= --fbconfig # # In the files directory we have: # 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 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 PLATFORM= ${HARDWARE}-unknown-freebsd${RELEASE} # # NQS configure generates a config file in # Build-Tree/${PLATFORM}/${HOSTNAME}/SETUP/General.h # We can use this to extract what was actually configured such as # where the nqsdaemon resides. We just want the NQS_ROOTDIR # out of it for the post-install when we put in system startup file. # 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= 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 # # # Ok get a working platform description file in there. # 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 # +post-patch: + @${MV} ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh \ + ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig ; \ + ${SED} -e 's/-O6 -fno-strength-reduce/${CFLAGS}/' \ + ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh.orig \ + > ${WRKSRC}/SETUPDir/GSetup-Scripts/GPort-Scripts/1020-Is-gcc.sh + pre-configure: - @ ${CP} ${FILESDIR}/${TEMPLATE} ${PLATFORMDIR}/${PLATFORM}; \ + @ ${SED} -e 's/XX_CFLAGS_XX/${CFLAGS}/' ${FILESDIR}/${TEMPLATE} > ${PLATFORMDIR}/${PLATFORM}; \ ${CP} ${FILESDIR}/${DUMMYMAKE} ${WRKSRC}; \ - ${CHMOD} 555 ${WRKDIR}/${DISTNAME}/Source-Tree/SETUP/all-systems/* - ${RM} ${MANDIR}/*.man ; \ + ${CHMOD} 555 ${WRKSRC}/Source-Tree/SETUP/all-systems/* + ${RM} -f ${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 handle nqs # post-install: @ 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; \ ${SH} ${SYSINST} ${CONFIGFILE} ${FILESDIR}/${STARTUP} ${RCDIR}/${STARTUP}; \ ${SH} ${SYSLOGFIX}; \ ${SH} ${PLISTFIX} ${CONFIGFILE} ${WRKDIR}; \ ${ECHO} "You may want run ${SH} ${CREATEQ} to actually make some queues"; \ ${ECHO} "" .include Property changes on: head/net/generic-nqs/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.12 \ No newline at end of property +1.13 \ No newline at end of property Index: head/net/generic-nqs/files/i386-unknown-freebsd2.2.6 =================================================================== --- head/net/generic-nqs/files/i386-unknown-freebsd2.2.6 (revision 48647) +++ head/net/generic-nqs/files/i386-unknown-freebsd2.2.6 (revision 48648) @@ -1,18 +1,18 @@ # -*- sh -*- # # PLATFORM DESCRIPTION FILE C_COMPILER "cc" -C_COMPILER_FLAGS_OPTIMISE "-O2" +C_COMPILER_FLAGS_OPTIMISE "XX_CFLAGS_XX" C_COMPILER_FLAGS_DEBUG "" C_COMPILER_FLAGS_COMMON "" C_COMPILER_FLAGS_INCLUDE "" CONFIG_MACHINE "i386-unknown-freebsd2.2.6" PREFERED_API "BSD" PLATFORM_FLAGS "-DBSD4_4 -DHAS_BSD_LIMITS -DHAS_BSD_ZOMBIES -DIS_BSD -DIS_BSD4_4 -DHAS_RLIM_T -DHAS_BSD_PIPE" LINKER "cc -s" AR "ar cr" RANLIB "ranlib" MKDIR "bin/mkdir -p" Property changes on: head/net/generic-nqs/files/i386-unknown-freebsd2.2.6 ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/generic-nqs/files/patch-ab =================================================================== --- head/net/generic-nqs/files/patch-ab (revision 48647) +++ head/net/generic-nqs/files/patch-ab (revision 48648) @@ -1,20 +0,0 @@ ---- 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 - } Property changes on: head/net/generic-nqs/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/generic-nqs/files/patch-ag =================================================================== --- head/net/generic-nqs/files/patch-ag (nonexistent) +++ head/net/generic-nqs/files/patch-ag (revision 48648) @@ -0,0 +1,31 @@ +--- Source-Tree/loaddaemon/all-systems/loaddaemon.c.orig Thu Aug 2 01:18:37 2001 ++++ Source-Tree/loaddaemon/all-systems/loaddaemon.c Fri Aug 3 16:59:53 2001 +@@ -539,6 +539,20 @@ + } + #endif /* HPUX */ + #if IS_DECOSF | IS_BSD ++#if BSD4_4 ++static ++void calcloadavg(double load[3]) ++{ ++ double avenrun[3]; ++ int i; ++ if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0]))) { ++ printf("getloadavg goofed\n"); ++ } ++ for (i = 0; i < 3; i++) { ++ load[i] = avenrun[i]; ++ } ++} ++#else + struct nlist nl[] = { + #define unixpath "/vmunix" + { "_avenrun" }, +@@ -570,6 +584,7 @@ + for (i = 0; i < 3; i++) + load[i] = ((double) avenrun[i]) / (double) 1024.; + } ++#endif /* BSD4_4 */ + #endif /* DECOSF or Sun (BSD43) */ + + #if IS_SOLARIS Property changes on: head/net/generic-nqs/files/patch-ag ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property