Merge all changes from trunk

This commit is contained in:
Oliver Tappe
2013-03-29 14:04:07 +00:00
parent 888e133171
commit 94cc6aaf85
1052 changed files with 65053 additions and 2541 deletions

View File

@@ -7,7 +7,7 @@ STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd libedit-20090923-3.0
./configure --prefix=/boot/common
./configure --prefix=`finddir B_COMMON_DIRECTORY`
make
}

View File

@@ -10,7 +10,9 @@ COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20100424-3.0
autoreconf --force --install
./configure --prefix=/boot/common --disable-shared
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}

View File

@@ -0,0 +1,22 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20110802-3.0.tar.gz"
CHECKSUM_MD5="0ea42e2c794da8ed32f6307b427f6590"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2011 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20110802-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd libedit-20110802-3.0
make install
}

View File

@@ -0,0 +1,22 @@
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
HOMEPAGE="http://www.thrysoee.dk/editline/"
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20120601-3.0
autoreconf --force --install
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--disable-shared \
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
make
}
INSTALL {
cd libedit-20120601-3.0
make install
}

View File

@@ -0,0 +1,66 @@
diff -urN libedit-20110802-3.0/configure.ac libedit-20110802-3.0-haiku/configure.ac
--- libedit-20110802-3.0/configure.ac 2011-08-02 01:09:05.036962304 -0700
+++ libedit-20110802-3.0-haiku/configure.ac 2012-06-16 10:41:31.579338240 -0700
@@ -64,7 +64,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -urN libedit-20110802-3.0/examples/fileman.c libedit-20110802-3.0-haiku/examples/fileman.c
--- libedit-20110802-3.0/examples/fileman.c 2010-04-22 12:13:17.046137344 -0700
+++ libedit-20110802-3.0-haiku/examples/fileman.c 2012-06-16 10:41:31.721944576 -0700
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -urN libedit-20110802-3.0/src/editline/readline.h libedit-20110802-3.0-haiku/src/editline/readline.h
--- libedit-20110802-3.0/src/editline/readline.h 2011-02-26 14:42:59.045088768 -0800
+++ libedit-20110802-3.0-haiku/src/editline/readline.h 2012-06-16 10:41:32.068943872 -0700
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -urN libedit-20110802-3.0/src/el.c libedit-20110802-3.0-haiku/src/el.c
--- libedit-20110802-3.0/src/el.c 2011-08-02 00:02:46.039583744 -0700
+++ libedit-20110802-3.0-haiku/src/el.c 2012-06-16 10:41:31.823394304 -0700
@@ -55,7 +55,9 @@
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -urN libedit-20110802-3.0/src/vis.c libedit-20110802-3.0-haiku/src/vis.c
--- libedit-20110802-3.0/src/vis.c 2011-07-08 23:39:42.044564480 -0700
+++ libedit-20110802-3.0-haiku/src/vis.c 2012-06-16 10:41:31.985137152 -0700
@@ -68,6 +68,10 @@
#include <errno.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strvisx,_strvisx)
#endif

View File

@@ -0,0 +1,66 @@
diff -urN libedit-20120601-3.0/configure.ac libedit-20120601-3.0-haiku/configure.ac
--- libedit-20120601-3.0/configure.ac 2012-06-01 12:04:56.000000000 -0700
+++ libedit-20120601-3.0-haiku/configure.ac 2012-06-16 15:01:10.749207552 -0700
@@ -65,7 +65,7 @@
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
diff -urN libedit-20120601-3.0/examples/fileman.c libedit-20120601-3.0-haiku/examples/fileman.c
--- libedit-20120601-3.0/examples/fileman.c 2010-04-22 12:13:17.000000000 -0700
+++ libedit-20120601-3.0-haiku/examples/fileman.c 2012-06-16 15:01:10.911212544 -0700
@@ -11,7 +11,11 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+#elif HAVE_ERRNO_H
+#include <errno.h>
+#endif
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haiku/src/editline/readline.h
--- libedit-20120601-3.0/src/editline/readline.h 2012-05-22 10:43:49.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/editline/readline.h 2012-06-16 15:01:10.947388416 -0700
@@ -75,7 +75,7 @@
#ifndef CTRL
#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
#include <sys/ttydefaults.h>
#endif
#ifndef CTRL
diff -urN libedit-20120601-3.0/src/el.c libedit-20120601-3.0-haiku/src/el.c
--- libedit-20120601-3.0/src/el.c 2012-03-11 15:00:23.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/el.c 2012-06-16 15:01:11.013893632 -0700
@@ -55,7 +55,9 @@
#include <stdarg.h>
#include <ctype.h>
#include <locale.h>
+#ifdef HAVE_LANGINFO_H
#include <langinfo.h>
+#endif
#include "el.h"
/* el_init():
diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c
--- libedit-20120601-3.0/src/vis.c 2011-07-08 23:39:42.000000000 -0700
+++ libedit-20120601-3.0-haiku/src/vis.c 2012-06-16 15:01:11.063176704 -0700
@@ -68,6 +68,10 @@
#include <errno.h>
#include <stdlib.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef __weak_alias
__weak_alias(strvisx,_strvisx)
#endif