This package can't use autoconf as to conflicts with it.

5 files changed, 30 insertions, 12 deletions

diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 6c78f689c5a..5ab0bd8492b 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2011/12/05 22:15:05 sbd Exp $
+# $NetBSD: Makefile,v 1.41 2011/12/13 06:58:08 sbd Exp $
 #
 
 DISTNAME=	gdb-5.3
@@ -30,13 +30,6 @@ CONFIGURE_ENV+=		CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
 .if ${OPSYS} == "SunOS"
 # Work around a bug in gdb's configure
 CONFIGURE_ENV+=		ac_cv_header_curses_h=yes
-.elif ${OPSYS} == "Linux"
-USE_TOOLS+=		aclocal autoheader autoconf
-
-pre-configure:
-	${RUN} cd ${WRKSRC}/gdb/gdbserver &&				\
-	aclocal && autoheader && autoconf
-
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/gdb/distinfo b/devel/gdb/distinfo
index 288221763d7..05156809bf0 100644
--- a/devel/gdb/distinfo
+++ b/devel/gdb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2011/12/10 06:54:06 sbd Exp $
+$NetBSD: distinfo,v 1.19 2011/12/13 06:58:08 sbd Exp $
 
 SHA1 (gdb-5.3.tar.gz) = 24a6c9da6e89b1b82b7508f27f94098d989ff662
 RMD160 (gdb-5.3.tar.gz) = 3f88dc11115de08708c50c73b10acaf00ed25e96
@@ -25,7 +25,9 @@ SHA1 (patch-bfd_po_Make-in) = 9e09652c95dbea0d7017102546c4e959abc199da
 SHA1 (patch-gdb_Makefile.in) = 229c14522ddf8f5ddfdd414d77be1ddefc5635db
 SHA1 (patch-gdb_doc_Makefile.in) = 44f1fc8db2f37dae1ba0db3ae1192ec8ef47f4a3
 SHA1 (patch-gdb_gdbserver_Makefile.in) = 00e0015600847401ecd4471afd53c7e5030e1f15
-SHA1 (patch-gdb_gdbserver_configure.in) = 064fc1e61fb5b301f4e8601f7754b38a444c2e97
+SHA1 (patch-gdb_gdbserver_config.in) = ca248b1dcc683c435806b4f40c29548fc613ec4c
+SHA1 (patch-gdb_gdbserver_configure) = 631e4e9d6c700710cfff7d3b5be1765cc0632ecb
+SHA1 (patch-gdb_gdbserver_configure.in) = 3a5a63f2a106495416bc07578d43ae40bf8ef40b
 SHA1 (patch-mmalloc_Makefile.in) = 1c45f0b326b838d442979e4ada45c0e5fc2da1c5
 SHA1 (patch-ob) = 52c017dfa9f535edc9520144efa8ef04a8020832
 SHA1 (patch-opcodes_po_Make-in) = c4f9d3d19a52acab6c18454b1ff95c9e1302c5bf
diff --git a/devel/gdb/patches/patch-gdb_gdbserver_config.in b/devel/gdb/patches/patch-gdb_gdbserver_config.in
new file mode 100644
index 00000000000..fb1163abe5e
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_gdbserver_config.in
@@ -0,0 +1,10 @@
+$NetBSD: patch-gdb_gdbserver_config.in,v 1.1 2011/12/13 06:58:08 sbd Exp $
+
+--- gdb/gdbserver/config.in.orig	2002-07-24 21:30:46.000000000 +0000
++++ gdb/gdbserver/config.in
+@@ -61,3 +61,5 @@
+ /* Define if <sys/procfs.h> has elf_fpregset_t. */
+ #undef HAVE_ELF_FPREGSET_T
+ 
++/* Define if you have the <stdlib.h> header file.  */
++#undef HAVE_STDLIB_H
diff --git a/devel/gdb/patches/patch-gdb_gdbserver_configure b/devel/gdb/patches/patch-gdb_gdbserver_configure
new file mode 100644
index 00000000000..3466ad130b9
--- /dev/null
+++ b/devel/gdb/patches/patch-gdb_gdbserver_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-gdb_gdbserver_configure,v 1.1 2011/12/13 06:58:08 sbd Exp $
+
+--- gdb/gdbserver/configure.orig	2002-07-24 21:30:46.000000000 +0000
++++ gdb/gdbserver/configure
+@@ -1105,7 +1105,7 @@ EOF
+ fi
+ 
+ 
+-for ac_hdr in sgtty.h termio.h termios.h sys/reg.h string.h 		 proc_service.h sys/procfs.h thread_db.h linux/elf.h unistd.h
++for ac_hdr in sgtty.h termio.h termios.h sys/reg.h string.h stdlib.h	 proc_service.h sys/procfs.h thread_db.h linux/elf.h unistd.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/devel/gdb/patches/patch-gdb_gdbserver_configure.in b/devel/gdb/patches/patch-gdb_gdbserver_configure.in
index deba95fa98b..3470826fc66 100644
--- a/devel/gdb/patches/patch-gdb_gdbserver_configure.in
+++ b/devel/gdb/patches/patch-gdb_gdbserver_configure.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-gdb_gdbserver_configure.in,v 1.1 2011/12/05 22:15:05 sbd Exp $
+$NetBSD: patch-gdb_gdbserver_configure.in,v 1.2 2011/12/13 06:58:08 sbd Exp $
 
 If <stdlib.h> is needed and its wrapped with HAVE_STDDLIB_H  it must be
 tested for by autoconf!
@@ -10,7 +10,7 @@ tested for by autoconf!
  AC_HEADER_STDC
  
 -AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl
-+AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h dnl stdlib.h
++AC_CHECK_HEADERS(sgtty.h termio.h termios.h sys/reg.h string.h stdlib.h dnl
  		 proc_service.h sys/procfs.h thread_db.h linux/elf.h unistd.h)
  
  . ${srcdir}/configure.srv