Fri Aug 16 11:31:50 2013 UTC ()
Change READLINE_DEFAULT to 'readline' if not using a builtin implementation,
there is just too much breakage with editline currently and most of the
advantages of editline are lost when not using a builtin version.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/mk/readline.buildlink3.mk
cvs diff -r1.3 -r1.4 pkgsrc/mk/readline.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/readline.buildlink3.mk 2013/07/19 14:35:37 1.3
+++ pkgsrc/mk/readline.buildlink3.mk 2013/08/16 11:31:50 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: readline.buildlink3.mk,v 1.3 2013/07/19 14:35:37 ryoon Exp $ 1# $NetBSD: readline.buildlink3.mk,v 1.4 2013/08/16 11:31:50 jperkin Exp $
2# 2#
3# This Makefile fragment is meant to be included by packages that require 3# This Makefile fragment is meant to be included by packages that require
4# any readline implementation instead of one particular one. The available 4# any readline implementation instead of one particular one. The available
5# readline/editline implementations are "editline" and "readline". 5# readline/editline implementations are "editline" and "readline".
6# 6#
7# If a package genuinely requires editline or readline, then it should 7# If a package genuinely requires editline or readline, then it should
8# directly include the appropriate buildlink3.mk instead of this file in 8# directly include the appropriate buildlink3.mk instead of this file in
9# the package Makefile. 9# the package Makefile.
10# 10#
11# === User-settable variables === 11# === User-settable variables ===
12# 12#
13# READLINE_DEFAULT 13# READLINE_DEFAULT
14# This value represents the type of readline we wish to use on the 14# This value represents the type of readline we wish to use on the
@@ -38,30 +38,29 @@ CHECK_BUILTIN.editlinereadline:= yes @@ -38,30 +38,29 @@ CHECK_BUILTIN.editlinereadline:= yes
38.include "readline.builtin.mk" 38.include "readline.builtin.mk"
39CHECK_BUILTIN.editlinereadline:= no 39CHECK_BUILTIN.editlinereadline:= no
40 40
41# Set the value of READLINE_DEFAULT depending on the platform and what's 41# Set the value of READLINE_DEFAULT depending on the platform and what's
42# available in the base system. 42# available in the base system.
43# 43#
44.if defined(IS_BUILTIN.editline) && \ 44.if defined(IS_BUILTIN.editline) && \
45 !empty(IS_BUILTIN.editline:M[Yy][Ee][Ss]) 45 !empty(IS_BUILTIN.editline:M[Yy][Ee][Ss])
46READLINE_DEFAULT?= editline 46READLINE_DEFAULT?= editline
47.elif defined(IS_BUILTIN.readline) && \ 47.elif defined(IS_BUILTIN.readline) && \
48 !empty(IS_BUILTIN.readline:M[Yy][Ee][Ss]) 48 !empty(IS_BUILTIN.readline:M[Yy][Ee][Ss])
49READLINE_DEFAULT?= readline 49READLINE_DEFAULT?= readline
50.else 50.else
51READLINE_DEFAULT?= editline 51READLINE_DEFAULT?= readline
52.endif 52.endif
53 53
54 
55_READLINE_ACCEPTED= ${_READLINE_PKGS} # both are provided by pkgsrc. 54_READLINE_ACCEPTED= ${_READLINE_PKGS} # both are provided by pkgsrc.
56 55
57_READLINE_TYPE= ${READLINE_DEFAULT} 56_READLINE_TYPE= ${READLINE_DEFAULT}
58. if !empty(_READLINE_ACCEPTED:M${_READLINE_TYPE}) 57. if !empty(_READLINE_ACCEPTED:M${_READLINE_TYPE})
59READLINE_TYPE= ${_READLINE_TYPE} 58READLINE_TYPE= ${_READLINE_TYPE}
60. else 59. else
61READLINE_TYPE= none 60READLINE_TYPE= none
62. endif 61. endif
63 62
64BUILD_DEFS+= READLINE_DEFAULT 63BUILD_DEFS+= READLINE_DEFAULT
65BUILD_DEFS_EFFECTS+= READLINE_TYPE 64BUILD_DEFS_EFFECTS+= READLINE_TYPE
66 65
67# _PKG_USE_READLINE is a flag for use by the readline packages' buildlink3.mk 66# _PKG_USE_READLINE is a flag for use by the readline packages' buildlink3.mk