cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- ignore existing nessus,nasl-config scripts when building

Browse Source 
- more --enable-gmp fixes to configure scripts
This commit is contained in:
matt 2001-05-06 14:38:33 +00:00
parent bc73c9f754
commit 807b74a1f4
5 changed files with 358 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/nessus/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2001/03/25 19:17:48 matt Exp $
# $OpenBSD: Makefile,v 1.22 2001/05/06 14:38:33 matt Exp $
COMMENT= "network security scanner"
PKGNAME= nessus-${VERS}
CATEGORIES= security
NEED_VERSION= 1.361
NEED_VERSION= 1.405
VERS= 1.0.7a
@ -44,8 +44,11 @@ PERMIT_DISTFILES_FTP= Yes
FLAVORS=no_x11
FLAVOR?=
# Can't do CONFIGURE_STYLE=autoconf because of configure wrapper
# that builds each tarball in succession.
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--localstatedir=/var --enable-gmp=${LOCALBASE}
CONFIGURE_ARGS+=--localstatedir=/var --enable-gmp=${LOCALBASE} \
--disable-nessuspcap
LIB_DEPENDS= gmp.4.1::devel/gmp

2
security/nessus/files/configure vendored
View File

@ -8,6 +8,6 @@
for dir in @@NESSUS_DIRS@@ ; do
echo "===> Configuring $dir"
(cd $dir ; PATH=@@WRKSRC@@:$PATH ./configure $*)
(cd $dir; PATH=@@WRKSRC@@:$PATH NESSUSCONFIG=@@WRKSRC@@nessus-config NASLCONFIG=@@WRKSRC@@nasl-config ./configure $*)
done

2
security/nessus/files/nasl-config
View File

@ -9,7 +9,7 @@
PREFIX=@@WRKSRC@@/libnasl
LIBDIR=$PREFIX/nasl/.libs
INCLUDEDIR=$PREFIX/include
VERSION=0.98.3
VERSION=@@VERS@@
usage()
{

622
security/nessus/patches/patch-nessus-libraries_libpeks_configure
View File

File diff suppressed because it is too large Load Diff

33
security/nessus/patches/patch-nessus-libraries_libpeks_configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-nessus-libraries_libpeks_configure_in,v 1.2 2001/02/13 03:00:13 matt Exp $
$OpenBSD: patch-nessus-libraries_libpeks_configure_in,v 1.3 2001/05/06 14:38:34 matt Exp $
--- nessus-libraries/libpeks/configure.in.orig Sat Dec 23 12:14:48 2000
+++ nessus-libraries/libpeks/configure.in Mon Feb 12 20:06:13 2001
+++ nessus-libraries/libpeks/configure.in Mon Apr 23 18:18:45 2001
@@ -39,6 +39,7 @@ AC_LANG_C
dnl Check for several programs
AM_PROG_LIBTOOL
@ -9,18 +9,31 @@ $OpenBSD: patch-nessus-libraries_libpeks_configure_in,v 1.2 2001/02/13 03:00:13
# general options
# ---------------
@@ -88,7 +89,7 @@ AC_ARG_ENABLE(gmp,[ --enable-gmp[=/path
@@ -88,7 +89,12 @@ AC_ARG_ENABLE(gmp,[ --enable-gmp[=/path
# can we use gmp as provided by the os ?
unset gmplink
-case $enable_gmp in ''|yes)
+case $enable_gmp in ''|yes|/*)
+ case $enable_gmp in /*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -L$enable_gmp/lib"
+ ;;
+ esac
AC_CHECK_LIB(gmp,mp_set_memory_functions,gmplink=-lgmp,,$gmpldflags)
AC_CHECK_LIB(gmp2,mp_set_memory_functions,gmplink=-lgmp2,,$gmpldflags)
AC_CHECK_LIB(gmp3,mp_set_memory_functions,gmplink=-lgmp3,,$gmpldflags)
@@ -99,11 +100,18 @@ case $enable_gmp in ''|yes)
@@ -98,17 +104,31 @@ case $enable_gmp in ''|yes)
AC_CHECK_LIB(gmp2,__gmp_set_memory_functions,gmplink=-lgmp2,,$gmpldflags)
AC_CHECK_LIB(gmp3,__gmp_set_memory_functions,gmplink=-lgmp3,,$gmpldflags)
}
+ test -z "$gmplink" && {
+ case $enable_gmp in /*)
+ CFLAGS="$save_CFLAGS"
+ gmplink="-L$enable_gmp/lib $gmplink"
+ ;;
+ esac
+ }
if test -n "$gmplink" ; then
- # do we use gmp as provided by the os ?
- unset gmpinc
@ -40,5 +53,13 @@ $OpenBSD: patch-nessus-libraries_libpeks_configure_in,v 1.2 2001/02/13 03:00:13
+ ;;
+ esac
fi
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $gmpinc"
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $gmpinc"
+ ac_cpp_SAVE="$ac_cpp"
+ ac_cpp="$ac_cpp $gmpinc"
AC_CHECK_HEADER(gmp.h,have_gmp_h=yes,unset have_gmp_h)
- CFLAGS="$save_CFLAGS"
+ ac_cpp="$ac_cpp_SAVE"
esac
# config options consistency checks