libedit: bump to 20180525-3.1, fix INSTALL for 2nd arch. (#2769)

This commit is contained in:
fbrosson
2018-07-02 22:17:33 +00:00
parent 2b631a03a8
commit 0fd2884b02
2 changed files with 7 additions and 7 deletions

View File

@@ -8,14 +8,14 @@ COPYRIGHT="1992-2018 The NetBSD Foundation, Inc."
LICENSE="BSD (3-clause)"
REVISION="1"
SOURCE_URI="http://thrysoee.dk/editline/libedit-${portVersion/_/-}.tar.gz"
CHECKSUM_SHA256="91f2d90fbd2a048ff6dad7131d9a39e690fd8a8fd982a353f1333dd4017dd4be"
CHECKSUM_SHA256="c41bea8fd140fb57ba67a98ec1d8ae0b8ffa82f4aba9c35a87e5a9499e653116"
SOURCE_DIR="libedit-${portVersion/_/-}"
PATCHES="libedit-${portVersion/_/-}.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
libVersion="0.0.56"
libVersion="0.0.58"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
@@ -80,7 +80,7 @@ INSTALL()
# devel package
packageEntries devel \
"$developDir" \
"$maybe_manDir_man3"
${maybe_manDir_man3:+"$maybe_manDir_man3"}
}
TEST()

View File

@@ -5,7 +5,7 @@ Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index 9a571b2..c4bff22 100644
index a5e3885..aff8782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ AM_CONDITIONAL(ENABLE_EXAMPLES, [test "$enable_examples" = "yes"])
@@ -18,7 +18,7 @@ index 9a571b2..c4bff22 100644
AC_CHECK_HEADER([ncurses.h], [],
[AC_CHECK_HEADER([curses.h], [],
diff --git a/src/editline/readline.h b/src/editline/readline.h
index 777a4c6..0fc61af 100644
index a2a6c15..fe1069f 100644
--- a/src/editline/readline.h
+++ b/src/editline/readline.h
@@ -74,7 +74,7 @@ typedef KEYMAP_ENTRY *Keymap;
@@ -31,7 +31,7 @@ index 777a4c6..0fc61af 100644
#endif
#ifndef CTRL
diff --git a/src/vis.c b/src/vis.c
index 914e7b1..69da62d 100644
index ce66205..283cf38 100644
--- a/src/vis.c
+++ b/src/vis.c
@@ -75,6 +75,10 @@ __FBSDID("$FreeBSD$");