10 files changed, 159 insertions, 42 deletions

diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile
index 9e8a6e819330..fac0cd542a74 100644
--- a/databases/ruby-qdbm/Makefile
+++ b/databases/ruby-qdbm/Makefile
@@ -1,21 +1,40 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTNAME=	qdbm
+PORTVERSION=	1.8.78
+PORTREVISION=	4
+CATEGORIES=	databases
+MASTER_SITES=	http://fallabs.com/qdbm/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ruby API for QDBM
 
-SLAVEPORT=	ruby
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
-USES=		shebangfix
+LIB_DEPENDS=	libqdbm.so:${PORTSDIR}/databases/qdbm
+
+USES=		iconv shebangfix
 SHEBANG_FILES=	curia/rbcrtest depot/rbdptest myrbdoc villa/rbvltest
 USE_RUBY=	yes
-
-MASTERDIR=	${.CURDIR}/../../databases/qdbm
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ruby
-PLIST=		${.CURDIR}/pkg-plist
-DESCR=		${.CURDIR}/pkg-descr
-PATCHDIR=	${.CURDIR}/files
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	ac_cv_lib_iconv_main=yes
+MAKE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		LOCALBASE="${LOCALBASE}"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-configure:
+	cd ${WRKSRC} && ${SETENV} RB_USER_INSTALL=yes ${MAKE_ENV} \
+	    ${MAKE} configure
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/mod_depot.so \
+	    ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/mod_curia.so \
+	    ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/mod_villa.so
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/databases/ruby-qdbm/distinfo b/databases/ruby-qdbm/distinfo
new file mode 100644
index 000000000000..228da51ef275
--- /dev/null
+++ b/databases/ruby-qdbm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (qdbm-1.8.78.tar.gz) = b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e
+SIZE (qdbm-1.8.78.tar.gz) = 1015429
diff --git a/databases/ruby-qdbm/files/patch-Makefile.in b/databases/ruby-qdbm/files/patch-Makefile.in
index bd4099a5c5cb..155ffe9d5a9f 100644
--- a/databases/ruby-qdbm/files/patch-Makefile.in
+++ b/databases/ruby-qdbm/files/patch-Makefile.in
@@ -1,11 +1,36 @@
---- Makefile.in.orig	2006-09-06 03:37:33.000000000 +0000
-+++ Makefile.in	2011-07-21 03:18:15.000000000 +0000
-@@ -54,7 +54,7 @@
- 	rm -rf casket *~
+--- Makefile.in.orig	2006-09-06 03:37:33 UTC
++++ Makefile.in
+@@ -25,7 +25,7 @@ MYDATADIR = @datadir@/$(PACKAGE)/ruby
+ DESTDIR =
  
+ # Building binaries
+-RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib
++RUNENV =
  
--install :
-+install : all
- 	cd depot ; make install
- 	cd curia ; make install
- 	cd villa ; make install
+ 
+ 
+@@ -34,15 +34,16 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
+ #================================================================
+ 
+ 
+-all :
+-	cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+-	cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+-	cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+-	@printf '\n'
+-	@printf '#================================================================\n'
+-	@printf '# Ready to install.\n'
+-	@printf '#================================================================\n'
++all:
++	for d in depot curia villa; do \
++		(cd $$d && ${MAKE} all); \
++	done
+ 
++.PHONY: configure
++configure:
++	for d in depot curia villa; do \
++		(cd $$d && ${LOCALBASE}/bin/ruby extconf.rb); \
++	done
+ 
+ clean :
+ 	cd depot ; if [ -f Makefile ] ; then $(RUNENV) make -i clean ; fi || true
diff --git a/databases/ruby-qdbm/files/patch-curia-extconf.rb b/databases/ruby-qdbm/files/patch-curia-extconf.rb
new file mode 100644
index 000000000000..d5854826ce06
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-curia-extconf.rb
@@ -0,0 +1,23 @@
+--- curia/extconf.rb.orig	2006-01-17 08:27:00 UTC
++++ curia/extconf.rb
+@@ -2,17 +2,15 @@ require 'mkmf'
+ 
+ dir_config("curia")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS = ENV['CFLAGS']
++$LDFLAGS = ENV['LDFLAGS']
++$LIBS = ENV['LIBS']
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+ have_library("z", "main")
+ have_library("bz2", "main")
+ have_library("lzo2", "main")
+-have_library("iconv", "main")
+ have_library("qdbm", "main")
+ 
+ create_makefile("mod_curia")
diff --git a/databases/ruby-qdbm/files/patch-curia-mod_curia.c b/databases/ruby-qdbm/files/patch-curia-mod_curia.c
index ba66f77bac2c..72f62bf7c6a2 100644
--- a/databases/ruby-qdbm/files/patch-curia-mod_curia.c
+++ b/databases/ruby-qdbm/files/patch-curia-mod_curia.c
@@ -1,6 +1,6 @@
---- curia/mod_curia.c.orig	2014-03-29 18:35:17.000000000 +0100
-+++ curia/mod_curia.c	2014-03-29 18:37:22.000000000 +0100
-@@ -233,7 +233,7 @@
+--- curia/mod_curia.c.orig	2006-09-25 12:26:06 UTC
++++ curia/mod_curia.c
+@@ -233,7 +233,7 @@ static VALUE rbcropen(VALUE vself, VALUE
    const char *name;
    int index, omode, bnum, dnum;
    if((index = getnewindex()) == -1) myerror(DP_EMISC);
@@ -9,7 +9,7 @@
    FIXNUM_P(vomode);
    omode = FIX2INT(vomode);
    FIXNUM_P(vbnum);
-@@ -276,10 +276,10 @@
+@@ -276,10 +276,10 @@ static VALUE rbcrput(VALUE vself, VALUE 
    int index, ksiz, vsiz, dmode;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -24,7 +24,7 @@
    FIXNUM_P(vdmode);
    dmode = FIX2INT(vdmode);
    curia = crtable[index];
-@@ -297,8 +297,8 @@
+@@ -297,8 +297,8 @@ static VALUE rbcrout(VALUE vself, VALUE 
    int index, ksiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -35,7 +35,7 @@
    curia = crtable[index];
    if(!crout(curia, kbuf, ksiz)){
      if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
-@@ -316,8 +316,8 @@
+@@ -316,8 +316,8 @@ static VALUE rbcrget(VALUE vself, VALUE 
    VALUE vval;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -46,7 +46,7 @@
    FIXNUM_P(vstart);
    start = FIX2INT(vstart);
    FIXNUM_P(vmax);
-@@ -339,8 +339,8 @@
+@@ -339,8 +339,8 @@ static VALUE rbcrvsiz(VALUE vself, VALUE
    int index, ksiz, vsiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
diff --git a/databases/ruby-qdbm/files/patch-depot-extconf.rb b/databases/ruby-qdbm/files/patch-depot-extconf.rb
new file mode 100644
index 000000000000..38afaff4659d
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-depot-extconf.rb
@@ -0,0 +1,23 @@
+--- depot/extconf.rb.orig	2006-01-17 08:26:49 UTC
++++ depot/extconf.rb
+@@ -2,17 +2,15 @@ require 'mkmf'
+ 
+ dir_config("depot")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS = ENV['CFLAGS']
++$LDFLAGS = ENV['LDFLAGS']
++$LIBS = ENV['LIBS']
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+ have_library("z", "main")
+ have_library("bz2", "main")
+ have_library("lzo2", "main")
+-have_library("iconv", "main")
+ have_library("qdbm", "main")
+ 
+ create_makefile("mod_depot")
diff --git a/databases/ruby-qdbm/files/patch-depot-mod_depot.c b/databases/ruby-qdbm/files/patch-depot-mod_depot.c
index f92cfedb1365..f918ed08fe9b 100644
--- a/databases/ruby-qdbm/files/patch-depot-mod_depot.c
+++ b/databases/ruby-qdbm/files/patch-depot-mod_depot.c
@@ -1,6 +1,6 @@
---- depot/mod_depot.c.orig	2014-03-29 18:35:17.000000000 +0100
-+++ depot/mod_depot.c	2014-03-29 18:37:30.000000000 +0100
-@@ -232,7 +232,7 @@
+--- depot/mod_depot.c.orig	2006-09-25 12:21:38 UTC
++++ depot/mod_depot.c
+@@ -232,7 +232,7 @@ static VALUE rbdpopen(VALUE vself, VALUE
    const char *name;
    int index, omode, bnum;
    if((index = getnewindex()) == -1) myerror(DP_EMISC);
@@ -9,7 +9,7 @@
    FIXNUM_P(vomode);
    omode = FIX2INT(vomode);
    FIXNUM_P(vbnum);
-@@ -273,10 +273,10 @@
+@@ -273,10 +273,10 @@ static VALUE rbdpput(VALUE vself, VALUE 
    int index, ksiz, vsiz, dmode;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -24,7 +24,7 @@
    FIXNUM_P(vdmode);
    dmode = FIX2INT(vdmode);
    depot = dptable[index];
-@@ -294,8 +294,8 @@
+@@ -294,8 +294,8 @@ static VALUE rbdpout(VALUE vself, VALUE 
    int index, ksiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -35,7 +35,7 @@
    depot = dptable[index];
    if(!dpout(depot, kbuf, ksiz)){
      if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
-@@ -313,8 +313,8 @@
+@@ -313,8 +313,8 @@ static VALUE rbdpget(VALUE vself, VALUE 
    VALUE vval;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -46,7 +46,7 @@
    FIXNUM_P(vstart);
    start = FIX2INT(vstart);
    FIXNUM_P(vmax);
-@@ -336,8 +336,8 @@
+@@ -336,8 +336,8 @@ static VALUE rbdpvsiz(VALUE vself, VALUE
    int index, ksiz, vsiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
diff --git a/databases/ruby-qdbm/files/patch-villa-extconf.rb b/databases/ruby-qdbm/files/patch-villa-extconf.rb
new file mode 100644
index 000000000000..13dff46dbbc3
--- /dev/null
+++ b/databases/ruby-qdbm/files/patch-villa-extconf.rb
@@ -0,0 +1,23 @@
+--- villa/extconf.rb.orig	2006-01-17 08:27:10 UTC
++++ villa/extconf.rb
+@@ -2,17 +2,15 @@ require 'mkmf'
+ 
+ dir_config("villa")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS = ENV['CFLAGS']
++$LDFLAGS = ENV['LDFLAGS']
++$LIBS = ENV['LIBS']
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+ have_library("z", "main")
+ have_library("bz2", "main")
+ have_library("lzo2", "main")
+-have_library("iconv", "main")
+ have_library("qdbm", "main")
+ 
+ create_makefile("mod_villa")
diff --git a/databases/ruby-qdbm/files/patch-villa-mod_villa.c b/databases/ruby-qdbm/files/patch-villa-mod_villa.c
index 18f92dce4a46..527534b3f865 100644
--- a/databases/ruby-qdbm/files/patch-villa-mod_villa.c
+++ b/databases/ruby-qdbm/files/patch-villa-mod_villa.c
@@ -1,6 +1,6 @@
---- villa/mod_villa.c.orig	2014-03-29 18:35:17.000000000 +0100
-+++ villa/mod_villa.c	2014-03-29 18:37:37.000000000 +0100
-@@ -304,7 +304,7 @@
+--- villa/mod_villa.c.orig	2006-09-25 14:47:04 UTC
++++ villa/mod_villa.c
+@@ -304,7 +304,7 @@ static VALUE rbvlopen(VALUE vself, VALUE
    int index, omode, cmode;
    VLCFUNC cmp;
    if((index = getnewindex()) == -1) myerror(DP_EMISC);
@@ -9,7 +9,7 @@
    FIXNUM_P(vomode);
    omode = FIX2INT(vomode);
    FIXNUM_P(vcmode);
-@@ -352,10 +352,10 @@
+@@ -352,10 +352,10 @@ static VALUE rbvlput(VALUE vself, VALUE 
    int index, ksiz, vsiz, dmode;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -24,7 +24,7 @@
    FIXNUM_P(vdmode);
    dmode = FIX2INT(vdmode);
    villa = vltable[index];
-@@ -373,8 +373,8 @@
+@@ -373,8 +373,8 @@ static VALUE rbvlout(VALUE vself, VALUE 
    int index, ksiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -35,7 +35,7 @@
    villa = vltable[index];
    if(!vlout(villa, kbuf, ksiz)){
      if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
-@@ -391,8 +391,8 @@
+@@ -391,8 +391,8 @@ static VALUE rbvlget(VALUE vself, VALUE 
    VALUE vval;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -46,7 +46,7 @@
    villa = vltable[index];
    if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
      if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
-@@ -409,8 +409,8 @@
+@@ -409,8 +409,8 @@ static VALUE rbvlvsiz(VALUE vself, VALUE
    int index, ksiz, vsiz;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -57,7 +57,7 @@
    villa = vltable[index];
    if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
      if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
-@@ -426,8 +426,8 @@
+@@ -426,8 +426,8 @@ static VALUE rbvlvnum(VALUE vself, VALUE
    int index, ksiz, vnum;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -68,7 +68,7 @@
    villa = vltable[index];
    vnum = vlvnum(villa, kbuf, ksiz);
    return INT2FIX(vnum);
-@@ -497,8 +497,8 @@
+@@ -497,8 +497,8 @@ static VALUE rbvlcurjump(VALUE vself, VA
    VALUE vval;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
@@ -79,7 +79,7 @@
    FIXNUM_P(vjmode);
    jmode = FIX2INT(vjmode);
    villa = vltable[index];
-@@ -551,8 +551,8 @@
+@@ -551,8 +551,8 @@ static VALUE rbvlcurput(VALUE vself, VAL
    int index, vsiz, cpmode;
    FIXNUM_P(vindex);
    if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
diff --git a/databases/ruby-qdbm/pkg-descr b/databases/ruby-qdbm/pkg-descr
index 24411395e40f..e4cc4789f2bf 100644
--- a/databases/ruby-qdbm/pkg-descr
+++ b/databases/ruby-qdbm/pkg-descr
@@ -1 +1,3 @@
 Ruby API for QDBM
+
+WWW: http://fallabs.com/qdbm/