Tue Sep 1 18:19:15 2009 UTC ()
Add a configure check for getline, in order to build on netbsd current


(tonio)
diff -r1.29 -r1.30 pkgsrc/wm/ratpoison/Makefile
diff -r1.14 -r1.15 pkgsrc/wm/ratpoison/distinfo
diff -r0 -r1.5 pkgsrc/wm/ratpoison/patches/patch-aa
diff -r0 -r1.1 pkgsrc/wm/ratpoison/patches/patch-ab
cvs diff -r1.29 -r1.30 pkgsrc/wm/ratpoison/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/ratpoison/Makefile 2009/07/14 18:20:46 1.29
+++ pkgsrc/wm/ratpoison/Makefile 2009/09/01 18:19:15 1.30
@@ -1,32 +1,34 @@ @@ -1,32 +1,34 @@
1# $NetBSD: Makefile,v 1.29 2009/07/14 18:20:46 tonio Exp $ 1# $NetBSD: Makefile,v 1.30 2009/09/01 18:19:15 tonio Exp $
2# 2#
3 3
4DISTNAME= ratpoison-1.4.5 4DISTNAME= ratpoison-1.4.5
5PKGNAME= ${DISTNAME:S/-beta/beta/} 
6CATEGORIES= wm 5CATEGORIES= wm
7MASTER_SITES= http://savannah.nongnu.org/download/ratpoison/ 6MASTER_SITES= http://savannah.nongnu.org/download/ratpoison/
8 7
9MAINTAINER= tonio@NetBSD.org 8MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://www.nongnu.org/ratpoison/ 9HOMEPAGE= http://www.nongnu.org/ratpoison/
11COMMENT= Simple window manager with no fat library dependencies 10COMMENT= Simple window manager with no fat library dependencies
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15GNU_CONFIGURE= YES 14GNU_CONFIGURE= YES
16USE_GNU_READLINE= YES 15USE_GNU_READLINE= YES
17INFO_FILES= yes 16INFO_FILES= yes
18 17
19USE_TOOLS+= perl:run pkg-config 18USE_TOOLS+= perl:run pkg-config autoconf
20REPLACE_PERL+= contrib/rpws contrib/genrpbindings contrib/clickframe.pl 19REPLACE_PERL+= contrib/rpws contrib/genrpbindings contrib/clickframe.pl
21REPLACE_SH= contrib/allwindows.sh 20REPLACE_SH= contrib/allwindows.sh
22 21
23BUILDLINK_DEPMETHOD.libXt?= build 22BUILDLINK_DEPMETHOD.libXt?= build
24 23
 24pre-configure:
 25 cd ${WRKSRC}; autoconf
 26
25.include "../../devel/readline/buildlink3.mk" 27.include "../../devel/readline/buildlink3.mk"
26.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
27.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
28.include "../../x11/libXinerama/buildlink3.mk" 30.include "../../x11/libXinerama/buildlink3.mk"
29.include "../../x11/libXt/buildlink3.mk" 31.include "../../x11/libXt/buildlink3.mk"
30.include "../../x11/libXtst/buildlink3.mk" 32.include "../../x11/libXtst/buildlink3.mk"
31.include "../../x11/libXft/buildlink3.mk" 33.include "../../x11/libXft/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/wm/ratpoison/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/ratpoison/distinfo 2009/07/14 18:20:46 1.14
+++ pkgsrc/wm/ratpoison/distinfo 2009/09/01 18:19:15 1.15
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
1$NetBSD: distinfo,v 1.14 2009/07/14 18:20:46 tonio Exp $ 1$NetBSD: distinfo,v 1.15 2009/09/01 18:19:15 tonio Exp $
2 2
3SHA1 (ratpoison-1.4.5.tar.gz) = e32430de49c4ab5d501653c03dd19dfb623cb08b 3SHA1 (ratpoison-1.4.5.tar.gz) = e32430de49c4ab5d501653c03dd19dfb623cb08b
4RMD160 (ratpoison-1.4.5.tar.gz) = ae2fc0cd7ef561944cf7aea0623875a7148771ce 4RMD160 (ratpoison-1.4.5.tar.gz) = ae2fc0cd7ef561944cf7aea0623875a7148771ce
5Size (ratpoison-1.4.5.tar.gz) = 427366 bytes 5Size (ratpoison-1.4.5.tar.gz) = 427366 bytes
 6SHA1 (patch-aa) = d59e993da5ed8408665592df898b07a7c0edba13
 7SHA1 (patch-ab) = 1e747e6b792fe627ba9699f1c6ce84d3d9842522
File Added: pkgsrc/wm/ratpoison/patches/Attic/patch-aa
$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
File Added: pkgsrc/wm/ratpoison/patches/Attic/patch-ab
$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