haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed and refreshed the patch for libedit-20110802-3.0

Browse Source
This commit is contained in:
Scott McCreary
2012-06-16 19:12:00 +00:00
parent 6856612d94
commit aa2af1088c
3 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/libedit/libedit-20110802.bep → dev-libs/libedit/libedit-20110802-3.0.bep
View File

@@ -6,7 +6,7 @@ REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
LICENSE="BSD (3-clause)"
COPYRIGHT="1992-2010 The NetBSD Foundation, Inc."
COPYRIGHT="1992-2011 The NetBSD Foundation, Inc."
BUILD {
cd libedit-20110802-3.0
autoreconf --force --install

66
dev-libs/libedit/patches/libedit-20110802-3.0.patch Normal file
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

66
dev-libs/libedit/patches/libedit-20110802.patch
View File

@@ -1,66 +0,0 @@
diff -up libedit-20110802-3.0/configure.orig libedit-20110802-3.0/configure.ac
--- libedit-20110802-3.0/configure.ac.orig 2012-02-24 05:56:43.240648192 +0000
+++ libedit-20110802-3.0/configure.ac 2012-02-24 05:58:15.077856768 +0000
@@ -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 -up libedit-20110802-3.0/examples/fileman.c.orig libedit-20110802-3.0/examples/fileman.c
--- libedit-20110802-3.0/examples/fileman.c.orig 2010-04-29 17:11:46.768868352 -0600
+++ libedit-20110802-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-20110802-3.0/src/el.c.orig libedit-20110802-3.0/src/el.c
--- libedit-20110802-3.0/src/el.c.orig 2010-04-29 17:13:07.215482368 -0600
+++ libedit-20110802-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-20110802-3.0/src/vis.c.orig libedit-20110802-3.0/src/vis.c
--- libedit-20110802-3.0/src/vis.c.orig 2010-04-29 17:12:31.912261120 -0600
+++ libedit-20110802-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-20110802-3.0/src/editline/readline.h.orig libedit-20110802-3.0/src/editline/readline.h
--- libedit-20110802-3.0/src/editline/readline.h.orig 2010-04-29 17:12:05.235143168 -0600
+++ libedit-20110802-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