diff options
Diffstat (limited to 'devel/libreadline-java')
| -rw-r--r-- | devel/libreadline-java/Makefile | 53 | ||||
| -rw-r--r-- | devel/libreadline-java/distinfo | 2 | ||||
| -rw-r--r-- | devel/libreadline-java/files/JReadlineCompleter.py | 202 | ||||
| -rw-r--r-- | devel/libreadline-java/files/jython.sh.in | 56 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-Makefile | 59 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_Makefile | 11 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_native_Makefile | 67 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_native_getline.c | 82 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_native_getline.h | 29 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c | 45 | ||||
| -rw-r--r-- | devel/libreadline-java/files/patch-src_org_gnu_readline_Readline.java | 52 | ||||
| -rw-r--r-- | devel/libreadline-java/files/pkg-message.in | 9 | ||||
| -rw-r--r-- | devel/libreadline-java/pkg-descr | 15 |
13 files changed, 0 insertions, 682 deletions
diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile deleted file mode 100644 index 30ccd9e364bd..000000000000 --- a/devel/libreadline-java/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -PORTNAME= libreadline-java -PORTVERSION= 0.8.0 -DISTVERSIONSUFFIX= -src -PORTREVISION= 10 -CATEGORIES= devel java -MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= JNI wrapper around GNU Readline / libedit / libgetline -WWW= https://sourceforge.net/projects/java-readline/ - -DEPRECATED= 20 years old, does not build with jdk11+, not actively maintained, no users in the tree, forked(?) to https://github.com/aclemons/java-readline -EXPIRATION_DATE= 2026-10-28 - -USES= gmake java libedit ncurses readline -JAVA_VERSION= 8 - -ALL_TARGET= # empty -MAKE_ENV= JAVA_HOME="${JAVA_HOME}" JAVA="${JAVA}" JAVAC="${JAVAC}" \ - JAVAH="${JAVAH}" JAR_="${JAR}" -SUB_FILES= pkg-message jython.sh -PLIST_FILES= %%JAVAJARDIR%%/libreadline-java.jar \ - lib/libJavaReadline.so \ - lib/libJavaEditline.so \ - lib/libJavaGetline.so -PORTDOCS= README.1st README jython.sh JReadlineCompleter.py -USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_JOBS_UNSAFE= yes - -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar \ - ${STAGEDIR}${JAVAJARDIR} - ${INSTALL_LIB} ${WRKSRC}/libJavaReadline.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libJavaEditline.so ${STAGEDIR}${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/libJavaGetline.so ${STAGEDIR}${PREFIX}/lib - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.1st ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/jython.sh ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py \ - ${STAGEDIR}${DOCSDIR} - -.if !defined(BATCH) -test: - cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} test # Now type something! -.endif - -.include <bsd.port.mk> diff --git a/devel/libreadline-java/distinfo b/devel/libreadline-java/distinfo deleted file mode 100644 index 2e47aec38a5a..000000000000 --- a/devel/libreadline-java/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (libreadline-java-0.8.0-src.tar.gz) = cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 -SIZE (libreadline-java-0.8.0-src.tar.gz) = 77122 diff --git a/devel/libreadline-java/files/JReadlineCompleter.py b/devel/libreadline-java/files/JReadlineCompleter.py deleted file mode 100644 index 355543428f74..000000000000 --- a/devel/libreadline-java/files/JReadlineCompleter.py +++ /dev/null @@ -1,202 +0,0 @@ -# (X)Emacs: -*- mode: python; coding: latin-1; -*- -# TAB-Completion for Jython with org.python.util.ReadlineConsole. -# JReadlineCompleter.py,v 1.1 2007/09/28 08:18:43 martin Exp -# -# This is rlcompleter.py from CPython 2.5.1 adapted for Jython -# and libreadline-java. -# -# NOTE: Jython >= 2.5 already includes rlcompleter, -# see http://www.jython.org/docs/library/rlcompleter.html -# This is useful for older Jython versions only! - -"""TAB-completion for Jython + libreadline-java - -The completer completes keywords, built-ins and globals in a -selectable namespace (which defaults to __main__); when completing -NAME.NAME..., it evaluates (!) the expression up to the last dot and -completes its attributes. - -It's very cool to do "import sys" type "sys.", hit the -completion key (twice), and see the list of names defined by the -sys module! - -Notes: - -- Exceptions raised by the completer function are *ignored* (and -generally cause the completion to fail). This is a feature -- since -readline sets the tty device in raw (or cbreak) mode, printing a -traceback wouldn't work well without some complicated hoopla to save, -reset and restore the tty state. - -- The evaluation of the NAME.NAME... form may cause arbitrary -application defined code to be executed if an object with a -__getattr__ hook is found. Since it is the responsibility of the -application (or the user) to enable this feature, I consider this an -acceptable risk. More complicated expressions (e.g. function calls or -indexing operations) are *not* evaluated. - -This module is a hacked version of the CPython 2.5 module rlcompleter. -It is under the PSF (Python Software Foundation) license. -""" - -# CAUTION: Licensing issues may arise when changing the backend -# library to "GnuReadline" which is under the GPL. -DEFAULTLIB = "Editline" - -# Try to give useful hints for any import failure here: -import sys -if not sys.platform.startswith("java"): - raise EnvironmentError("Module %s is to be used with Jython only!" % - (__name__ == "__main__" and __file__ or __name__)) -if sys.registry["python.console"] != "org.python.util.ReadlineConsole": - raise EnvironmentError("You need to set python.console=org.python.util.ReadlineConsole in your ~/.jython file!") -try: - from org.gnu.readline import Readline, ReadlineLibrary, ReadlineCompleter -except ImportError: - raise ImportError("Make sure you have libreadline-java.jar in classpath!") -import __builtin__ -import atexit -import keyword -import os -import re - -__all__ = ["PyCompleter", "JvCompleter"] - -Readline.load( - getattr(ReadlineLibrary, sys.registry["python.console.readlinelib"], "") - or DEFAULTLIB) -histfile = os.path.join(os.environ["HOME"], ".jyhist") -try: - Readline.readHistoryFile(histfile) -except: - print >> sys.stderr, histfile, "not available!" -atexit.register(Readline.writeHistoryFile, histfile) - -class PyCompleter: - def __init__(self, namespace = None): - """Create a new completer for the command line. - - PyCompleter([namespace]) -> completer instance. - - If unspecified, the default namespace where completions are performed - is __main__ (technically, __main__.__dict__). Namespaces should be - given as dictionaries. - """ - - if namespace and not isinstance(namespace, dict): - raise TypeError,'namespace must be a dictionary' - - # Don't bind to namespace quite yet, but flag whether the user wants a - # specific namespace or to use __main__.__dict__. This will allow us - # to bind to __main__.__dict__ at completion time, not now. - if namespace is None: - self.use_main_ns = 1 - else: - self.use_main_ns = 0 - self.namespace = namespace - - def complete(self, text, state): - """Return the next possible completion for 'text'. - - This is called successively with state == 0, 1, 2, ... until it - returns None. The completion should begin with 'text'. - - """ - if self.use_main_ns: - import __main__ - self.namespace = __main__.__dict__ - - try: - if state == 0: - if "." in text: - matches = self.attr_matches(text) - else: - matches = self.global_matches(text) - # remove duplicates and sort - matches = list(set(matches)) - matches.sort() - self.matches = matches - return self.matches[state] - except (AttributeError, IndexError, NameError): - return None - - def global_matches(self, text): - """Compute matches when text is a simple name. - - Return a list of all keywords, built-in functions and names currently - defined in self.namespace that match. - - """ - matches = [] - n = len(text) - for list in [keyword.kwlist, - __builtin__.__dict__, - self.namespace]: - for word in list: - if word[:n] == text and word != "__builtins__": - matches.append(word) - return matches - - def attr_matches(self, text): - """Compute matches when text contains a dot. - - Assuming the text is of the form NAME.NAME....[NAME], and is - evaluatable in self.namespace, it will be evaluated and its attributes - (as revealed by dir()) are used as possible completions. (For class - instances, class members are also considered.) - - WARNING: this can still invoke arbitrary C code, if an object - with a __getattr__ hook is evaluated. - - """ - m = re.match(r"(\w+(\.\w+)*)\.(\w*)", text) - if not m: - return - expr, attr = m.group(1, 3) - object = eval(expr, self.namespace) - words = dir(object) - if hasattr(object,'__class__'): - words.append('__class__') - words = words + get_class_members(object.__class__) - matches = [] - n = len(attr) - for word in words: - if word[:n] == attr and word != "__builtins__": - matches.append("%s.%s" % (expr, word)) - return matches - -def get_class_members(klass): - ret = dir(klass) - if hasattr(klass,'__bases__'): - for base in klass.__bases__: - ret = ret + get_class_members(base) - return ret - - -class JvCompleter(ReadlineCompleter): - """Create a new completer for the command line. - - JvCompleter([completion_callable]) -> completer instance. - - JvCompleter instances should be used as the completion mechanism - of Readline via the setCompleter() call. - """ - def __init__(self, realcompleter): - self.realcompleter = realcompleter - def completer(self, text, state): - return self.realcompleter(text, state) - - -pycompleter = PyCompleter() -jvcompleter = JvCompleter(pycompleter.complete) -Readline.setCompleter(jvcompleter) -Readline.parseAndBind("tab: complete") -try: - Readline.setCompletionAppendCharacter('\0') -except: - pass # Method only available from my java-readline patch. - -if __name__ == '__main__': - print "Sorry, no unit tests yet!" - -#EOF# diff --git a/devel/libreadline-java/files/jython.sh.in b/devel/libreadline-java/files/jython.sh.in deleted file mode 100644 index 6356a48b7717..000000000000 --- a/devel/libreadline-java/files/jython.sh.in +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# Invoke Jython. -# jython.sh,v 1.5 2007/09/28 09:13:55 martin Exp -# -# The path names below are for Jython 2.5.3 on FreeBSD. -# -# NOTE: Jython >= 2.5 already includes rlcompleter, -# see http://www.jython.org/docs/library/rlcompleter.html -# This is useful for older Jython versions only! - -if [ -d "%%LOCALBASE%%/lib/jython22" ] ; then - _ver=22 -else - _ver= -fi -CP="%%LOCALBASE%%/lib/jython${_ver}/jython.jar" -defs= -wrapper= - -case "${JYTHON_CONSOLE:-Editline}" in - *[Ee]dit[Ll]ine) - CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" - defs="-Dpython.console=org.python.util.ReadlineConsole" - defs="$defs -Dpython.console.readlinelib=Editline" - ;; - *[Gg]et[Ll]ine) - CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" - defs="-Dpython.console=org.python.util.ReadlineConsole" - defs="$defs -Dpython.console.readlinelib=Getline" - ;; - *[Jj][Ll]ine) - CP="$CP:%%LOCALBASE%%/share/java/classes/jline.jar" - defs="-Dpython.console=" - wrapper=jline.ConsoleRunner - ;; - *[Rr]ead[Ll]ine) - CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" - defs="-Dpython.console=org.python.util.ReadlineConsole" - defs="$defs -Dpython.console.readlinelib=GnuReadline" - ;; - *) - echo >&2 "$0: illegal value of JYTHON_CONSOLE: $JYTHON_CONSOLE" - exit 64 - ;; -esac - - -if [ -n "$CLASSPATH" ]; then - CP="$CP:$CLASSPATH" -fi - -exec java -Dpython.home="%%LOCALBASE%%/lib/jython${_ver}" \ - -Dpython.cachedir="${HOME}/.jython-cachedir" \ - -classpath "$CP" $wrapper org.python.util.jython $defs "$@" - -#EOF# diff --git a/devel/libreadline-java/files/patch-Makefile b/devel/libreadline-java/files/patch-Makefile deleted file mode 100644 index 010d8f17e4be..000000000000 --- a/devel/libreadline-java/files/patch-Makefile +++ /dev/null @@ -1,59 +0,0 @@ ---- Makefile.orig 2003-01-07 10:14:35 UTC -+++ Makefile -@@ -54,11 +54,11 @@ DOCDIR = $(PREFIX)/doc - JAVALIBDIR= $(PREFIX)/share/java - - # libraries to build --T_LIBS = JavaReadline -+T_LIBS = JavaReadline JavaEditline JavaGetline - - # Operating system dependent - JAVAINCLUDE = $(JAVA_HOME)/include --JAVANATINC = $(JAVA_HOME)/include/linux -+JAVANATINC = $(JAVA_HOME)/include/freebsd - - ifeq (MSC,$(WIN32)) - JAVA_HOME := c:/j2sdk1.4.0 -@@ -69,9 +69,14 @@ ARGS = Getline - endif - - ## normal javac --JAVAC = javac -+JAVAC ?= javac - JC_FLAGS = - -+## other tools -+JAVA ?= java -+JAVAH ?= javah -+JAR_ ?= jar -+ - ## with jikes - #JAVAC = jikes - #JC_FLAGS = -O +E -@@ -86,7 +91,7 @@ RPM_BASE = `pwd`/$(BUILDDIR)/ - world : jar build-native - - jar: build-java -- cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) * -+ cd $(BUILDDIR) ; $(JAR_) -cvmf ../$(MF_STUB) ../$(JAR) * - - $(JAR): - cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) * -@@ -96,7 +101,7 @@ build-java: $(BUILDDIR) - - build-native: - cd src; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \ -- JAVANATINC="$(JAVANATINC)" native -+ JAVANATINC="$(JAVANATINC)" JAVAH="$(JAVAH)" native - - apidoc: $(APIDIR) - javadoc -sourcepath src -d $(APIDIR) -windowtitle $(WTITLE) \ -@@ -140,7 +145,7 @@ rpm: src-dist - rpm --define _topdir$(RPM_BASE) -ba $(RPM_BASE)/SPECS/libreadline-java.spec - - test: $(JAR) build-native -- LD_LIBRARY_PATH=. java -jar $(JAR) src/test/tinputrc $(ARGS) -+ LD_LIBRARY_PATH=. $(JAVA) -jar $(JAR) src/test/tinputrc $(ARGS) - - clean: - $(MAKE) -C src/native clean diff --git a/devel/libreadline-java/files/patch-src_Makefile b/devel/libreadline-java/files/patch-src_Makefile deleted file mode 100644 index a685e4806b87..000000000000 --- a/devel/libreadline-java/files/patch-src_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig 2003-01-07 10:14:35 UTC -+++ src/Makefile -@@ -10,7 +10,7 @@ java: always $(BUILD) - - native: always - cd native ; $(MAKE) T_LIBS="$(T_LIBS)" JAVAINCLUDE="$(JAVAINCLUDE)" \ -- JAVANATINC="$(JAVANATINC)" all -+ JAVANATINC="$(JAVANATINC)" JAVAH="$(JAVAH)" all - - $(BUILD): - mkdir $@ diff --git a/devel/libreadline-java/files/patch-src_native_Makefile b/devel/libreadline-java/files/patch-src_native_Makefile deleted file mode 100644 index da28b36e451a..000000000000 --- a/devel/libreadline-java/files/patch-src_native_Makefile +++ /dev/null @@ -1,67 +0,0 @@ ---- src/native/Makefile.orig 2003-01-07 10:14:35 UTC -+++ src/native/Makefile -@@ -38,25 +38,31 @@ ifeq (MSC,$(WIN32)) - INCLUDES = -I "c:/Programme/DevStudio/VC/include" \ - -I $(JAVAINCLUDE) -I $(JAVANATINC) - LIB = "c:/Programme/DevStudio/VC/lib" --CC = cl -+#CC = gcc - OBJ_EXT := obj - LIB_PRE := - LIB_EXT := dll - CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ - else --INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) --LIBPATH = -L/usr/lib/termcap --JavaReadline_LIBS = -lreadline -ltermcap -lhistory --JavaEditline_LIBS = -ledit -ltermcap -+INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC) -I $(LOCALBASE)/include -+ifeq (JavaEditline,$(TG)) -+LIBPATH = -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib -+endif -+ifeq (JavaReadline,$(TG)) -+LIBPATH = -L$(LOCALBASE)/lib -rpath $(LOCALBASE)/lib -+endif -+JavaReadline_LIBS = -lreadline -lncurses -lhistory -+JavaEditline_LIBS = $(LOCALBASE)/lib/libedit.so -lncurses - ifeq (cygwin,$(WIN32)) - JavaGetline_LIBS = -lcygwin - endif --CC = gcc -+CC = cc - OBJ_EXT := o - LIB_PRE := lib - LIB_EXT := so --CFLAGS=-fPIC -DPOSIX -+CFLAGS+=-fPIC -DPOSIX - endif -+JAVAH ?= javah - - - OBJECTS := org_gnu_readline_Readline.$(OBJ_EXT) -@@ -69,13 +75,13 @@ all: $(T_LIBS) - lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT) - - JavaReadline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - JavaEditline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - JavaGetline: -- make TG=$@ lib -+ $(MAKE) TG=$@ lib - - $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS) - ifeq (MSC,$(WIN32)) -@@ -110,7 +116,7 @@ org_gnu_readline_Readline.$(OBJ_EXT): or - -c org_gnu_readline_Readline.c - - org_gnu_readline_Readline.h: $(BUILDDIR)/org/gnu/readline/Readline.class -- javah -classpath $(BUILDDIR) -jni org.gnu.readline.Readline -+ $(JAVAH) -classpath $(BUILDDIR) -jni org.gnu.readline.Readline - touch org_gnu_readline_Readline.h - - clean: diff --git a/devel/libreadline-java/files/patch-src_native_getline.c b/devel/libreadline-java/files/patch-src_native_getline.c deleted file mode 100644 index c4e90c31b69a..000000000000 --- a/devel/libreadline-java/files/patch-src_native_getline.c +++ /dev/null @@ -1,82 +0,0 @@ ---- src/native/getline.c.orig 2003-01-07 10:14:35 UTC -+++ src/native/getline.c -@@ -41,7 +41,7 @@ char* rl_readline_name; - - /********************* exported interface ********************************/ - --char *getline(); /* read a line of input */ -+char *get_line(); /* read a line of input */ - void gl_setwidth(); /* specify width of screen */ - void gl_histadd(); /* adds entries to hist */ - void gl_strwidth(); /* to bind gl_strlen */ -@@ -136,7 +136,6 @@ extern void exit(); - #ifndef __convexc__ - extern int read(); - extern int kill(); --extern int ioctl(); - #endif /* not __convexc__ */ - #ifdef POSIX /* use POSIX interface */ - #include <termios.h> -@@ -387,7 +386,7 @@ gl_init() - hist_init(); - } - if (isatty(0) == 0 || isatty(1) == 0) -- gl_error("\n*** Error: getline(): not interactive, use stdio.\n"); -+ gl_error("\n*** Error: get_line(): not interactive, use stdio.\n"); - gl_char_init(); - gl_init_done = 1; - } -@@ -414,7 +413,7 @@ int w; - } - - char * --getline(prompt) -+get_line(prompt) - char *prompt; - { - int c, loc, tmp; -@@ -585,7 +584,7 @@ int c; - int i; - - if (gl_cnt >= BUF_SIZE - 1) -- gl_error("\n*** Error: getline(): input buffer overflow\n"); -+ gl_error("\n*** Error: get_line(): input buffer overflow\n"); - if (gl_overwrite == 0 || gl_pos == gl_cnt) { - for (i=gl_cnt; i >= gl_pos; i--) - gl_buf[i+1] = gl_buf[i]; -@@ -608,7 +607,7 @@ gl_yank() - if (len > 0) { - if (gl_overwrite == 0) { - if (gl_cnt + len >= BUF_SIZE - 1) -- gl_error("\n*** Error: getline(): input buffer overflow\n"); -+ gl_error("\n*** Error: get_line(): input buffer overflow\n"); - for (i=gl_cnt; i >= gl_pos; i--) - gl_buf[i+len] = gl_buf[i]; - for (i=0; i < len; i++) -@@ -617,7 +616,7 @@ gl_yank() - } else { - if (gl_pos + len > gl_cnt) { - if (gl_pos + len >= BUF_SIZE - 1) -- gl_error("\n*** Error: getline(): input buffer overflow\n"); -+ gl_error("\n*** Error: get_line(): input buffer overflow\n"); - gl_buf[gl_pos + len] = 0; - } - for (i=0; i < len; i++) -@@ -657,7 +656,7 @@ gl_newline() - int loc = gl_width - 5; /* shifts line back to start position */ - - if (gl_cnt >= BUF_SIZE - 1) -- gl_error("\n*** Error: getline(): input buffer overflow\n"); -+ gl_error("\n*** Error: get_line(): input buffer overflow\n"); - if (gl_out_hook) { - change = gl_out_hook(gl_buf); - len = strlen(gl_buf); -@@ -916,7 +915,7 @@ char *buf; - char *p = buf; - int len; - -- /* in case we call gl_histadd() before we call getline() */ -+ /* in case we call gl_histadd() before we call get_line() */ - if (gl_init_done < 0) { /* -1 only on startup */ - hist_init(); - gl_init_done = 0; diff --git a/devel/libreadline-java/files/patch-src_native_getline.h b/devel/libreadline-java/files/patch-src_native_getline.h deleted file mode 100644 index b892fdec14be..000000000000 --- a/devel/libreadline-java/files/patch-src_native_getline.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/native/getline.h.orig 2003-01-07 10:14:35 UTC -+++ src/native/getline.h -@@ -9,7 +9,7 @@ - - extern char* rl_readline_name; /* unused by getline */ - #define add_history(buffer) gl_histadd(buffer) --#define readline(buffer) getline(buffer) -+#define readline(buffer) get_line(buffer) - #define clear_history() hist_init() - #define using_history() hist_init() - -@@ -18,7 +18,7 @@ extern char* rl_readline_name; - - typedef size_t (*gl_strwidth_proc)(char *); - --char *getline(char *); /* read a line of input */ -+char *get_line(char *); /* read a line of input */ - void gl_setwidth(int); /* specify width of screen */ - void gl_histadd(char *); /* adds entries to hist */ - void gl_strwidth(gl_strwidth_proc); /* to bind gl_strlen */ -@@ -30,7 +30,7 @@ extern int (*gl_tab_hook)(char *, int, i - - #else /* not __STDC__ */ - --char *getline(); -+char *get_line(); - void gl_setwidth(); - void gl_histadd(); - void gl_strwidth(); diff --git a/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c b/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c deleted file mode 100644 index 4e7ad8e92834..000000000000 --- a/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c +++ /dev/null @@ -1,45 +0,0 @@ ---- src/native/org_gnu_readline_Readline.c.orig 2017-04-02 09:52:09 UTC -+++ src/native/org_gnu_readline_Readline.c -@@ -430,7 +430,7 @@ const char *java_completer(char *text, int state) { - jtext = (*jniEnv)->NewStringUTF(jniEnv,text); - - if (jniMethodId == 0) { -- return; -+ return 0; - } - - completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, -@@ -472,11 +472,7 @@ JNIEXPORT void JNICALL Java_org_gnu_readline_Readline_ - rl_completion_entry_function = NULL; - return; - } --#ifdef JavaEditline -- rl_completion_entry_function = (CPFunction *) java_completer; --#else - rl_completion_entry_function = (rl_compentry_func_t *) java_completer; --#endif - } - else { - rl_completion_entry_function = NULL; -@@ -556,6 +552,21 @@ JNIEXPORT void JNICALL - return; - } - rl_completer_word_break_characters = word_break_buffer; -+} -+#endif -+ -+/* -------------------------------------------------------------------------- */ -+/* Sets/gets rl_completion_append_character */ -+/* -------------------------------------------------------------------------- */ -+ -+#ifndef JavaGetline -+JNIEXPORT jchar JNICALL -+Java_org_gnu_readline_Readline_setCompletionAppendCharacterImpl -+(JNIEnv * env, jclass class, jchar appendCharacter) { -+ int previous_setting = rl_completion_append_character; -+ -+ rl_completion_append_character = (int)appendCharacter; -+ return (jchar)previous_setting; - } - #endif - diff --git a/devel/libreadline-java/files/patch-src_org_gnu_readline_Readline.java b/devel/libreadline-java/files/patch-src_org_gnu_readline_Readline.java deleted file mode 100644 index 62cd3f5b06b1..000000000000 --- a/devel/libreadline-java/files/patch-src_org_gnu_readline_Readline.java +++ /dev/null @@ -1,52 +0,0 @@ ---- src/org/gnu/readline/Readline.java.orig 2003-01-07 10:14:35 UTC -+++ src/org/gnu/readline/Readline.java -@@ -568,6 +568,31 @@ public class Readline { - ///////////////////////////////////////////////////////////////////////////// - - /** -+ Query and set the completion append character. You might need -+ this in a {@link ReadlineCompleter} implementation. The argument -+ appendCharacter should be in the ASCII range. -+ -+ <p>Supporting implementations: -+ <ul> -+ <li>GNU-Readline</li> -+ <li>Editline</li> -+ </ul> -+ </p> -+ -+ */ -+ -+ public static char setCompletionAppendCharacter(char appendCharacter) { -+ if (iLib == ReadlineLibrary.GnuReadline || iLib == ReadlineLibrary.Editline) -+ return setCompletionAppendCharacterImpl(appendCharacter); -+ else if (iThrowException) -+ throw new UnsupportedOperationException(); -+ else -+ return '\uFFFF'; -+ } -+ -+ ///////////////////////////////////////////////////////////////////////////// -+ -+ /** - Query the current line buffer. This returns the current content of - the internal line buffer. You might need this in a - {@link ReadlineCompleter} implementation to access the full text -@@ -838,4 +863,17 @@ public class Readline { - private native static void - setWordBreakCharactersImpl(String wordBreakCharacters) - throws UnsupportedEncodingException; -+ -+ ///////////////////////////////////////////////////////////////////////////// -+ -+ /** -+ Native implementation of setCompletionAppendCharacter() -+ -+ @see -+ org.gnu.readline.Readline#setCompletionAppendCharacter(char appendCharacter) -+ */ -+ -+ private native static char -+ setCompletionAppendCharacterImpl(char appendCharacter); -+ - } diff --git a/devel/libreadline-java/files/pkg-message.in b/devel/libreadline-java/files/pkg-message.in deleted file mode 100644 index 52a0cdc4ce53..000000000000 --- a/devel/libreadline-java/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -To use readline-java add the file -%%JAVAJARDIR%%/libreadline-java.jar -to your classpath! -EOM -} -] diff --git a/devel/libreadline-java/pkg-descr b/devel/libreadline-java/pkg-descr deleted file mode 100644 index edc7b386afbf..000000000000 --- a/devel/libreadline-java/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Java-Readline is a port of GNU Readline for Java. Or, to be more -precise, it is a JNI-wrapper to Readline. It is distributed under the -LGPL. - -You must call Readline.load(ReadlineLibrary lib); before using any -other methods. If you omit the call to the load()-method, the pure -Java fallback solution is used. Possible values for lib are: - -ReadlineLibrary.PureJava -ReadlineLibrary.GnuReadline -ReadlineLibrary.Editline -ReadlineLibrary.Getline - -Note that all programs using GnuReadline will fall under the GPL, -since Gnu-Readline is GPL software! |
