--- databases/sqlite3/Makefile	
+++ databases/sqlite3/Makefile	
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	sqlite3
 DISTVERSION=	3.28.0
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.sqlite.org/2019/ http://www2.sqlite.org/2019/ http://www3.sqlite.org/2019/
 DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
@@ -12,7 +13,7 @@ COMMENT=	SQL database engine in a C library
 
 LICENSE=	PD
 
-USES=		libtool ncurses pathfix
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
@@ -26,8 +27,8 @@ OPTIONS_DEFINE=		FTS4 URI URI_AUTHORITY METADATA \
 			LIKENOTBLOB STSHELL FTS3_TOKEN UNKNOWN_SQL SORT_REF \
 			NORMALIZE
 OPTIONS_SINGLE=		RAMT
-OPTIONS_RADIO=		STAT
-OPTIONS_GROUP=		OPT_EXT OPT_FUNC UNICODE RTREEG RL
+OPTIONS_RADIO=		STAT RL
+OPTIONS_GROUP=		OPT_EXT OPT_FUNC UNICODE RTREEG
 
 OPTIONS_GROUP_OPT_EXT=	JSON1 SESSION
 OPTIONS_GROUP_OPT_FUNC=	OFFSET SER1 SOUNDEX
@@ -124,17 +125,11 @@ RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
 GEOPOLY_DESC=		Uses the GeoJSON notation (RFC-7946)
 GEOPOLY_IMPLIES=	RTREE
 
-OPTIONS_GROUP_RL=	READLINES READLINEP EDITLINE
-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
+OPTIONS_RADIO_RL=	LIBEDIT READLINE
+RL_DESC=		Command line editing library (may be off)
 
 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 FTS5
 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
 # RTREE used by graphics/mapnik, databases/spatialite
@@ -196,12 +191,12 @@ ICU_LIBS=	`${LOCALBASE}/bin/icu-config --ldflags`
 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
+LIBEDIT_CONFIGURE_ON=	--enable-editline
+LIBEDIT_CONFIGURE_OFF=	--disable-editline
+LIBEDIT_USES=	libedit ncurses
+READLINE_CONFIGURE_ON=	--enable-readline
+READLINE_CONFIGURE_OFF=	--disable-readline
+READLINE_USES=	readline ncurses
 
 JSON1_CONFIGURE_ENABLE=	json1