mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -1,19 +0,0 @@
|
||||
DESCRIPTION="libedit - A BSD licensed replacement for the GNU readline library."
|
||||
HOMEPAGE="http://www.thrysoee.dk/editline/"
|
||||
SRC_URI="http://www.thrysoee.dk/editline/libedit-20090923-3.0.tar.gz"
|
||||
CHECKSUM_MD5="1e6dad38e8499d71b9c78045e5536734"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd libedit-20090923-3.0
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd libedit-20090923-3.0
|
||||
make install
|
||||
}
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
|
||||
@@ -1,22 +0,0 @@
|
||||
DESCRIPTION="A BSD licensed replacement for the GNU readline library."
|
||||
HOMEPAGE="http://www.thrysoee.dk/editline/"
|
||||
SRC_URI="http://ports-space.haiku-files.org/dev-libs/source/libedit-20100424-3.0.tar.gz"
|
||||
CHECKSUM_MD5="eb4482139525beff12c8ef59f1a84aae"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
|
||||
BUILD {
|
||||
cd libedit-20100424-3.0
|
||||
autoreconf --force --install
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--disable-shared \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd libedit-20100424-3.0
|
||||
make install
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
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
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
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
|
||||
}
|
||||
66
dev-libs/libedit/libedit-2012_06_01_3.0.recipe
Normal file
66
dev-libs/libedit/libedit-2012_06_01_3.0.recipe
Normal file
@@ -0,0 +1,66 @@
|
||||
SUMMARY="A BSD licensed replacement for the GNU readline library"
|
||||
DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline."
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
|
||||
HOMEPAGE="http://www.thrysoee.dk/editline/"
|
||||
SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
|
||||
CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PATCHES="libedit-2012_06_01_3.0.patch"
|
||||
|
||||
PROVIDES="
|
||||
libedit = $portVersion
|
||||
lib:libedit = 0.0.41 compat >= 0
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
lib:libncurses
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libncurses
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
cmd:aclocal
|
||||
cmd:autoreconf
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
SOURCE_DIR="libedit-20120601-3.0"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf --force --install
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs libedit
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$manDir/man3
|
||||
}
|
||||
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
libedit_devel = $portVersion
|
||||
devel:libedit = 0.0.41 compat >= 0
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libedit == $portVersion base
|
||||
"
|
||||
@@ -1,66 +0,0 @@
|
||||
diff -ur libedit-20090923-3.0/examples/fileman.c libedit-20090923-3.0-haiku/examples/fileman.c
|
||||
--- libedit-20090923-3.0/examples/fileman.c 2008-07-12 02:41:43.000000000 -0600
|
||||
+++ libedit-20090923-3.0-haiku/examples/fileman.c 2009-10-29 15:35:57.000000000 -0600
|
||||
@@ -11,7 +11,11 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/file.h>
|
||||
#include <sys/stat.h>
|
||||
+#if defined(__HAIKU__)
|
||||
+#include <errno.h>
|
||||
+#else
|
||||
#include <sys/errno.h>
|
||||
+#endif
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
diff -ur libedit-20090923-3.0/src/editline/readline.h libedit-20090923-3.0-haiku/src/editline/readline.h
|
||||
--- libedit-20090923-3.0/src/editline/readline.h 2009-09-23 15:04:26.000000000 -0600
|
||||
+++ libedit-20090923-3.0-haiku/src/editline/readline.h 2009-10-29 15:35:17.000000000 -0600
|
||||
@@ -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 -ur libedit-20090923-3.0/src/el.c libedit-20090923-3.0-haiku/src/el.c
|
||||
--- libedit-20090923-3.0/src/el.c 2009-09-23 15:04:26.000000000 -0600
|
||||
+++ libedit-20090923-3.0-haiku/src/el.c 2009-10-29 15:30:46.000000000 -0600
|
||||
@@ -41,10 +41,6 @@
|
||||
#endif
|
||||
#endif /* not lint && not SCCSID */
|
||||
|
||||
-#ifndef MAXPATHLEN
|
||||
-#define MAXPATHLEN 4096
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* el.c: EditLine interface functions
|
||||
*/
|
||||
@@ -56,6 +52,10 @@
|
||||
#include <ctype.h>
|
||||
#include "el.h"
|
||||
|
||||
+#ifndef MAXPATHLEN
|
||||
+#define MAXPATHLEN 4096
|
||||
+#endif
|
||||
+
|
||||
/* el_init():
|
||||
* Initialize editline and set default parameters.
|
||||
*/
|
||||
diff -ur libedit-20090923-3.0/src/vis.c libedit-20090923-3.0-haiku/src/vis.c
|
||||
--- libedit-20090923-3.0/src/vis.c 2009-09-23 15:04:26.000000000 -0600
|
||||
+++ libedit-20090923-3.0-haiku/src/vis.c 2009-10-29 15:34:45.000000000 -0600
|
||||
@@ -65,6 +65,10 @@
|
||||
#include <vis.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
+#if defined(__HAIKU__)
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(strsvis,_strsvis)
|
||||
__weak_alias(strsvisx,_strsvisx)
|
||||
@@ -1,66 +0,0 @@
|
||||
diff -up libedit-20100424-3.0/configure.ac.orig libedit-20100424-3.0/configure.ac
|
||||
--- libedit-20100424-3.0/configure.ac.orig 2010-04-29 17:13:51.201588736 -0600
|
||||
+++ libedit-20100424-3.0/configure.ac 2010-04-29 17:13:56.768344064 -0600
|
||||
@@ -46,7 +46,7 @@ AC_FUNC_ALLOCA
|
||||
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])
|
||||
+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 -up libedit-20100424-3.0/examples/fileman.c.orig libedit-20100424-3.0/examples/fileman.c
|
||||
--- libedit-20100424-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600
|
||||
+++ libedit-20100424-3.0/examples/fileman.c 2010-04-29 17:11:53.987496448 -0600
|
||||
@@ -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 -up libedit-20100424-3.0/src/el.c.orig libedit-20100424-3.0/src/el.c
|
||||
--- libedit-20100424-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600
|
||||
+++ libedit-20100424-3.0/src/el.c 2010-04-29 17:13:27.866385920 -0600
|
||||
@@ -55,7 +55,9 @@ __RCSID("$NetBSD: el.c,v 1.59 2010/04/15
|
||||
#include <stdarg.h>
|
||||
#include <ctype.h>
|
||||
#include <locale.h>
|
||||
+#ifdef HAVE_LANGINFO_H
|
||||
#include <langinfo.h>
|
||||
+#endif
|
||||
#include "el.h"
|
||||
|
||||
/* el_init():
|
||||
diff -up libedit-20100424-3.0/src/vis.c.orig libedit-20100424-3.0/src/vis.c
|
||||
--- libedit-20100424-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600
|
||||
+++ libedit-20100424-3.0/src/vis.c 2010-04-29 17:12:56.681574400 -0600
|
||||
@@ -67,6 +67,10 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2
|
||||
#include <vis.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
+#ifdef HAVE_STDINT_H
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(strsvis,_strsvis)
|
||||
__weak_alias(strsvisx,_strsvisx)
|
||||
diff -up libedit-20100424-3.0/src/editline/readline.h.orig libedit-20100424-3.0/src/editline/readline.h
|
||||
--- libedit-20100424-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600
|
||||
+++ libedit-20100424-3.0/src/editline/readline.h 2010-04-29 17:12:16.735313920 -0600
|
||||
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
|
||||
|
||||
#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
|
||||
53
dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch
Normal file
53
dev-libs/libedit/patches/libedit-2012_06_01_3.0.patch
Normal file
@@ -0,0 +1,53 @@
|
||||
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/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
|
||||
Reference in New Issue
Block a user