diff -urNd databases/sqlite3.orig/Makefile databases/sqlite3/Makefile
--- databases/sqlite3.orig/Makefile	2017-09-02 09:19:30.395490000 +0000
+++ databases/sqlite3/Makefile	2017-09-03 10:28:52.530735000 +0000
@@ -3,6 +3,7 @@
 
 PORTNAME=	sqlite3
 PORTVERSION=	3.20.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/2017/ http://www2.sqlite.org/2017/ http://www3.sqlite.org/2017/
 DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
@@ -12,7 +13,7 @@
 
 LICENSE=	PD
 
-USES=		libtool ncurses pathfix
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -24,9 +25,9 @@
 		DIRECT_READ MEMMAN SECURE_DELETE UNLOCK_NOTIFY THREADS \
 		EXTENSION ARMOR STMT DBSTAT FTS5 JSON1 RBU NULL_TRIM \
 		LIKENOTBLOB STSHELL FTS3_TOKEN SESSION UNKNOWN_SQL
-OPTIONS_SINGLE=	RAMT
+OPTIONS_SINGLE=	RAMT RL
 OPTIONS_RADIO=	STAT
-OPTIONS_GROUP=	UNICODE RTREEG RL
+OPTIONS_GROUP=	UNICODE RTREEG
 
 UPD_DEL_LIMIT_DESC=	ORDER BY and LIMIT on UPDATE and DELETE
 URI_DESC=		Enable use the URI filename
@@ -103,17 +104,14 @@
 RTREE_DESC=		Enable R*Tree module
 RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
 
-OPTIONS_GROUP_RL=	READLINES READLINEP EDITLINE
+OPTIONS_SINGLE_RL=	EDITLINE READLINE NONERL
 RL_DESC=		Which command line editing library to use:
-READLINES_DESC=		the libreadline from system
-READLINEP_DESC=		the GNU libreadline from ports
 EDITLINE_DESC=		the BSD libedit from ports
-READLINES_PREVENTS=	READLINEP EDITLINE
-READLINEP_PREVENTS=	READLINES EDITLINE
-EDITLINE_PREVENTS=	READLINES READLINEP
+READLINE_DESC=		the GNU libreadline from ports
+NONERL_DESC=		without library
 
 OPTIONS_DEFAULT=	FTS4 URI METADATA SECURE_DELETE UNLOCK_NOTIFY THREADS \
-			EXTENSION TS1 UNICODE61 RTREE DBSTAT STSHELL READLINES \
+			EXTENSION TS1 UNICODE61 RTREE DBSTAT STSHELL READLINE \
 			FTS3_TOKEN
 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
 # RTREE used by graphics/mapnik, databases/spatialite
@@ -175,12 +173,11 @@
 UNICODE61_CPPFLAGS=	""
 UNICODE61_CPPFLAGS_OFF=	-DSQLITE_DISABLE_FTS3_UNICODE=1
 
-READLINES_CONFIGURE_ON=	--enable-readline
-READLINES_USES=	readline
-READLINEP_CONFIGURE_ON=	--enable-readline
-READLINEP_USES=	readline:port
-EDITLINE_CONFIGURE_ENABLE=	editline
-EDITLINE_USES=	libedit
+EDITLINE_CONFIGURE_ON=	--disable-readline
+EDITLINE_USES=	libedit ncurses
+READLINE_CONFIGURE_ON=	--disable-editline
+READLINE_USES=	readline ncurses
+NONERL_CONFIGURE_ON=	--disable-readline --disable-editline
 
 JSON1_CONFIGURE_ENABLE=	json1