Fri Sep 10 05:56:35 2010 UTC ()
* Update HOMEPAGE.
* Add LICENSE.
* Add a patch to support both ruby18 and ruby19.


(taca)
diff -r1.2 -r1.3 pkgsrc/devel/ruby-memcache/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/ruby-memcache/distinfo
diff -r0 -r1.1 pkgsrc/devel/ruby-memcache/patches/patch-aa

cvs diff -r1.2 -r1.3 pkgsrc/devel/ruby-memcache/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-memcache/Makefile 2008/06/19 14:47:42 1.2
+++ pkgsrc/devel/ruby-memcache/Makefile 2010/09/10 05:56:34 1.3
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2008/06/19 14:47:42 taca Exp $ 1# $NetBSD: Makefile,v 1.3 2010/09/10 05:56:34 taca Exp $
2 2
3DISTNAME= ruby-memcache-0.1.0 3DISTNAME= ruby-memcache-0.1.0
4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//} 4PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://rubyforge.org/frs/download.php/2484/ 7MASTER_SITES= http://rubyforge.org/frs/download.php/2484/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
 11HOMEPAGE= http://rubyforge.org/projects/memcache/
11COMMENT= Ruby wrapper for memcache 12COMMENT= Ruby wrapper for memcache
 13LICENSE= mit
12 14
13PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
14 16
15USE_RUBY_EXTCONF= yes 17USE_RUBY_EXTCONF= yes
16 18
17.include "../../lang/ruby/modules.mk" 19.include "../../lang/ruby/modules.mk"
18 20
19.include "../../devel/libmemcache/buildlink3.mk" 21.include "../../devel/libmemcache/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/ruby-memcache/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ruby-memcache/distinfo 2008/04/04 15:28:10 1.1.1.1
+++ pkgsrc/devel/ruby-memcache/distinfo 2010/09/10 05:56:34 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2008/04/04 15:28:10 jlam Exp $ 1$NetBSD: distinfo,v 1.2 2010/09/10 05:56:34 taca Exp $
2 2
3SHA1 (ruby-memcache-0.1.0.tar.bz2) = fa2d88e84f49a8662f466b87ce749a4c58aa4f27 3SHA1 (ruby-memcache-0.1.0.tar.bz2) = fa2d88e84f49a8662f466b87ce749a4c58aa4f27
4RMD160 (ruby-memcache-0.1.0.tar.bz2) = 3aa4371c0b1da76a96cafa0a509028cdcd03083a 4RMD160 (ruby-memcache-0.1.0.tar.bz2) = 3aa4371c0b1da76a96cafa0a509028cdcd03083a
5Size (ruby-memcache-0.1.0.tar.bz2) = 6237 bytes 5Size (ruby-memcache-0.1.0.tar.bz2) = 6237 bytes
 6SHA1 (patch-aa) = 9c0d7429ca91b9d1b1f8cc4a6148b646f784095e

File Added: pkgsrc/devel/ruby-memcache/patches/patch-aa
$NetBSD: patch-aa,v 1.1 2010/09/10 05:56:34 taca Exp $

Use modern Ruby's API.

--- memcache.c.orig	2005-01-05 07:52:43.000000000 +0000
+++ memcache.c
@@ -114,7 +114,7 @@ rb_memcache_decr(const int argc, const V
     rb_raise(rb_eArgError, "wrong number of arguments (1-2 args required)");
   }
 
-  return UINT2NUM(mc_decr(mc, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len, 1));
+  return UINT2NUM(mc_decr(mc, RSTRING_PTR(argv[0]), RSTRING_LEN(argv[0]), 1));
 }
 
 
@@ -137,7 +137,7 @@ rb_memcache_delete(const int argc, const
     rb_raise(rb_eArgError, "wrong number of arguments (1-2 args required)");
   }
 
-  return UINT2NUM(mc_delete(mc, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len, hold));
+  return UINT2NUM(mc_delete(mc, RSTRING_PTR(argv[0]), RSTRING_LEN(argv[0]), hold));
 }
 
 
@@ -183,7 +183,7 @@ rb_memcache_get(VALUE self, const VALUE 
   Data_Get_Struct(self, struct memcache, mc);
 
   req = mc_req_new();
-  res = mc_req_add(req, RSTRING(key)->ptr, RSTRING(key)->len);
+  res = mc_req_add(req, RSTRING_PTR(key), RSTRING_LEN(key));
   mc_res_free_on_delete(res, 0);
   mc_get(mc, req);
 
@@ -218,7 +218,7 @@ rb_memcache_get_array(const int argc, co
   ret = rb_ary_new2(argc);
   req = mc_req_new();
   for (i = 0; i < (u_int32_t)argc; i++) {
-    res = mc_req_add(req, RSTRING(argv[i])->ptr, RSTRING(argv[0])->len);
+    res = mc_req_add(req, RSTRING_PTR(argv[i]), RSTRING_LEN(argv[0]));
     mc_res_free_on_delete(res, 0);
   }
 
@@ -254,7 +254,7 @@ rb_memcache_get_hash(const int argc, con
   ret = rb_hash_new();
   req = mc_req_new();
   for (i = 0; i < (u_int32_t)argc; i++) {
-    res = mc_req_add(req, RSTRING(argv[i])->ptr, RSTRING(argv[0])->len);
+    res = mc_req_add(req, RSTRING_PTR(argv[i]), RSTRING_LEN(argv[0]));
     mc_res_free_on_delete(res, 0);
   }
 
@@ -275,7 +275,7 @@ rb_memcache_get_hash(const int argc, con
 
 static VALUE
 rb_memcache_hash(VALUE self, const VALUE str) {
-  return UINT2NUM(mc_hash_key(RSTRING(str)->ptr, RSTRING(str)->len));
+  return UINT2NUM(mc_hash_key(RSTRING_PTR(str), RSTRING_LEN(str)));
 }
 
 
@@ -298,7 +298,7 @@ rb_memcache_incr(const int argc, const V
     rb_raise(rb_eArgError, "wrong number of arguments (1-2 args required)");
   }
 
-  return UINT2NUM(mc_incr(mc, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len, 1));
+  return UINT2NUM(mc_incr(mc, RSTRING_PTR(argv[0]), RSTRING_LEN(argv[0]), 1));
 }
 
 
@@ -398,14 +398,14 @@ rb_memcache_server_add(const int argc, V
       return INT2FIX(mc_server_add3(mc, ms));
     default:
       host = StringValue(argv[0]);
-      return INT2FIX(mc_server_add4(mc, RSTRING(host)->ptr));
+      return INT2FIX(mc_server_add4(mc, RSTRING_PTR(host)));
     }
 
   case 2:
     host = StringValue(argv[0]);
     port = StringValue(argv[1]);
-    return INT2FIX(mc_server_add2(mc, RSTRING(host)->ptr, RSTRING(host)->len,
-				  RSTRING(port)->ptr, RSTRING(port)->len));
+    return INT2FIX(mc_server_add2(mc, RSTRING_PTR(host), RSTRING_LEN(host),
+				  RSTRING_PTR(port), RSTRING_LEN(port)));
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (1 or 2 args required)");
   }
@@ -567,8 +567,8 @@ rb_memcache_set_cmd(const int argc, VALU
     case T_STRING:
       flags |= RBMC_DATA_STRING;
       tmp = StringValue(argv[1]);
-      val_len = RSTRING(tmp)->len;
-      val = RSTRING(tmp)->ptr;
+      val_len = RSTRING_LEN(tmp);
+      val = RSTRING_PTR(tmp);
       break;
     case T_NIL:
       flags |= RBMC_DATA_NIL;
@@ -578,14 +578,14 @@ rb_memcache_set_cmd(const int argc, VALU
     case T_FLOAT:
       flags |= RBMC_DATA_FLOAT;
       tmp = StringValue(argv[1]);
-      val_len = RSTRING(tmp)->len;
-      val = RSTRING(tmp)->ptr;
+      val_len = RSTRING_LEN(tmp);
+      val = RSTRING_PTR(tmp);
       break;
     case T_FIXNUM:
       flags |= RBMC_DATA_FIXNUM;
       tmp = StringValue(argv[1]);
-      val_len = RSTRING(tmp)->len;
-      val = RSTRING(tmp)->ptr;
+      val_len = RSTRING_LEN(tmp);
+      val = RSTRING_PTR(tmp);
       break;
     case T_TRUE:
       flags |= RBMC_DATA_BOOL;
@@ -602,14 +602,14 @@ rb_memcache_set_cmd(const int argc, VALU
        * RBMC_DATA_MARSHAL */
       flags |= RBMC_DATA_MARSHAL;
       tmp = rb_marshal_dump(argv[1], Qnil);
-      val_len = RSTRING(tmp)->len;
-      val = RSTRING(tmp)->ptr;
+      val_len = RSTRING_LEN(tmp);
+      val = RSTRING_PTR(tmp);
     }
   case 1:
     /* key */
     tmp = StringValue(argv[0]);
-    key_len = RSTRING(tmp)->len;
-    key = RSTRING(tmp)->ptr;
+    key_len = RSTRING_LEN(tmp);
+    key = RSTRING_PTR(tmp);
     break;
   default:
     rb_raise(rb_eArgError, "wrong number of arguments (1-3 args required)");