Add a configure check for getline, in order to build on netbsd current

4 files changed, 39 insertions, 4 deletions

diff --git a/wm/ratpoison/Makefile b/wm/ratpoison/Makefile
index 6b6f3cdf753..73d349710aa 100644
--- a/wm/ratpoison/Makefile
+++ b/wm/ratpoison/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2009/07/14 18:20:46 tonio Exp $
+# $NetBSD: Makefile,v 1.30 2009/09/01 18:19:15 tonio Exp $
 #
 
 DISTNAME=	ratpoison-1.4.5
-PKGNAME=	${DISTNAME:S/-beta/beta/}
 CATEGORIES=	wm
 MASTER_SITES=	http://savannah.nongnu.org/download/ratpoison/
 
@@ -16,12 +15,15 @@ GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
 INFO_FILES=		yes
 
-USE_TOOLS+=	perl:run pkg-config
+USE_TOOLS+=	perl:run pkg-config autoconf
 REPLACE_PERL+=	contrib/rpws contrib/genrpbindings contrib/clickframe.pl
 REPLACE_SH=	contrib/allwindows.sh
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
+pre-configure:
+	cd ${WRKSRC}; autoconf
+
 .include "../../devel/readline/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/wm/ratpoison/distinfo b/wm/ratpoison/distinfo
index e5d07c5e44e..3e21df2d0d1 100644
--- a/wm/ratpoison/distinfo
+++ b/wm/ratpoison/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.14 2009/07/14 18:20:46 tonio Exp $
+$NetBSD: distinfo,v 1.15 2009/09/01 18:19:15 tonio Exp $
 
 SHA1 (ratpoison-1.4.5.tar.gz) = e32430de49c4ab5d501653c03dd19dfb623cb08b
 RMD160 (ratpoison-1.4.5.tar.gz) = ae2fc0cd7ef561944cf7aea0623875a7148771ce
 Size (ratpoison-1.4.5.tar.gz) = 427366 bytes
+SHA1 (patch-aa) = d59e993da5ed8408665592df898b07a7c0edba13
+SHA1 (patch-ab) = 1e747e6b792fe627ba9699f1c6ce84d3d9842522
diff --git a/wm/ratpoison/patches/patch-aa b/wm/ratpoison/patches/patch-aa
new file mode 100644
index 00000000000..ec79003019f
--- /dev/null
+++ b/wm/ratpoison/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2009/09/01 18:19:15 tonio Exp $
+
+Check for getline
+
+--- configure.in.orig	2009-07-12 23:01:04.000000000 +0200
++++ configure.in
+@@ -146,7 +146,7 @@ AC_CHECK_HEADERS(unistd.h stdarg.h)
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ 
+ dnl Checks for library functions.
+-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
++AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep getline)
+ 
+ AC_TYPE_SIGNAL
+ 
diff --git a/wm/ratpoison/patches/patch-ab b/wm/ratpoison/patches/patch-ab
new file mode 100644
index 00000000000..8c3916b012a
--- /dev/null
+++ b/wm/ratpoison/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2009/09/01 18:19:15 tonio Exp $
+
+Check for getline
+
+--- src/config.h.in.orig	2009-07-12 14:07:02.000000000 +0200
++++ src/config.h.in
+@@ -3,6 +3,9 @@
+ /* Define this to enable debugging messages */
+ #undef DEBUG
+ 
++/* Define to 1 if you have the `getline' function. */
++#undef HAVE_GETLINE
++
+ /* Define to 1 if you have the `getopt' function. */
+ #undef HAVE_GETOPT
+