diff options
| author | jperkin <jperkin> | 2013-12-12 22:54:36 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2013-12-12 22:54:36 +0000 |
| commit | e2d33943ce1d6a100209a32e73184227a8a66525 (patch) | |
| tree | 12b30f4e7afbf4a5b0f1ae51f9213b9d61b0c9ad /devel/ruby-ncurses | |
| parent | 94fdb76fe3574b50d9a8fd05cbff7264e81300be (diff) | |
| download | pkgsrc-e2d33943ce1d6a100209a32e73184227a8a66525.tar.gz | |
SunOS libform does not have TYPE_IPV4, disable it.
Diffstat (limited to 'devel/ruby-ncurses')
| -rw-r--r-- | devel/ruby-ncurses/distinfo | 4 | ||||
| -rw-r--r-- | devel/ruby-ncurses/patches/patch-ab | 28 |
2 files changed, 26 insertions, 6 deletions
diff --git a/devel/ruby-ncurses/distinfo b/devel/ruby-ncurses/distinfo index cd67e7311af..62ba8090209 100644 --- a/devel/ruby-ncurses/distinfo +++ b/devel/ruby-ncurses/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2012/05/20 17:32:34 marino Exp $ +$NetBSD: distinfo,v 1.7 2013/12/12 22:54:36 jperkin Exp $ SHA1 (ncurses-ruby-1.2.4.tar.bz2) = b34ff1cf1147ab551855a5b2c63d2a034119fee2 RMD160 (ncurses-ruby-1.2.4.tar.bz2) = 8f08b6c919abdcd6c86fc9d08e293ca3e79ec010 Size (ncurses-ruby-1.2.4.tar.bz2) = 50858 bytes SHA1 (patch-aa) = e5e00403d95a8460b08a86285d2c27dd7e610a75 -SHA1 (patch-ab) = 53d40b6a1e2e12826249dba3c9d9c7c3d1d39afb +SHA1 (patch-ab) = 0892f6c1c5becda387c5f44085638d90133fd573 SHA1 (patch-ac) = 89d744e62122cd6a8054f69f54e360aaa731e15e diff --git a/devel/ruby-ncurses/patches/patch-ab b/devel/ruby-ncurses/patches/patch-ab index 53a9913f238..64094592a1e 100644 --- a/devel/ruby-ncurses/patches/patch-ab +++ b/devel/ruby-ncurses/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2010/09/10 06:02:58 taca Exp $ +$NetBSD: patch-ab,v 1.2 2013/12/12 22:54:36 jperkin Exp $ + +Disable TYPE_IPV4 on SunOS. --- form_wrap.c.orig 2009-07-31 10:52:36.000000000 +0000 +++ form_wrap.c @@ -18,16 +20,24 @@ $NetBSD: patch-ab,v 1.1 2010/09/10 06:02:58 taca Exp $ } list[n] = NULL; return INT2NUM(set_field_type(field, ftype, -@@ -652,7 +654,7 @@ static VALUE rbncurs_c_set_field_type(in +@@ -652,13 +654,15 @@ static VALUE rbncurs_c_set_field_type(in if (argc != 2) rb_raise(rb_eArgError, "TYPE_REGEXP requires one additional argument"); return INT2NUM(set_field_type(field, ftype, - STR2CSTR(arg3))); + StringValue(arg3))); } ++#ifndef __sun else if (ftype == TYPE_IPV4){ if (argc != 1) -@@ -740,7 +742,7 @@ static VALUE rbncurs_m_field_pad(VALUE d + rb_raise(rb_eArgError, "TYPE_IPV4 has no additional arguments"); + return INT2NUM(set_field_type(field, ftype)); + } ++#endif + else { + /* It is a user-defined field type. */ + /* Will store the arguments associated with this field */ +@@ -740,7 +744,7 @@ static VALUE rbncurs_m_field_pad(VALUE d */ static VALUE rbncurs_c_set_field_buffer(VALUE rb_field, VALUE buf, VALUE value) { FIELD* field = get_field(rb_field); @@ -36,7 +46,7 @@ $NetBSD: patch-ab,v 1.1 2010/09/10 06:02:58 taca Exp $ } static VALUE rbncurs_m_set_field_buffer(VALUE dummy, VALUE rb_field, VALUE buf, VALUE value) { return rbncurs_c_set_field_buffer(rb_field, buf, value); } -@@ -1044,13 +1046,15 @@ static VALUE rbncurs_m_form_opts(VALUE d +@@ -1044,13 +1048,15 @@ static VALUE rbncurs_m_form_opts(VALUE d * form_requestname */ static VALUE rbncurs_c_form_request_name(VALUE request) { @@ -54,3 +64,13 @@ $NetBSD: patch-ab,v 1.1 2010/09/10 06:02:58 taca Exp $ } static VALUE rbncurs_m_form_request_by_name(VALUE dummy, VALUE name) { return rbncurs_c_form_request_by_name(name); } +@@ -1442,7 +1448,9 @@ void init_form(void) + rb_define_const(mForm, "TYPE_INTEGER", wrap_fieldtype(TYPE_INTEGER)); + rb_define_const(mForm, "TYPE_NUMERIC", wrap_fieldtype(TYPE_NUMERIC)); + rb_define_const(mForm, "TYPE_REGEXP", wrap_fieldtype(TYPE_REGEXP)); ++#ifndef __sun + rb_define_const(mForm, "TYPE_IPV4", wrap_fieldtype(TYPE_IPV4)); ++#endif + + } + |