diff options
| author | taca <taca@pkgsrc.org> | 2006-12-13 10:55:51 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2006-12-13 10:55:51 +0000 |
| commit | c459614bc8d11fe6c4eb6d18829e0d072930d2a4 (patch) | |
| tree | a4f02b75bf9389c872730dca32ecc0a6b779ec25 | |
| parent | 3c9fce044e4ee0e5e06da72fdc5badd8e59b1f4e (diff) | |
| download | pkgsrc-c459614bc8d11fe6c4eb6d18829e0d072930d2a4.tar.gz | |
Improve checking of some "rl_*" gnu readline compatible functions.
It should fix PR pkg/35244.
Bump PKGREVISION.
| -rw-r--r-- | devel/ruby-readline/Makefile | 3 | ||||
| -rw-r--r-- | devel/ruby-readline/distinfo | 5 | ||||
| -rw-r--r-- | devel/ruby-readline/patches/patch-aa | 9 | ||||
| -rw-r--r-- | devel/ruby-readline/patches/patch-ab | 16 |
4 files changed, 26 insertions, 7 deletions
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile index f436112804b..d4a25b150a9 100644 --- a/devel/ruby-readline/Makefile +++ b/devel/ruby-readline/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2006/12/06 16:31:34 taca Exp $ +# $NetBSD: Makefile,v 1.21 2006/12/13 10:55:51 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-readline-${RUBY_VERSION_SUFFIX} +PKGREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/devel/ruby-readline/distinfo b/devel/ruby-readline/distinfo index 217831d7bb3..4f5ca2a3d8c 100644 --- a/devel/ruby-readline/distinfo +++ b/devel/ruby-readline/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2006/12/06 16:31:34 taca Exp $ +$NetBSD: distinfo,v 1.14 2006/12/13 10:55:51 taca Exp $ SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6 Size (ruby-1.8.5.tar.gz) = 4438603 bytes -SHA1 (patch-aa) = d13708667777361c792710c78f0a991ea1d6250f +SHA1 (patch-aa) = bd3df7b0e1be643bb449b6c5e15d95a39a812479 +SHA1 (patch-ab) = 10a72f16b5e24eb8a29e0b8ce1904a36614d0aa8 diff --git a/devel/ruby-readline/patches/patch-aa b/devel/ruby-readline/patches/patch-aa index c03cb2ed7e3..75a9a0fdab2 100644 --- a/devel/ruby-readline/patches/patch-aa +++ b/devel/ruby-readline/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2006/12/06 16:31:34 taca Exp $ +$NetBSD: patch-aa,v 1.6 2006/12/13 10:55:51 taca Exp $ This patch is generated with "diff -u -U 2". @@ -20,11 +20,12 @@ This patch is generated with "diff -u -U 2". if enable_libedit unless (have_readline_header("editline/readline.h") || -@@ -42,7 +39,6 @@ else - end +@@ -43,6 +40,8 @@ else end --have_readline_var("rl_filename_completion_function") + have_readline_var("rl_filename_completion_function") ++have_readline_var("rl_username_completion_function") ++have_readline_var("rl_completion_matches") have_readline_var("rl_deprep_term_function") have_readline_var("rl_completion_append_character") have_readline_var("rl_basic_word_break_characters") diff --git a/devel/ruby-readline/patches/patch-ab b/devel/ruby-readline/patches/patch-ab new file mode 100644 index 00000000000..ae302bb5765 --- /dev/null +++ b/devel/ruby-readline/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1 2006/12/13 10:55:51 taca Exp $ + +--- readline.c.orig 2006-08-07 18:01:27.000000000 +0900 ++++ readline.c +@@ -34,7 +34,11 @@ static ID completion_proc, completion_ca + + #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION + # define rl_filename_completion_function filename_completion_function ++#endif ++#ifndef HAVE_RLUSERNAME_COMPLETION_FUNCTION + # define rl_username_completion_function username_completion_function ++#endif ++#ifndef HAVE_RL_COMPLETION_MATCHES + # define rl_completion_matches completion_matches + #endif + |