Make ircII compile with socks support even if the ncurses package is

installed. The configure script added $LOCALBASE/include to CFLAGS,
but that way the local includes get mixed up with ncruses includes.
Append $LOCALBASE/include after the local includes to includepath.

4 files changed, 154 insertions, 27 deletions

diff --git a/net/ircII/files/patch-sum b/net/ircII/files/patch-sum
index a9f46150ba8..f0fef459990 100644
--- a/net/ircII/files/patch-sum
+++ b/net/ircII/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.6 1999/08/28 08:30:07 mrg Exp $
+$NetBSD: patch-sum,v 1.7 1999/11/29 11:45:13 frueauf Exp $
 
-MD5 (patch-aa) = 6c8c5c626a2b938410cc777e911f8f21
-MD5 (patch-ab) = e7e9e3fad70e81ba96735ab04b2470c9
-MD5 (patch-ac) = 4b0bf240192de32ded62074ccab52028
+MD5 (patch-aa) = ad0513671ae928967f60c329958ad24e
+MD5 (patch-ab) = f9a4d5fc576e18ea21e570dcf49ec449
+MD5 (patch-ac) = b9ec004beff786ef4ef7467a2ef168dc
diff --git a/net/ircII/patches/patch-aa b/net/ircII/patches/patch-aa
index ddfcd76c1f1..3d0c0b6da1f 100644
--- a/net/ircII/patches/patch-aa
+++ b/net/ircII/patches/patch-aa
@@ -1,14 +1,8 @@
-$NetBSD: patch-aa,v 1.5 1999/08/28 08:30:08 mrg Exp $
+$NetBSD: patch-aa,v 1.6 1999/11/29 11:45:14 frueauf Exp $
 
-Index: configure.in
-===================================================================
-RCS file: /home/cvs/ircii/configure.in,v
-retrieving revision 1.114
-retrieving revision 1.115
-diff -p -u -r1.114 -r1.115
---- configure.in	1999/08/23 12:05:58	1.114
-+++ configure.in	1999/08/24 14:16:02	1.115
-@@ -734,7 +734,7 @@ AC_ARG_WITH(cast,
+--- configure.in.orig	Mon Aug 23 14:06:36 1999
++++ configure.in	Mon Nov 29 01:26:53 1999
+@@ -734,7 +734,7 @@
        CAST_SRC=cast.c
        ;;
    esac ],
@@ -17,3 +11,24 @@ diff -p -u -r1.114 -r1.115
      AC_MSG_RESULT(yes)
      AC_DEFINE_UNQUOTED(USE_CAST, 1)
      CAST_SRC=cast.c
+@@ -809,11 +809,15 @@
+ 	      withval="-lsocks5"
+ 	    else
+ 	      if test -d "$withval"; then
+-		if test -d "$withval/include"; then
+-		  CFLAGS="$CFLAGS -I$withval/include"
+-		else
+-		  CFLAGS="$CFLAGS -I$withval"
+-		fi
++#
++# On NetBSD avoid problems if the ncurses package is installed. $withval/include
++# should be after the local includes in the include path.
++#
++#		if test -d "$withval/include"; then
++#		  CFLAGS="$CFLAGS -I$withval/include"
++#		else
++#		  CFLAGS="$CFLAGS -I$withval"
++#		fi
+ 	        if test -d "$withval/lib"; then
+ 		  withval="-L$withval/lib -lsocks5"
+ 		else
diff --git a/net/ircII/patches/patch-ab b/net/ircII/patches/patch-ab
index fe6a9228922..d051dc210e1 100644
--- a/net/ircII/patches/patch-ab
+++ b/net/ircII/patches/patch-ab
@@ -1,14 +1,17 @@
-$NetBSD: patch-ab,v 1.5 1999/08/28 08:30:08 mrg Exp $
+$NetBSD: patch-ab,v 1.6 1999/11/29 11:45:14 frueauf Exp $
 
-Index: configure
-===================================================================
-RCS file: /home/cvs/ircii/configure,v
-retrieving revision 2.76
-retrieving revision 2.77
-diff -p -u -r2.76 -r2.77
---- configure	1999/08/23 12:06:10	2.76
-+++ configure	1999/08/24 14:16:16	2.77
-@@ -4072,7 +4072,7 @@ EOF
+--- configure.orig	Mon Aug 23 14:06:36 1999
++++ configure	Mon Nov 29 01:30:00 1999
+@@ -547,7 +547,7 @@
+ CATEGORIES='build change-request doc pending runtime'
+ 
+ 
+-echo '$Id: patch-ab,v 1.6 1999/11/29 11:45:14 frueauf Exp $' > /dev/null
++echo '$Id: patch-ab,v 1.6 1999/11/29 11:45:14 frueauf Exp $' > /dev/null
+ 
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+@@ -4072,7 +4072,7 @@
        ;;
    esac 
  else
@@ -17,3 +20,103 @@ diff -p -u -r2.76 -r2.77
      echo "$ac_t""yes" 1>&6
      cat >> confdefs.h <<EOF
  #define USE_CAST 1
+@@ -4261,11 +4261,15 @@
+ 	      withval="-lsocks5"
+ 	    else
+ 	      if test -d "$withval"; then
+-		if test -d "$withval/include"; then
+-		  CFLAGS="$CFLAGS -I$withval/include"
+-		else
+-		  CFLAGS="$CFLAGS -I$withval"
+-		fi
++#
++# On NetBSD avoid problems if the ncurses package is installed. $withval/include
++# should be after the local includes in the include path.
++#
++#		if test -d "$withval/include"; then
++#		  CFLAGS="$CFLAGS -I$withval/include"
++#		else
++#		  CFLAGS="$CFLAGS -I$withval"
++#		fi
+ 	        if test -d "$withval/lib"; then
+ 		  withval="-L$withval/lib -lsocks5"
+ 		else
+@@ -4280,14 +4284,14 @@
+ 	    TMPLIBS="$LIBS"
+ 	    LIBS="$LIBS $KERBEROS_LIBS"
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 4284 "configure"
++#line 4288 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+  SOCKSconnect(); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -4308,7 +4312,7 @@
+ 
+ if test "x$socks" = "x"; then
+ 	echo $ac_n "checking whether to support SOCKS4""... $ac_c" 1>&6
+-echo "configure:4312: checking whether to support SOCKS4" >&5
++echo "configure:4316: checking whether to support SOCKS4" >&5
+ 	# Check whether --with-socks4 or --without-socks4 was given.
+ if test "${with_socks4+set}" = set; then
+   withval="$with_socks4"
+@@ -4328,14 +4332,14 @@
+ 	    fi
+ 	    LIBS="$withval $LIBS"
+ 	    cat > conftest.$ac_ext <<EOF
+-#line 4332 "configure"
++#line 4336 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+  Rconnect(); 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -4493,7 +4497,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4497: checking for $ac_word" >&5
++echo "configure:4501: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_COPY_DIRECTORY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4528,7 +4532,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4532: checking for $ac_word" >&5
++echo "configure:4536: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_COPY_DIRECTORY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4581,7 +4585,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:4585: checking for $ac_word" >&5
++echo "configure:4589: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_ZCAT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4656,7 +4660,7 @@
+   # Extract the first word of `sendmail', so it can be a program name with args.
+   set dummy sendmail; word=$2
+   echo $ac_n "checking for $word""... $ac_c" 1>&6
+-echo "configure:4660: checking for $word" >&5
++echo "configure:4664: checking for $word" >&5
+   IFS="${IFS= 	}"; saveifs="$IFS"; IFS="${IFS}:"
+   for dir in $_PATH; do
+     test -z "$dir" && dir=.
diff --git a/net/ircII/patches/patch-ac b/net/ircII/patches/patch-ac
index a937c93d2ee..c5dfa80d2df 100644
--- a/net/ircII/patches/patch-ac
+++ b/net/ircII/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.7 1999/08/23 12:27:13 mrg Exp $
+$NetBSD: patch-ac,v 1.8 1999/11/29 11:45:14 frueauf Exp $
 
---- Makefile.in.orig	Mon Aug 23 19:42:28 1999
-+++ Makefile.in	Mon Aug 23 20:19:10 1999
+--- Makefile.in.orig	Mon Aug 23 13:46:48 1999
++++ Makefile.in	Mon Nov 29 01:33:06 1999
 @@ -176,8 +176,8 @@
  CP = cp
  MV = mv
@@ -27,3 +27,12 @@ $NetBSD: patch-ac,v 1.7 1999/08/23 12:27:13 mrg Exp $
  
  installscript: installdirs
  	(								\
+@@ -318,7 +316,7 @@
+ 
+ CAST_SRC = @CAST_SRC@
+ 
+-INCLUDES = -I. -I$(incdir)
++INCLUDES = -I. -I$(incdir) -I${prefix}/include
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -c $<