diff options
| -rw-r--r-- | net/generic-nqs/Makefile | 13 | ||||
| -rw-r--r-- | net/generic-nqs/files/i386-unknown-freebsd2.2.6 | 2 | ||||
| -rw-r--r-- | net/generic-nqs/files/patch-ab | 20 | ||||
| -rw-r--r-- | net/generic-nqs/files/patch-ag | 31 |
4 files changed, 42 insertions, 24 deletions
diff --git a/net/generic-nqs/Makefile b/net/generic-nqs/Makefile index 8ceda05a882a..f2a9a8b21db5 100644 --- a/net/generic-nqs/Makefile +++ b/net/generic-nqs/Makefile @@ -95,11 +95,18 @@ MAN1= nmapmgr.1 nqs.1 nqsconfig.1 nqsgs.1 nqsrn.1\ # 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 # diff --git a/net/generic-nqs/files/i386-unknown-freebsd2.2.6 b/net/generic-nqs/files/i386-unknown-freebsd2.2.6 index e3f2c5735b2c..eea91e812c5a 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 "-O2" +C_COMPILER_FLAGS_OPTIMISE "XX_CFLAGS_XX" 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 d79fc57ceb94..e69de29bb2d1 100644 --- a/net/generic-nqs/files/patch-ab +++ b/net/generic-nqs/files/patch-ab @@ -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 - } diff --git a/net/generic-nqs/files/patch-ag b/net/generic-nqs/files/patch-ag new file mode 100644 index 000000000000..1962c329f5e2 --- /dev/null +++ b/net/generic-nqs/files/patch-ag @@ -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 |