Wed Apr 23 14:47:43 2014 UTC ()
Replace 'grep -o' calls with a portable sed call in configure.


(fhajny)
diff -r1.2 -r1.3 pkgsrc/devel/lua-posix/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/lua-posix/patches/patch-configure

cvs diff -r1.2 -r1.3 pkgsrc/devel/lua-posix/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/lua-posix/distinfo 2013/09/17 16:23:54 1.2
+++ pkgsrc/devel/lua-posix/distinfo 2014/04/23 14:47:43 1.3
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.2 2013/09/17 16:23:54 ryoon Exp $ 1$NetBSD: distinfo,v 1.3 2014/04/23 14:47:43 fhajny Exp $
2 2
3SHA1 (luaposix-release-v31.tar.gz) = 8cce36b34f7b1742b14e989f26f021e14053a6dd 3SHA1 (luaposix-release-v31.tar.gz) = 8cce36b34f7b1742b14e989f26f021e14053a6dd
4RMD160 (luaposix-release-v31.tar.gz) = 4a3f893f34a96570627a3840ac99a8088e230b82 4RMD160 (luaposix-release-v31.tar.gz) = 4a3f893f34a96570627a3840ac99a8088e230b82
5Size (luaposix-release-v31.tar.gz) = 528979 bytes 5Size (luaposix-release-v31.tar.gz) = 528979 bytes
6SHA1 (patch-config.h.in) = 37315685228cddfd6972c2d65684fdcfcf7407eb 6SHA1 (patch-config.h.in) = 37315685228cddfd6972c2d65684fdcfcf7407eb
7SHA1 (patch-configure) = 82e396c05fc2973181eb49b68ebdc0caf2c36d74 7SHA1 (patch-configure) = 4aa876d026793424eaf1d700012ae366cbc6d111
8SHA1 (patch-configure.ac) = ef891429af91c5e220bcd04e8b9a94e12a538cc3 8SHA1 (patch-configure.ac) = ef891429af91c5e220bcd04e8b9a94e12a538cc3
9SHA1 (patch-ext_curses_curses.c) = fd06c59d4d4f8f69eed4233a995841496e786d32 9SHA1 (patch-ext_curses_curses.c) = fd06c59d4d4f8f69eed4233a995841496e786d32
10SHA1 (patch-ext_posix_posix.c) = f2ec88b0be842af327c13c0898de1bfe0d165477 10SHA1 (patch-ext_posix_posix.c) = f2ec88b0be842af327c13c0898de1bfe0d165477

cvs diff -r1.1 -r1.2 pkgsrc/devel/lua-posix/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/devel/lua-posix/patches/Attic/patch-configure 2013/09/14 09:06:48 1.1
+++ pkgsrc/devel/lua-posix/patches/Attic/patch-configure 2014/04/23 14:47:43 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-configure,v 1.1 2013/09/14 09:06:48 ryoon Exp $ 1$NetBSD: patch-configure,v 1.2 2014/04/23 14:47:43 fhajny Exp $
2 2
3--- configure.orig 2013-09-09 07:15:14.000000000 +0000 3--- configure.orig 2013-09-09 07:15:14.000000000 +0000
4+++ configure 4+++ configure
5@@ -1899,6 +1899,52 @@ $as_echo "$ac_res" >&6; } 5@@ -1899,6 +1899,52 @@ $as_echo "$ac_res" >&6; }
6 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 6 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
7  7
8 } # ac_fn_c_check_func 8 } # ac_fn_c_check_func
9+ 9+
10+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES 10+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
11+# --------------------------------------------- 11+# ---------------------------------------------
12+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR 12+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
13+# accordingly. 13+# accordingly.
14+ac_fn_c_check_decl () 14+ac_fn_c_check_decl ()
@@ -83,13 +83,51 @@ $NetBSD: patch-configure,v 1.1 2013/09/1 @@ -83,13 +83,51 @@ $NetBSD: patch-configure,v 1.1 2013/09/1
83+ ac_have_decl=1 83+ ac_have_decl=1
84+else 84+else
85+ ac_have_decl=0 85+ ac_have_decl=0
86+fi 86+fi
87+ 87+
88+cat >>confdefs.h <<_ACEOF 88+cat >>confdefs.h <<_ACEOF
89+#define HAVE_DECL_AI_ALL $ac_have_decl 89+#define HAVE_DECL_AI_ALL $ac_have_decl
90+_ACEOF 90+_ACEOF
91+ 91+
92+ 92+
93 if test Darwin != `uname`; then 93 if test Darwin != `uname`; then
94 # FIXME: Make -lrt conditional on _XOPEN_REALTIME 94 # FIXME: Make -lrt conditional on _XOPEN_REALTIME
95 POSIX_EXTRA_CFLAGS=-D_XOPEN_SOURCE=700 95 POSIX_EXTRA_CFLAGS=-D_XOPEN_SOURCE=700
 96@@ -13690,7 +13758,7 @@ fi
 97 $as_echo_n "checking $_ax_check_text... " >&6; }
 98
 99 _ax_test_ver=`$LUA -e "print(_VERSION)" 2>/dev/null | \
 100- sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"`
 101+ sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
 102 if test "x$_ax_test_ver" = 'x'; then :
 103 _ax_test_ver='0'
 104 fi
 105@@ -13796,7 +13864,7 @@ fi
 106
 107
 108 _ax_test_ver=`$ax_cv_pathless_LUA -e "print(_VERSION)" 2>/dev/null | \
 109- sed "s|^Lua \(.*\)|\1|" | grep -o "^[0-9]\+\\.[0-9]\+"`
 110+ sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
 111 if test "x$_ax_test_ver" = 'x'; then :
 112 _ax_test_ver='0'
 113 fi
 114@@ -13941,8 +14009,7 @@ if ${ax_cv_lua_version+:} false; then :
 115 $as_echo_n "(cached) " >&6
 116 else
 117 ax_cv_lua_version=`$LUA -e "print(_VERSION)" | \
 118- sed "s|^Lua \(.*\)|\1|" | \
 119- grep -o "^[0-9]\+\\.[0-9]\+"`
 120+ sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
 121
 122 fi
 123 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lua_version" >&5
 124@@ -14181,8 +14248,7 @@ int main(int argc, char ** argv)
 125 _ACEOF
 126 if ac_fn_c_try_run "$LINENO"; then :
 127 ax_cv_lua_header_version=`./conftest$EXEEXT p | \
 128- sed "s|^Lua \(.*\)|\1|" | \
 129- grep -o "^[0-9]\+\\.[0-9]\+"`
 130+ sed "s|^Lua \([0-9]*\.[0-9]*\)|\1|"`
 131
 132 else
 133 ax_cv_lua_header_version='unknown'