From aa2af1088ca07aeca6edf4980c04f4ff1e4124e6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 16 Jun 2012 19:12:00 +0000 Subject: [PATCH] Renamed and refreshed the patch for libedit-20110802-3.0 --- ...-20110802.bep => libedit-20110802-3.0.bep} | 2 +- .../patches/libedit-20110802-3.0.patch | 66 +++++++++++++++++++ .../libedit/patches/libedit-20110802.patch | 66 ------------------- 3 files changed, 67 insertions(+), 67 deletions(-) rename dev-libs/libedit/{libedit-20110802.bep => libedit-20110802-3.0.bep} (91%) create mode 100644 dev-libs/libedit/patches/libedit-20110802-3.0.patch delete mode 100644 dev-libs/libedit/patches/libedit-20110802.patch diff --git a/dev-libs/libedit/libedit-20110802.bep b/dev-libs/libedit/libedit-20110802-3.0.bep similarity index 91% rename from dev-libs/libedit/libedit-20110802.bep rename to dev-libs/libedit/libedit-20110802-3.0.bep index 5806b45a5..441ef480a 100644 --- a/dev-libs/libedit/libedit-20110802.bep +++ b/dev-libs/libedit/libedit-20110802-3.0.bep @@ -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 diff --git a/dev-libs/libedit/patches/libedit-20110802-3.0.patch b/dev-libs/libedit/patches/libedit-20110802-3.0.patch new file mode 100644 index 000000000..9fb782c91 --- /dev/null +++ b/dev-libs/libedit/patches/libedit-20110802-3.0.patch @@ -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 + #include + #include ++#ifdef HAVE_SYS_ERRNO_H + #include ++#elif HAVE_ERRNO_H ++#include ++#endif + #include + #include + #include +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 +-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) ++#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) + #include + #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 + #include + #include ++#ifdef HAVE_LANGINFO_H + #include ++#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 + #include + ++#ifdef HAVE_STDINT_H ++#include ++#endif ++ + #ifdef __weak_alias + __weak_alias(strvisx,_strvisx) + #endif diff --git a/dev-libs/libedit/patches/libedit-20110802.patch b/dev-libs/libedit/patches/libedit-20110802.patch deleted file mode 100644 index 43ecf135a..000000000 --- a/dev-libs/libedit/patches/libedit-20110802.patch +++ /dev/null @@ -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 - #include - #include -+#ifdef HAVE_SYS_ERRNO_H - #include -+#elif HAVE_ERRNO_H -+#include -+#endif - #include - #include - #include -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 - #include - #include -+#ifdef HAVE_LANGINFO_H - #include -+#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 - #include - -+#ifdef HAVE_STDINT_H -+#include -+#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 --#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) -+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__) - #include - #endif - #ifndef CTRL