sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Take maintainership.

Browse source 
- Fix CFLAGS and LDFLAGS.
- Fix a possible library path confusion.
- Style clean-ups.
This commit is contained in:
Hiroki Sato 2015-07-18 18:15:17 +00:00
parent ccc4c3b371
commit 28a76bdb9b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=392440
19 changed files with 300 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
databases/qdbm-plus/Makefile
View file

@ -1,17 +1,36 @@
# 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/
PKGNAMESUFFIX= -plus
MAINTAINER= hrs@FreeBSD.org
COMMENT= C++ API for QDBM
SLAVEPORT= plus
LICENSE= LGPL21
LICENSE_FILE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
MASTERDIR= ${.CURDIR}/../../databases/qdbm
LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2 \
libqdbm.so:${PORTSDIR}/databases/qdbm
USES= iconv
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/plus
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
CXXFLAGS+= -fsigned-char -fPIC
INSTALL_TARGET= install-strip
.include "${MASTERDIR}/Makefile"
post-patch:
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
.endif
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxqdbm.so.3.0.0
.include <bsd.port.mk>

2
databases/qdbm-plus/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (qdbm-1.8.78.tar.gz) = b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e
SIZE (qdbm-1.8.78.tar.gz) = 1015429

26
databases/qdbm-plus/files/patch-Makefile.in
View file

@ -1,11 +1,31 @@
--- Makefile.in.orig 2007-03-07 02:44:50 UTC
+++ Makefile.in
@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
@@ -39,22 +39,19 @@ DESTDIR =
# Building binaries
CXX = @CXX@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) \
- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
+CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) @MYDEFS@ \
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
+CXXFLAGS = @CXXFLAGS@ -Wall -ansi -pedantic -fsigned-char -fPIC -fno-strict-aliasing
+CXXFLAGS = @CXXFLAGS@
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
-LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
- -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
- -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) $(LIBS)
+LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -lxqdbm $(LIBS)
+LDENV =
AR = @AR@
ARFLAGS = rcsv
-RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+RUNENV =

20
databases/qdbm-plus/files/patch-configure Normal file
View file

@ -0,0 +1,20 @@
--- configure.orig 2010-08-04 17:15:28 UTC
+++ configure
@@ -3203,7 +3203,7 @@ if test "${ac_cv_lib_iconv_main+set}" =
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="$ICONV_LIB $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3232,7 +3232,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
#define HAVE_LIBICONV 1
_ACEOF
- LIBS="-liconv $LIBS"
+ LIBS="$ICONV_LIB $LIBS"
fi

6
databases/qdbm-plus/files/patch-xadbm.h
View file

@ -1,6 +1,6 @@
--- xadbm.h.orig 2006-01-01 08:23:58.000000000 +0300
+++ xadbm.h 2015-01-28 23:44:53.000000000 +0300
@@ -72,21 +72,21 @@
--- xadbm.h.orig 2006-01-01 05:23:58 UTC
+++ xadbm.h
@@ -72,21 +72,21 @@ private:
* @param latter the latter datum.
* @return reference to a temporary instance.
*/

2
databases/qdbm-plus/pkg-descr
View file

@ -1 +1,3 @@
C++ API for QDBM
WWW: http://fallabs.com/qdbm/

49
databases/qdbm/Makefile
View file

@ -3,63 +3,44 @@
PORTNAME= qdbm
PORTVERSION= 1.8.78
PORTREVISION?= 3
PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= http://fallabs.com/qdbm/
MAINTAINER= ports@FreeBSD.org
COMMENT?= Quick Database Manager
MAINTAINER= hrs@FreeBSD.org
COMMENT= Quick Database Manager
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
USES= iconv
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
.if !defined(SLAVEPORT)
LICENSE= LGPL21 # or later
LICENSE_FILE= ${WRKSRC}/COPYING
USES+= iconv
CONFIGURE_ENV= ac_cv_lib_iconv_main=yes
CONFIGURE_ARGS= --enable-bzip --enable-lzo --enable-zlib \
--enable-iconv \
--enable-pthread
--enable-iconv --enable-pthread
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -fPIC -fsigned-char
LIBS+= -L${LOCALBASE}/lib
MAKE_ARGS= MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}" \
MYPCDIR="${PREFIX}/libdata/pkgconfig"
INSTALL_TARGET= install-strip
PORTDOCS= ChangeLog NEWS
post-patch:
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
.endif
@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
post-build:
(cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
fmtcnv031127)
cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
fmtcnv031127
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
.else
LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm
post-patch:
.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
@${REINPLACE_CMD} 's/-DNDEBUG//' ${WRKSRC}/Makefile.in
.endif
@${REINPLACE_CMD} -e 's/-liconv//' -e 's/-lstdc++//' ${WRKSRC}/configure
.if ${SLAVEPORT} == "ruby"
@${REINPLACE_CMD} '/iconv/d' ${WRKSRC}/curia/extconf.rb \
${WRKSRC}/depot/extconf.rb ${WRKSRC}/villa/extconf.rb
.endif
.endif # !defined(SLAVEPORT)
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libqdbm.so.14.14.0
.include <bsd.port.mk>

24
databases/qdbm/files/patch-Makefile.in
View file

@ -1,11 +1,29 @@
--- Makefile.in.orig 2010-08-04 17:14:34 UTC
+++ Makefile.in
@@ -56,7 +56,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MY
@@ -51,20 +51,19 @@ DESTDIR =
# Building binaries
CC = @CC@
-CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) \
- -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
+CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(MYHEADDIR) @MYDEFS@ \
-D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
+CFLAGS = @CFLAGS@ -Wall -pedantic -fPIC -fsigned-char
+CFLAGS = @CFLAGS@
LD = @LD@
LIBS = -lqdbm @LIBS@
LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
-LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
-LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) @LIBS@
+LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) $(LIBS)
+LDENV =
AR = @AR@
ARFLAGS = rcsv
-RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+RUNENV =

29
databases/qdbm/files/patch-configure Normal file
View file

@ -0,0 +1,29 @@
--- configure.orig 2010-08-04 17:15:20 UTC
+++ configure
@@ -1934,7 +1934,7 @@ fi
if test "$enable_iconv" = "yes"
then
MYDEFS="$MYDEFS -DMYICONV"
- MGWLIBS="-liconv $MGWLIBS"
+ MGWLIBS="$ICONV_LIB $MGWLIBS"
enables="$enables (iconv)"
isiconv="yes"
fi
@@ -3047,7 +3047,7 @@ if test "${ac_cv_lib_iconv_main+set}" =
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
+LIBS="$ICONV_LIB $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3076,7 +3076,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
#define HAVE_LIBICONV 1
_ACEOF
- LIBS="-liconv $LIBS"
+ LIBS="$ICONV_LIB $LIBS"
fi

37
databases/ruby-qdbm/Makefile
View file

@ -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
.include "${MASTERDIR}/Makefile"
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 <bsd.port.mk>

2
databases/ruby-qdbm/distinfo Normal file
View file

@ -0,0 +1,2 @@
SHA256 (qdbm-1.8.78.tar.gz) = b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e
SIZE (qdbm-1.8.78.tar.gz) = 1015429

43
databases/ruby-qdbm/files/patch-Makefile.in
View file

@ -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

23
databases/ruby-qdbm/files/patch-curia-extconf.rb Normal file
View file

@ -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")

14
databases/ruby-qdbm/files/patch-curia-mod_curia.c
View file

@ -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);

23
databases/ruby-qdbm/files/patch-depot-extconf.rb Normal file
View file

@ -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")

14
databases/ruby-qdbm/files/patch-depot-mod_depot.c
View file

@ -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);

23
databases/ruby-qdbm/files/patch-villa-extconf.rb Normal file
View file

@ -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")

20
databases/ruby-qdbm/files/patch-villa-mod_villa.c
View file

@ -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);

2
databases/ruby-qdbm/pkg-descr
View file

@ -1 +1,3 @@
Ruby API for QDBM
WWW: http://fallabs.com/qdbm/