aab0f21de3
Fix builds on -current Grab MAINTAINER pkglintification From CHANGES: v5.2 September 2005 (THC public release) ! THIS IS A THC TAX ANNIVERSARY SPECIAL RELEASE ! HAVE FUN ! * Included patch from ka0ttic@gentoo.org for cleaner gcc compile * Added SSL_Pending() to prevent rare locking on SSL ports, thanks to michel(at)arboi.fr.eu.org for reporting * Added lots of fingerprints, most from Johnny Cyberpunk / THC - THANKS! v5.1 June 2005 (THC public release) * Big appdefs.resp update. Thanks to all contributors! * Finally and forever fixed the --prefix= issue * Fixed the web update function for bad inet_pton implementations * Added support for nmap files with IPv6 addresses * You can scan/check port 0 now (wish from nbach<at>deloitte.dk) * Less error prone "make install"
80 lines
2.5 KiB
Text
80 lines
2.5 KiB
Text
$NetBSD: patch-aa,v 1.3 2006/10/27 10:35:47 adrianp Exp $
|
|
|
|
--- configure.orig 2005-06-03 14:34:19.000000000 +0100
|
|
+++ configure
|
|
@@ -13,10 +13,6 @@ if [ "$1" = "--help" ]; then
|
|
exit 0
|
|
fi
|
|
|
|
-cd pcre-3.9 || exit 1
|
|
-./configure || exit 1
|
|
-cd ..
|
|
-
|
|
echo
|
|
echo
|
|
echo "Starting amap auto configuration ..."
|
|
@@ -29,13 +25,14 @@ NSL_PATH=""
|
|
SOCKET_PATH=""
|
|
MANDIR=""
|
|
LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null`
|
|
-PREFIX=`echo "$1"|grep prefix=|sed 's/.*prefix=//i'`
|
|
+PREFIX=`echo "$1"|@GREP@ prefix=|@SED@ 's/.*prefix=//'`
|
|
echo
|
|
|
|
echo "Checking for openssl ..."
|
|
for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \
|
|
/*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
|
|
-/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib .
|
|
+/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib \
|
|
+@SSLBASE@/lib .
|
|
do
|
|
if [ "X" = "X$SSL_PATH" ]; then
|
|
if [ -f "$i/libssl.so" -o -f "$i/libssl.dylib" ]; then
|
|
@@ -62,7 +59,7 @@ do
|
|
done
|
|
|
|
for i in /usr/local/include /*ssl/include /usr/include \
|
|
-/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include .
|
|
+/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include @SSLBASE@/include .
|
|
do
|
|
if [ "X" = "X$SSL_IPATH" ]; then
|
|
if [ -f "$i/openssl/ssl.h" ]; then
|
|
@@ -89,7 +86,7 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th
|
|
SSL_IPATH=""
|
|
fi
|
|
|
|
-SYS=`uname -s`
|
|
+SYS=`@UNAME@ -s`
|
|
if [ "$SYS" = "SunOS" ]; then
|
|
echo "Checking for Solaris libraries ..."
|
|
for i in /lib /usr/lib /usr/local/lib $LIBDIRS
|
|
@@ -152,7 +149,7 @@ if [ -n "$RESOLV_PATH" ]; then
|
|
XLIBS="$XLIBS -lresolv"
|
|
fi
|
|
|
|
-for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man ; do
|
|
+for i in /usr/man /usr/share/man /usr/local/man /usr/local/share/man @MANDIR@ ; do
|
|
if [ -d $i ]; then
|
|
MANDIR=$i
|
|
fi
|
|
@@ -168,9 +165,9 @@ if [ -d /usr/kerberos/include ]; then
|
|
fi
|
|
|
|
if [ -n "$PREFIX" ]; then
|
|
- XDEFINES="$XDEFINES -DAMAP_PREFIX='\"$PREFIX\"'"
|
|
+ XDEFINES="$XDEFINES -DAMAP_PREFIX=\"\\\"$PREFIX/\\\"\""
|
|
else
|
|
- PREFIX="/usr/local"
|
|
+ PREFIX="@PREFIX@"
|
|
fi
|
|
echo "Amap will be installed into .../bin and .../etc of: $PREFIX"
|
|
echo " (change this by running ./configure --prefix=path)"
|
|
@@ -178,7 +175,7 @@ echo
|
|
|
|
echo "Writing Makefile.in ..."
|
|
echo "XDEFINES=$XDEFINES" >> Makefile.in
|
|
-echo "XLIBS=$XLIBS" >> Makefile.in
|
|
+echo "XLIBS=$XLIBS @COMPILER_RPATH_FLAG@@PREFIX@/lib -L@PREFIX@/lib" >> Makefile.in
|
|
echo "XLIBPATHS=$XLIBPATHS" >> Makefile.in
|
|
echo "XIPATHS=$XIPATHS" >> Makefile.in
|
|
echo "MANDIR=$MANDIR/man1/" >> Makefile.in
|