diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-09-20 14:50:49 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-09-20 14:50:49 +0000 |
commit | 059679d0ac793ce193c04357b675d861a6b4dd6b (patch) | |
tree | ddd769314493ad61d7f0017eb6a25a982de6f48e /editors/nvi | |
parent | 5e1868e54ae8a9c985fdf737ff14089c4db64ee4 (diff) | |
download | pkgsrc-059679d0ac793ce193c04357b675d861a6b4dd6b.tar.gz |
Fix build on SunOS with native curses.
* Detect isblank in configure script.
Diffstat (limited to 'editors/nvi')
-rw-r--r-- | editors/nvi/distinfo | 6 | ||||
-rw-r--r-- | editors/nvi/patches/patch-common_key.h | 15 | ||||
-rw-r--r-- | editors/nvi/patches/patch-dist_config.h.in | 16 | ||||
-rw-r--r-- | editors/nvi/patches/patch-dist_configure.in | 14 |
4 files changed, 47 insertions, 4 deletions
diff --git a/editors/nvi/distinfo b/editors/nvi/distinfo index 50f0b1010b0..d5d1322503c 100644 --- a/editors/nvi/distinfo +++ b/editors/nvi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2013/02/08 23:09:18 christos Exp $ +$NetBSD: distinfo,v 1.20 2013/09/20 14:50:49 ryoon Exp $ SHA1 (nvi-1.81.6.tar.bz2) = d3445ed69166102735335a2ff60d092d9a9143c6 RMD160 (nvi-1.81.6.tar.bz2) = 0db8568bea96392d9a027044177c60317c8ade36 @@ -34,6 +34,8 @@ SHA1 (patch-bb) = 5110c239cd1cc82cdd1eaeba6ceedb11ee797b26 SHA1 (patch-bc) = 6ac8377ae6f2fc513c058c0bf7f5ad18e97141a8 SHA1 (patch-bd) = 9a04f7a247fe6bf800469e81f7a83ffddd45b4b5 SHA1 (patch-common_conv.c) = efb2dabf226523a493fc1172013adc8021f4c2b9 +SHA1 (patch-common_key.h) = 29f8b89b41b087ff7c2e9a5483fb9e6d2291c750 SHA1 (patch-dist_Makefile.am) = ebae821ce659df003f5f2043f754e325c0863aff -SHA1 (patch-dist_configure.in) = 0834b7680d520937eb5a1503128ddb64297edadb +SHA1 (patch-dist_config.h.in) = 21568929b165d1e774e59d6c648e0af7b17760da +SHA1 (patch-dist_configure.in) = c7b70b1a93889f41d949a3ede034f30abc063b7b SHA1 (patch-ex_ex__script.c) = ac745c0481718ed8c769fb43ee990152902fa54e diff --git a/editors/nvi/patches/patch-common_key.h b/editors/nvi/patches/patch-common_key.h new file mode 100644 index 00000000000..3705ebaebbb --- /dev/null +++ b/editors/nvi/patches/patch-common_key.h @@ -0,0 +1,15 @@ +$NetBSD: patch-common_key.h,v 1.1 2013/09/20 14:50:49 ryoon Exp $ + +* Fix build on SunOS with native curses, detect isblank in configure script. + +--- common/key.h.orig 2007-11-18 16:41:42.000000000 +0000 ++++ common/key.h +@@ -205,7 +205,7 @@ extern KEYLIST keylist[]; + * XXX + * Note side effect, ch is evaluated multiple times. + */ +-#ifndef isblank ++#ifndef HAVE_ISBLANK + #define isblank(ch) ((ch) == ' ' || (ch) == '\t') + #endif + diff --git a/editors/nvi/patches/patch-dist_config.h.in b/editors/nvi/patches/patch-dist_config.h.in new file mode 100644 index 00000000000..1b92d69e643 --- /dev/null +++ b/editors/nvi/patches/patch-dist_config.h.in @@ -0,0 +1,16 @@ +$NetBSD: patch-dist_config.h.in,v 1.1 2013/09/20 14:50:49 ryoon Exp $ + +* Fix build on SunOS with native curses, detect isblank in configure script. + +--- dist/config.h.in.orig 2013-09-20 14:12:15.000000000 +0000 ++++ dist/config.h.in +@@ -145,6 +145,9 @@ + /* Define to 1 if you have the <inttypes.h> header file. */ + #undef HAVE_INTTYPES_H + ++/* Define to 1 if you have the `isblank' function. */ ++#undef HAVE_ISBLANK ++ + /* Define to 1 if you have the `iswblank' function. */ + #undef HAVE_ISWBLANK + diff --git a/editors/nvi/patches/patch-dist_configure.in b/editors/nvi/patches/patch-dist_configure.in index f793340aa87..ed02d739990 100644 --- a/editors/nvi/patches/patch-dist_configure.in +++ b/editors/nvi/patches/patch-dist_configure.in @@ -1,6 +1,8 @@ -$NetBSD: patch-dist_configure.in,v 1.1 2013/01/23 17:33:28 wiz Exp $ +$NetBSD: patch-dist_configure.in,v 1.2 2013/09/20 14:50:49 ryoon Exp $ First chunk: automake-1.13 compat. +Second: Fix build on SunOS with native cures, detect isblank in configure + script. Rest: ? --- dist/configure.in.orig 2007-11-18 16:41:42.000000000 +0000 @@ -14,7 +16,15 @@ Rest: ? dnl Configure setup. AC_PROG_INSTALL() -@@ -787,6 +787,8 @@ if test "$vi_cv_gettimeofday" = broken; +@@ -601,6 +601,7 @@ AC_CHECK_FUNCS(select) + AC_CHECK_FUNCS(setenv, [need_env=no], [need_env=yes]) + AC_CHECK_FUNCS(strsep, [need_strsep=no], [need_strsep=yes]) + AC_CHECK_FUNCS(unsetenv,, [need_env=yes]) ++AC_CHECK_FUNCS(isblank) + + AC_FUNC_MMAP + AC_FUNC_VFORK +@@ -787,6 +788,8 @@ if test "$vi_cv_gettimeofday" = broken; fi AC_MSG_RESULT($vi_cv_gettimeofday) |