cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ruby-cdb to 0.5a and kill off patch now incorporated in upstream

Browse Source 
repo.  Also fix on amd64 by compiling subport, cdb, with -fPIC.  Given
this is required for other amd64 ports that could potentially link against
cdb, fix this in databases/cdb instead of just ruby-cdb.
This commit is contained in:
Sean Chittenden 2006-02-21 07:29:43 +00:00
parent 5f6550b0cf
commit 32be164d05
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=156559
4 changed files with 8 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/cdb/Makefile
View File

@ -15,6 +15,10 @@ COMMENT= A fast lookup database library & utilities
ALL_TARGET= it
.if ${ARCH} == "amd64"
CFLAGS+= -fPIC
.endif
do-configure:
@${MV} ${WRKSRC}/conf-home ${WRKSRC}/conf-home.orig
${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home

8
databases/ruby-cdb/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= cdb
PORTVERSION= 0.4
PORTREVISION= 1
PORTVERSION= 0.5a
CATEGORIES= databases ruby
MASTER_SITES= http://www.fan.gr.jp/~kaz/ruby/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@ -24,15 +23,10 @@ USE_RUBY_EXTCONF= yes
CDB_PORTDIR= ${PORTSDIR}/databases/cdb
WRKSRC= ${WRKDIR}/ruby-${PORTNAME}
INSTALL_TARGET= site-install
.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
BROKEN= "Does not build on amd64 (needs to link against shared libraries)"
.endif
post-extract:
${RM} -f ${WRKSRC}/cdb
${LN} -s `cd ${CDB_PORTDIR}; ${MAKE} -V WRKSRC` ${WRKSRC}/cdb

6
databases/ruby-cdb/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ruby/ruby-cdb-0.4.tar.gz) = 6b06fe7103e5a155d6a0a47f2596b7de
SHA256 (ruby/ruby-cdb-0.4.tar.gz) = 2c95476267663ee307457dd682d7b3b1474847004ac7bacea087efa4138b84b2
SIZE (ruby/ruby-cdb-0.4.tar.gz) = 58737
MD5 (ruby/ruby-cdb-0.5a.tar.gz) = 3e0cb1d48008e852ad740a15358653d4
SHA256 (ruby/ruby-cdb-0.5a.tar.gz) = 8b6b84d596eab9f994d2647b7a84c6cc4dee3f38b59c4d0064448252caf78316
SIZE (ruby/ruby-cdb-0.5a.tar.gz) = 60029

48
databases/ruby-cdb/files/patch-cdb.c
View File

@ -1,48 +0,0 @@
--- cdb.c.orig Sat Nov 16 01:01:11 2002
+++ cdb.c Sat Nov 16 01:20:25 2002
@@ -140,11 +140,11 @@
char *k;
struct cdb *cdb;
uint32 pos;
- unsigned int len;
+ long len;
Get_CDB(obj, cdb);
Check_FD(cdb);
- k = str2cstr(key, &len);
+ k = rb_str2cstr(key, &len);
switch (cdb_find(cdb, k, len)) {
case 1:
return _cdb_read(cdb, cdb_datapos(cdb), cdb_datalen(cdb));
@@ -178,13 +178,13 @@
char *k;
VALUE key;
struct cdb *cdb;
- unsigned int len;
+ long len;
Get_CDB(obj, cdb);
Check_FD(cdb);
if (rb_scan_args(argc, argv, "01", &key) == 1) {
- k = str2cstr(key, &len);
+ k = rb_str2cstr(key, &len);
cdb_findstart(cdb);
while ((ret = cdb_findnext(cdb, k, len)) == 1)
@@ -330,12 +330,12 @@
{
struct cdb_make *cdb;
char *k, *d;
- unsigned int klen, dlen;
+ long klen, dlen;
Get_CDBMake(obj, cdb);
Check_FD(cdb);
- k = str2cstr(key, &klen);
- d = str2cstr(data, &dlen);
+ k = rb_str2cstr(key, &klen);
+ d = rb_str2cstr(data, &dlen);
if (cdb_make_add(cdb, k, klen, d, dlen) == -1) rb_sys_fail(0);
return obj;