mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Merge all changes from trunk
This commit is contained in:
23
dev-db/mysql/mysql-5.0.83.bep
Normal file
23
dev-db/mysql/mysql-5.0.83.bep
Normal file
@@ -0,0 +1,23 @@
|
||||
DESCRIPTION="SQL database server."
|
||||
HOMEPAGE="http://www.mysql.com"
|
||||
SRC_URI="http://mirror.provenscaling.com/mysql/community/source/5.0/mysql-5.0.83.tar.gz"
|
||||
CHECKSUM_MD5="051392064a1e32cca5c23a593908b10e"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="untested"
|
||||
DEPEND="sys-libs/readline >= 5.2"
|
||||
|
||||
BUILD {
|
||||
cd mysql-5.0.83
|
||||
libtoolize --force --install --copy
|
||||
aclocal
|
||||
autoconf
|
||||
./configure --without-readline CFLAGS=-O2 --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd mysql-5.0.83
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
COPYRIGHT="2000, 2012, Oracle and/or its affiliates. All rights reserved."
|
||||
101
dev-db/mysql/patches/mysql-5.0.83.patch
Normal file
101
dev-db/mysql/patches/mysql-5.0.83.patch
Normal file
@@ -0,0 +1,101 @@
|
||||
diff -Naur mysql-5.0.83/configure.in mysql-5.0.83-haiku/configure.in
|
||||
--- mysql-5.0.83/configure.in 2009-05-29 18:15:45.000000000 +0000
|
||||
+++ mysql-5.0.83-haiku/configure.in 2012-12-04 18:14:48.000000000 +0000
|
||||
@@ -884,7 +884,8 @@
|
||||
AC_CHECK_LIB(nsl, gethostbyname_r))
|
||||
AC_CHECK_FUNC(gethostbyname_r)
|
||||
|
||||
-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
|
||||
+AC_SEARCH_LIBS(socket, [socket network])
|
||||
+AC_SEARCH_LIBS(setsockopt,[socket network])
|
||||
AC_CHECK_FUNC(yp_get_default_domain, ,
|
||||
AC_CHECK_LIB(nsl, yp_get_default_domain))
|
||||
AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
|
||||
@@ -893,7 +894,7 @@
|
||||
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
|
||||
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
|
||||
# See if we need a library for address lookup.
|
||||
-AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
|
||||
+AC_SEARCH_LIBS(inet_aton, [socket nsl resolv network])
|
||||
|
||||
# For the sched_yield() function on Solaris
|
||||
AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
|
||||
@@ -1939,6 +1940,13 @@
|
||||
MYSQL_CHECK_TIME_T
|
||||
|
||||
|
||||
+
|
||||
+AC_CHECK_MEMBERS([struct rusage.ru_maxrss, struct rusage.ru_idrss, struct rusage.ru_minflt, struct rusage.ru_majflt,
|
||||
+struct rusage.ru_nswap, struct rusage.ru_inblock, struct rusage.ru_oublock, struct rusage.ru_msgsnd, struct rusage.ru_msgrcv,
|
||||
+struct rusage.ru_nsignals, struct rusage.ru_nvcsw, struct rusage.ru_nivcsw ],[AC_DEFINE([ADDITIONAL_RUSAGE_MEMBERS],[1],[
|
||||
+Define 1 if structure have this members])],,)
|
||||
+
|
||||
+
|
||||
# do we need #pragma interface/#pragma implementation ?
|
||||
# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
|
||||
AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
|
||||
diff -Naur mysql-5.0.83/dbug/dbug_analyze.c mysql-5.0.83-haiku/dbug/dbug_analyze.c
|
||||
--- mysql-5.0.83/dbug/dbug_analyze.c 2009-05-29 18:15:46.000000000 +0000
|
||||
+++ mysql-5.0.83-haiku/dbug/dbug_analyze.c 2012-12-02 12:17:35.000000000 +0000
|
||||
@@ -100,13 +100,13 @@
|
||||
while(0)
|
||||
|
||||
|
||||
-struct stack_t {
|
||||
+struct my_stack_t {
|
||||
unsigned int pos; /* which function? */
|
||||
unsigned long time; /* Time that this was entered */
|
||||
unsigned long children; /* Time spent in called funcs */
|
||||
};
|
||||
|
||||
-static struct stack_t fn_stack[STACKSIZ+1];
|
||||
+static struct my_stack_t fn_stack[STACKSIZ+1];
|
||||
|
||||
static unsigned int stacktop = 0; /* Lowest stack position is a dummy */
|
||||
|
||||
@@ -130,7 +130,7 @@
|
||||
register unsigned int name_pos;
|
||||
register unsigned long time_entered;
|
||||
{
|
||||
- register struct stack_t *t;
|
||||
+ register struct my_stack_t *t;
|
||||
|
||||
DBUG_ENTER("push");
|
||||
if (++stacktop > STACKSIZ) {
|
||||
@@ -157,7 +157,7 @@
|
||||
register unsigned long *time_entered;
|
||||
register unsigned long *child_time;
|
||||
{
|
||||
- register struct stack_t *temp;
|
||||
+ register struct my_stack_t *temp;
|
||||
register unsigned int rtnval;
|
||||
|
||||
DBUG_ENTER ("pop");
|
||||
@@ -313,7 +313,7 @@
|
||||
unsigned int oldpos;
|
||||
unsigned long oldtime;
|
||||
unsigned long oldchild;
|
||||
- struct stack_t *t;
|
||||
+ struct my_stack_t *t;
|
||||
|
||||
DBUG_ENTER ("process");
|
||||
while (fgets (buf,BUFSIZ,inf) != NULL) {
|
||||
diff -Naur mysql-5.0.83/mysys/my_init.c mysql-5.0.83-haiku/mysys/my_init.c
|
||||
--- mysql-5.0.83/mysys/my_init.c 2009-05-29 18:18:19.000000000 +0000
|
||||
+++ mysql-5.0.83-haiku/mysys/my_init.c 2012-12-04 18:16:27.368050176 +0000
|
||||
@@ -162,6 +162,7 @@
|
||||
/* Purify assumes that rus is uninitialized after getrusage call */
|
||||
bzero((char*) &rus, sizeof(rus));
|
||||
#endif
|
||||
+#ifdef ADDITIONAL_RUSAGE_MEMBERS
|
||||
if (!getrusage(RUSAGE_SELF, &rus))
|
||||
fprintf(info_file,"\n\
|
||||
User time %.2f, System time %.2f\n\
|
||||
@@ -179,6 +180,7 @@
|
||||
rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals,
|
||||
rus.ru_nvcsw, rus.ru_nivcsw);
|
||||
#endif
|
||||
+#endif
|
||||
#if ( defined(MSDOS) || defined(__NETWARE__) ) && !defined(__WIN__)
|
||||
fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC);
|
||||
#endif
|
||||
23
dev-db/postgresql/licenses/PostgreSQL
Normal file
23
dev-db/postgresql/licenses/PostgreSQL
Normal file
@@ -0,0 +1,23 @@
|
||||
PostgreSQL Database Management System
|
||||
(formerly known as Postgres, then as Postgres95)
|
||||
|
||||
Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
|
||||
Portions Copyright (c) 1994, The Regents of the University of California
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose, without fee, and without a written agreement
|
||||
is hereby granted, provided that the above copyright notice and this
|
||||
paragraph and the following two paragraphs appear in all copies.
|
||||
|
||||
IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
|
||||
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING
|
||||
LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS
|
||||
DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
||||
ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO
|
||||
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
||||
19
dev-db/postgresql/patches/postgresql-9.0.4.patch
Normal file
19
dev-db/postgresql/patches/postgresql-9.0.4.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
diff -urN postgresql-9.0.4/configure.in postgresql-9.0.4-haiku/configure.in
|
||||
--- postgresql-9.0.4/configure.in 2011-04-15 03:15:53.000000000 +0000
|
||||
+++ postgresql-9.0.4-haiku/configure.in 2011-07-15 16:30:31.934543360 +0000
|
||||
@@ -861,7 +861,7 @@
|
||||
AC_CHECK_LIB(m, main)
|
||||
AC_SEARCH_LIBS(setproctitle, util)
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
-AC_SEARCH_LIBS(socket, [socket wsock32])
|
||||
+AC_SEARCH_LIBS(socket, [socket wsock32 network])
|
||||
AC_SEARCH_LIBS(shl_load, dld)
|
||||
# We only use libld in port/dynloader/aix.c
|
||||
case $host_os in
|
||||
diff -urN postgresql-9.0.4/src/template/haiku postgresql-9.0.4-haiku/src/template/haiku
|
||||
--- postgresql-9.0.4/src/template/haiku 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ postgresql-9.0.4-haiku/src/template/haiku 2011-07-15 16:26:54.707264512 +0000
|
||||
@@ -0,0 +1,3 @@
|
||||
+case $host_os in
|
||||
+ haiku*) ;;
|
||||
+esac
|
||||
19
dev-db/postgresql/patches/postgresql-9.2.3.patch
Normal file
19
dev-db/postgresql/patches/postgresql-9.2.3.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
diff -urN postgresql-9.2.3/configure.in postgresql-9.2.3-haiku/configure.in
|
||||
--- postgresql-9.2.3/configure.in
|
||||
+++ postgresql-9.2.3-haiku/configure.in
|
||||
@@ -861,7 +861,7 @@
|
||||
AC_CHECK_LIB(m, main)
|
||||
AC_SEARCH_LIBS(setproctitle, util)
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
-AC_SEARCH_LIBS(socket, [socket wsock32])
|
||||
+AC_SEARCH_LIBS(socket, [socket wsock32 network])
|
||||
AC_SEARCH_LIBS(shl_load, dld)
|
||||
# We only use libld in port/dynloader/aix.c
|
||||
case $host_os in
|
||||
diff -urN postgresql-9.2.3/src/template/haiku postgresql-9.2.3-haiku/src/template/haiku
|
||||
--- postgresql-9.2.3/src/template/haiku
|
||||
+++ postgresql-9.2.3-haiku/src/template/haiku
|
||||
@@ -0,0 +1,3 @@
|
||||
+case $host_os in
|
||||
+ haiku*) ;;
|
||||
+esac
|
||||
27
dev-db/postgresql/postgresql-9.0.4.bep
Normal file
27
dev-db/postgresql/postgresql-9.0.4.bep
Normal file
@@ -0,0 +1,27 @@
|
||||
DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system."
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
SRC_URI="http://wwwmaster.postgresql.org/redir/198/f/source/v9.0.4/postgresql-9.0.4.tar.bz2"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND="dev-libs/libedit >= 20100424"
|
||||
CHECKSUM_MD5="80390514d568a7af5ab61db1cda27e29"
|
||||
BUILD {
|
||||
cd postgresql-9.0.4
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd postgresql-9.0.4
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd postgresql-9.0.4
|
||||
# make test
|
||||
# make check
|
||||
}
|
||||
|
||||
LICENSE="PostgreSQL"
|
||||
COPYRIGHT="1996-2010, PostgreSQL Global Development Group
|
||||
1994, The Regents of the University of California"
|
||||
27
dev-db/postgresql/postgresql-9.2.3.bep
Normal file
27
dev-db/postgresql/postgresql-9.2.3.bep
Normal file
@@ -0,0 +1,27 @@
|
||||
DESCRIPTION="PostgreSQL is a powerful, open source object-relational database system."
|
||||
HOMEPAGE="http://www.postgresql.org/"
|
||||
SRC_URI="http://ftp.postgresql.org/pub/source/v9.2.3/postgresql-9.2.3.tar.bz2"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND="dev-libs/libedit >= 20100424"
|
||||
CHECKSUM_MD5="59f42a93695b0186ed5eb03c2653a7d4"
|
||||
BUILD {
|
||||
cd postgresql-9.2.3
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-template=haiku
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd postgresql-9.2.3
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd postgresql-9.2.3
|
||||
# make test
|
||||
# make check
|
||||
}
|
||||
|
||||
LICENSE="PostgreSQL"
|
||||
COPYRIGHT="1996-2012, PostgreSQL Global Development Group
|
||||
1994, The Regents of the University of California"
|
||||
82
dev-db/redis/patches/redis-2.2.11.patch
Normal file
82
dev-db/redis/patches/redis-2.2.11.patch
Normal file
@@ -0,0 +1,82 @@
|
||||
diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile
|
||||
index b186e75..345a15d 100644
|
||||
diff --git redis-2.2.11/deps/hiredis/Makefile redis-2.2.11/deps/hiredis/Makefile
|
||||
index 2a84b9b..9d50572 100644
|
||||
--- redis-2.2.11/deps/hiredis/Makefile
|
||||
+++ redis-2.2.11/deps/hiredis/Makefile
|
||||
@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin)
|
||||
STLIBNAME?=libhiredis.a
|
||||
STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
|
||||
else
|
||||
+ifeq ($(uname_S),Haiku)
|
||||
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||
+ CCLINK?=-lroot -lnetwork
|
||||
+ LDFLAGS?=-L. -Wl,-rpath,.
|
||||
+ DYLIBNAME?=libhiredis.so
|
||||
+ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
|
||||
+ STLIBNAME?=libhiredis.a
|
||||
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
|
||||
+else
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||
CCLINK?=-lm -pthread
|
||||
LDFLAGS?=-L. -Wl,-rpath,.
|
||||
diff --git redis-2.2.11/src/Makefile redis-2.2.11/src/Makefile
|
||||
index 292255c..51d2910 100644
|
||||
--- redis-2.2.11/src/Makefile
|
||||
+++ redis-2.2.11/src/Makefile
|
||||
@@ -15,7 +15,12 @@ endif
|
||||
ifeq ($(uname_S),SunOS)
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
|
||||
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
|
||||
- DEBUG?=-g -ggdb
|
||||
+ DEBUG?=-g -ggdb
|
||||
+else
|
||||
+ifeq ($(uname_S),Haiku)
|
||||
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
|
||||
+ CCLINK?=-lroot -lnetwork
|
||||
+ DEBUG?=-g -ggdb
|
||||
else
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
|
||||
CCLINK?=-lm -pthread
|
||||
--
|
||||
|
||||
diff --git redis-2.2.11/src/aof.c redis-2.2.11/src/aof.c
|
||||
index e30c77f..2403e83 100644
|
||||
--- redis-2.2.11/src/aof.c
|
||||
+++ redis-2.2.11/src/aof.c
|
||||
@@ -23,7 +23,7 @@ void stopAppendOnly(void) {
|
||||
int statloc;
|
||||
|
||||
if (kill(server.bgsavechildpid,SIGKILL) != -1)
|
||||
- wait3(&statloc,0,NULL);
|
||||
+ waitpid(&statloc,0,NULL);
|
||||
/* reset the buffer accumulating changes while the child saves */
|
||||
sdsfree(server.bgrewritebuf);
|
||||
server.bgrewritebuf = sdsempty();
|
||||
diff --git redis-2.2.11/src/redis.c redis-2.2.11/src/redis.c
|
||||
index 45be893..b7d1b0b 100644
|
||||
--- redis-2.2.11/src/redis.c
|
||||
+++ redis-2.2.11/src/redis.c
|
||||
@@ -589,7 +589,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
|
||||
int statloc;
|
||||
pid_t pid;
|
||||
|
||||
- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
|
||||
+ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) {
|
||||
if (pid == server.bgsavechildpid) {
|
||||
backgroundSaveDoneHandler(statloc);
|
||||
} else {
|
||||
diff --git redis-2.2.11/src/sha1.c redis-2.2.11/src/sha1.c
|
||||
index 2c50433..312c777 100644
|
||||
--- redis-2.2.11/src/sha1.c
|
||||
+++ redis-2.2.11/src/sha1.c
|
||||
@@ -27,6 +27,9 @@ A million repetitions of "a"
|
||||
#if defined(__sun)
|
||||
#include "solarisfixes.h"
|
||||
#endif
|
||||
+#ifdef __HAIKU__
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
#include "sha1.h"
|
||||
|
||||
#ifndef BYTE_ORDER
|
||||
105
dev-db/redis/patches/redis-2.9.0-git.patch
Normal file
105
dev-db/redis/patches/redis-2.9.0-git.patch
Normal file
@@ -0,0 +1,105 @@
|
||||
diff --git redis-2.9.0-git/deps/hiredis/Makefile redis-2.9.0-git/deps/hiredis/Makefile
|
||||
index 2a84b9b..1225539 100644
|
||||
--- redis-2.9.0-git/deps/hiredis/Makefile
|
||||
+++ redis-2.9.0-git/deps/hiredis/Makefile
|
||||
@@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin)
|
||||
STLIBNAME?=libhiredis.a
|
||||
STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ}
|
||||
else
|
||||
+ifeq ($(uname_S),Haiku)
|
||||
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||
+ CCLINK?=-lroot -lnetwork
|
||||
+ LDFLAGS?=-L. -Wl,-rpath,.
|
||||
+ DYLIBNAME?=libhiredis.so
|
||||
+ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,${DYLIBNAME} -o ${DYLIBNAME} ${OBJ}
|
||||
+ STLIBNAME?=libhiredis.a
|
||||
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
|
||||
+else
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||
CCLINK?=-lm -pthread
|
||||
LDFLAGS?=-L. -Wl,-rpath,.
|
||||
@@ -35,6 +44,7 @@ else
|
||||
STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
|
||||
CCOPT= $(CFLAGS) $(CCLINK)
|
||||
DEBUG?= -g -ggdb
|
||||
diff --git redis-2.9.0-git/src/Makefile redis-2.9.0-git/src/Makefile
|
||||
index 292255c..e6a6d87 100644
|
||||
--- redis-2.9.0-git/src/Makefile
|
||||
+++ redis-2.9.0-git/src/Makefile
|
||||
@@ -15,12 +15,18 @@ endif
|
||||
ifeq ($(uname_S),SunOS)
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6
|
||||
CCLINK?=-ldl -lnsl -lsocket -lm -lpthread
|
||||
- DEBUG?=-g -ggdb
|
||||
+ DEBUG?=-g -ggdb
|
||||
+else
|
||||
+ifeq ($(uname_S),Haiku)
|
||||
+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
|
||||
+ CCLINK?=-lroot -lnetwork
|
||||
+ DEBUG?=-g -ggdb
|
||||
else
|
||||
CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF)
|
||||
CCLINK?=-lm -pthread
|
||||
DEBUG?=-g -rdynamic -ggdb
|
||||
endif
|
||||
+endif
|
||||
|
||||
ifeq ($(USE_TCMALLOC),yes)
|
||||
ALLOD_DEPS=
|
||||
diff --git redis-2.9.0-git/src/aof.c redis-2.9.0-git/src/aof.c
|
||||
index dbd0468..7a5d21f 100644
|
||||
--- redis-2.9.0-git/src/aof.c
|
||||
+++ redis-2.9.0-git/src/aof.c
|
||||
@@ -25,7 +25,7 @@ void stopAppendOnly(void) {
|
||||
int statloc;
|
||||
|
||||
if (kill(server.bgrewritechildpid,SIGKILL) != -1)
|
||||
- wait3(&statloc,0,NULL);
|
||||
+ waitpid(&statloc,0,NULL);
|
||||
/* reset the buffer accumulating changes while the child saves */
|
||||
sdsfree(server.bgrewritebuf);
|
||||
server.bgrewritebuf = sdsempty();
|
||||
diff --git redis-2.9.0-git/src/redis.c redis-2.9.0-git/src/redis.c
|
||||
index 1a1f84f..4ecc873 100644
|
||||
--- redis-2.9.0-git/src/redis.c
|
||||
+++ redis-2.9.0-git/src/redis.c
|
||||
@@ -646,7 +646,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
|
||||
int statloc;
|
||||
pid_t pid;
|
||||
|
||||
- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
|
||||
+ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) {
|
||||
int exitcode = WEXITSTATUS(statloc);
|
||||
int bysignal = 0;
|
||||
|
||||
diff --git redis-2.9.0-git/src/sha1.c redis-2.9.0-git/src/sha1.c
|
||||
index 26a5565..e90812e 100644
|
||||
--- redis-2.9.0-git/src/sha1.c
|
||||
+++ redis-2.9.0-git/src/sha1.c
|
||||
@@ -27,6 +27,9 @@ A million repetitions of "a"
|
||||
#if defined(__sun)
|
||||
#include "solarisfixes.h"
|
||||
#endif
|
||||
+#ifdef __HAIKU__
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
#include "sha1.h"
|
||||
#include "config.h"
|
||||
|
||||
diff --git redis-2.9.0-git/src/util.c redis-2.9.0-git/src/util.c
|
||||
index f5a23af..2a6d18d 100644
|
||||
--- redis-2.9.0-git/src/util.c
|
||||
+++ redis-2.9.0-git/src/util.c
|
||||
@@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) {
|
||||
* integer printing function that is much faster. */
|
||||
double min = -4503599627370495; /* (2^52)-1 */
|
||||
double max = 4503599627370496; /* -(2^52) */
|
||||
- if (val > min && val < max && value == ((double)((long long)value)))
|
||||
+ if (value > min && value < max && value == ((double)((long long)value)))
|
||||
len = ll2string(buf,len,(long long)value);
|
||||
else
|
||||
#endif
|
||||
20
dev-db/redis/redis-2.2.11.bep
Normal file
20
dev-db/redis/redis-2.2.11.bep
Normal file
@@ -0,0 +1,20 @@
|
||||
HOMEPAGE= "http://redis.io/"
|
||||
DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets."
|
||||
SRC_URI= "http://redis.googlecode.com/files/redis-2.2.11.tar.gz"
|
||||
REVISION = "1"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619"
|
||||
STATUS_HAIKU="broken"
|
||||
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
|
||||
BUILD {
|
||||
cd redis-2.2.11
|
||||
make PREFIX=`finddir B_COMMON_DIRECTORY`
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd redis-2.2.11
|
||||
make install PREFIX=`finddir B_COMMON_DIRECTORY`
|
||||
}
|
||||
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="2006-2010 Salvatore Sanfilippo"
|
||||
20
dev-db/redis/redis-2.9.0-git.bep
Normal file
20
dev-db/redis/redis-2.9.0-git.bep
Normal file
@@ -0,0 +1,20 @@
|
||||
HOMEPAGE= "http://redis.io/"
|
||||
DESCRIPTION="Redis is an open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets."
|
||||
SRC_URI= "git://github.com/antirez/redis.git"
|
||||
REVISION = "1"
|
||||
DEPEND=""
|
||||
STATUS_HAIKU="stable"
|
||||
# CHECKSUM_MD5= "5501c90ca02ae7ea93c34f067b3e0619"
|
||||
MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
|
||||
BUILD {
|
||||
cd redis-2.9.0-git
|
||||
make PREFIX=`finddir B_COMMON_DIRECTORY`
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd redis-2.9.0-git
|
||||
make install PREFIX=`finddir B_COMMON_DIRECTORY`
|
||||
}
|
||||
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="2006-2010 Salvatore Sanfilippo"
|
||||
20
dev-db/sqlite/patches/sqlite-3.7.13.patch
Normal file
20
dev-db/sqlite/patches/sqlite-3.7.13.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
diff -urN sqlite-autoconf-3071300/shell.c sqlite-autoconf-3071300-haiku/shell.c
|
||||
--- sqlite-autoconf-3071300/shell.c 2012-06-11 02:33:44.060817408 -0700
|
||||
+++ sqlite-autoconf-3071300-haiku/shell.c 2012-06-15 22:51:13.171704320 -0700
|
||||
@@ -2694,7 +2694,6 @@
|
||||
*/
|
||||
static char *find_home_dir(void){
|
||||
static char *home_dir = NULL;
|
||||
- if( home_dir ) return home_dir;
|
||||
|
||||
#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE) && !defined(__RTP__) && !defined(_WRS_KERNEL)
|
||||
struct passwd *pwent;
|
||||
@@ -2704,6 +2703,8 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
+ if( home_dir ) return home_dir;
|
||||
+
|
||||
#if defined(_WIN32_WCE)
|
||||
/* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
|
||||
*/
|
||||
@@ -11,7 +11,7 @@ BUILD {
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ BUILD {
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
26
dev-db/sqlite/sqlite-3.7.13.bep
Normal file
26
dev-db/sqlite/sqlite-3.7.13.bep
Normal file
@@ -0,0 +1,26 @@
|
||||
DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine."
|
||||
HOMEPAGE="http://www.sqlite.org/"
|
||||
SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="c97df403e8a3d5b67bb408fcd6aabd8e"
|
||||
BUILD {
|
||||
cd sqlite-autoconf-3071300
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--mandir=$COMMON_DOCS/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd sqlite-autoconf-3071300
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="SQLite"
|
||||
COPYRIGHT="Public Domain"
|
||||
26
dev-db/sqlite/sqlite-3.7.15.1.bep
Normal file
26
dev-db/sqlite/sqlite-3.7.15.1.bep
Normal file
@@ -0,0 +1,26 @@
|
||||
DESCRIPTION="Software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine."
|
||||
HOMEPAGE="http://www.sqlite.org/"
|
||||
SRC_URI="http://www.sqlite.org/sqlite-autoconf-3071501.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="a67c25afa199a11f0a37aff7ed9d2c14"
|
||||
BUILD {
|
||||
cd sqlite-autoconf-3071501
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--mandir=$COMMON_DOCS/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd sqlite-autoconf-3071501
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="SQLite"
|
||||
COPYRIGHT="Public Domain"
|
||||
@@ -11,7 +11,7 @@ BUILD {
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ BUILD {
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ BUILD {
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
./configure --prefix=/boot/common
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
26
dev-db/sqlite/sqlite-3.7.6.2.bep
Normal file
26
dev-db/sqlite/sqlite-3.7.6.2.bep
Normal file
@@ -0,0 +1,26 @@
|
||||
DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine."
|
||||
HOMEPAGE="http://www.sqlite.org/"
|
||||
SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="f16c08617968b4087b3d591fd575f59f"
|
||||
BUILD {
|
||||
cd sqlite-autoconf-3070602
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--mandir=$COMMON_DOCS/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd sqlite-autoconf-3070602
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="SQLite"
|
||||
COPYRIGHT="Public Domain"
|
||||
26
dev-db/sqlite/sqlite-3.7.7.1.bep
Normal file
26
dev-db/sqlite/sqlite-3.7.7.1.bep
Normal file
@@ -0,0 +1,26 @@
|
||||
DESCRIPTION="SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine."
|
||||
HOMEPAGE="http://www.sqlite.org/"
|
||||
SRC_URI="http://www.sqlite.org/sqlite-autoconf-3070701.tar.gz"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
CHECKSUM_MD5="554026fe7fac47b1cf61c18d5fe43419"
|
||||
BUILD {
|
||||
cd sqlite-autoconf-3070701
|
||||
libtoolize --force --copy --install
|
||||
aclocal
|
||||
autoconf
|
||||
automake
|
||||
COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--mandir=$COMMON_DOCS/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd sqlite-autoconf-3070701
|
||||
make install
|
||||
}
|
||||
|
||||
LICENSE="SQLite"
|
||||
COPYRIGHT="Public Domain"
|
||||
Reference in New Issue
Block a user