Hi,
the following patch allows Octave to use readline. Okay?
Paul
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.77
diff -u -p -r1.77 Makefile
--- Makefile 30 Oct 2015 12:47:40 -0000 1.77
+++ Makefile 1 Nov 2015 16:10:22 -0000
@@ -7,7 +7,7 @@ NOT_FOR_ARCHS = vax sparc
COMMENT = high-level language for numerical computations
VERSION = 4.0.0
-REVISION = 1
+REVISION = 2
DISTNAME = octave-${VERSION}
CATEGORIES = math
@@ -27,7 +27,7 @@ WANTLIB += FLAC GL GLU GraphicsMagick Gr
WANTLIB += QtNetwork QtOpenGL SM X11 X11-xcb Xau Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender
WANTLIB += Xt Xxf86vm amd arpack blas bz2 c camd ccolamd cholmod
-WANTLIB += colamd crypto curl cxsparse drm expat fftw3 fftw3_threads
+WANTLIB += colamd crypto curl cxsparse drm expat ereadline fftw3 fftw3_threads
WANTLIB += fftw3f fftw3f_threads fltk fltk_gl fontconfig freetype
WANTLIB += gl2ps glapi glpk glut gmp hdf5 idn lapack lcms2
WANTLIB += ltdl lzma m ncurses nghttp2 ogg pcre png portaudio pthread
@@ -55,6 +55,7 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
audio/portaudio-svn \
devel/glpk \
devel/pcre \
+ devel/readline \
editors/qscintilla \
graphics/GraphicsMagick \
math/arpack \
@@ -73,9 +74,9 @@ USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
# --disable-readline: needs GNU readline
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
- --disable-readline \
--disable-java
-CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+ -I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LRELEASE="lrelease4" \
F77=${FC}
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 1 Nov 2015 16:10:22 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Use GNU readline as our base readline lacks rl_prefer_env_winsize.
+
+--- configure.orig Sun Nov 1 01:33:48 2015
++++ configure Sun Nov 1 01:36:34 2015
+@@ -39751,13 +39751,13 @@ fi
+
+ ac_octave_save_LIBS="$LIBS"
+ LIBS="$TERM_LIBS"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
rl_set_keyboard_input_timeout in -lreadline" >&5
+-$as_echo_n "checking for rl_set_keyboard_input_timeout in -lreadline... "
>&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
rl_set_keyboard_input_timeout in -lereadline" >&5
++$as_echo_n "checking for rl_set_keyboard_input_timeout in -lereadline... "
>&6; }
+ if ${ac_cv_lib_readline_rl_set_keyboard_input_timeout+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline $LIBS"
++LIBS="-lereadline $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -39796,7 +39796,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
+ $as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
+ if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
+- READLINE_LIBS="-lreadline"
++ READLINE_LIBS="-lereadline"
+
+ $as_echo "#define USE_READLINE 1" >>confdefs.h
+
