Index: devel/readline/Makefile
===================================================================
--- devel/readline/Makefile
+++ devel/readline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	readline
 PORTVERSION=	8.0.${PATCHLEVEL}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -27,9 +28,7 @@
 CPE_VERSION=	${PORTVERSION:R}
 CPE_UPDATE=	${PATCHLEVEL}
 
-OPTIONS_DEFINE=	TERMCAP DOCS
-OPTIONS_DEFAULT=TERMCAP
-TERMCAP_DESC=	Link against libtermcap
+OPTIONS_DEFINE=	DOCS
 
 #PATCHES=	1 2 3 4 5
 #PATCHLEVEL=	${PATCHES:O:[-1]}
@@ -39,15 +38,13 @@
 #.endfor
 
 post-patch:
-# Comment out "Requires.private:" line since we do not have {curses,ncurses,tinfo,termcap}.pc in base system.
-# See PR/223130 for details.
-	@${REINPLACE_CMD} -e '/^Requires.private: @TERMCAP_PKG_CONFIG_LIB@/ s|^|#|' ${WRKSRC}/readline.pc.in
+.if exists(/usr/lib/libtermcapw.so)
+	${REINPLACE_CMD} "s/-ltermcap/-ltermcapw/g" \
+		${WRKSRC}/configure
+.endif
 
-post-patch-TERMCAP-on:
-	@${REINPLACE_CMD} -e '/SHOBJ_LDFLAGS = / s| = |&-ltermcapw |' ${WRKSRC}/shlib/Makefile.in
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8 ${STAGEDIR}${PREFIX}/lib/libreadline.so.8
-	${INSTALL_DATA} ${WRKSRC}/readline.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8.0 \
+		${STAGEDIR}${PREFIX}/lib/libreadline.so.8.0
 
 .include <bsd.port.mk>
Index: devel/readline/files/patch-readline.pc.in
===================================================================
--- /dev/null
+++ devel/readline/files/patch-readline.pc.in
@@ -0,0 +1,9 @@
+--- readline.pc.in.orig	2018-04-23 15:45:38 UTC
++++ readline.pc.in
+@@ -7,6 +7,5 @@ Name: Readline
+ Description: Gnu Readline library for command line editing
+ URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html
+ Version: @LIBVERSION@
+-Requires.private: @TERMCAP_PKG_CONFIG_LIB@
+ Libs: -L${libdir} -lreadline
+ Cflags: -I${includedir}/readline
Index: devel/readline/files/patch-shlib_Makefile.in
===================================================================
--- /dev/null
+++ devel/readline/files/patch-shlib_Makefile.in
@@ -0,0 +1,11 @@
+--- shlib/Makefile.in.orig	2015-07-12 22:41:58 UTC
++++ shlib/Makefile.in
+@@ -174,7 +174,7 @@ unsupported:
+ 
+ $(SHARED_READLINE):	$(SHARED_OBJ)
+ 	$(RM) $@
+-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
++	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} ${TERMCAP_LIB} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS)
+ 
+ $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so xfree.so
+ 	$(RM) $@
Index: devel/readline/files/patch-support-shobj-conf
===================================================================
--- devel/readline/files/patch-support-shobj-conf
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/shobj-conf.orig	2009-10-28 13:20:21 UTC
-+++ support/shobj-conf
-@@ -128,17 +128,10 @@
- 	SHOBJ_CFLAGS=-fPIC
- 	SHOBJ_LD='${CC}'
- 
--	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
- 		SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
- 
- 		SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
- 		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
--	else
--		SHOBJ_LDFLAGS='-shared'
--
--		SHLIB_XLDFLAGS='-R$(libdir)'
--		SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
--	fi
- 	;;
- 
- # FreeBSD-4.x and later have only ELF
Index: devel/readline/files/patch-support_shlib-install
===================================================================
--- /dev/null
+++ devel/readline/files/patch-support_shlib-install
@@ -0,0 +1,11 @@
+--- support/shlib-install.orig	2019-12-13 10:37:51 UTC
++++ support/shlib-install
+@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN}
+ # Create symlinks to the installed library.  This section is incomplete.
+ #
+ case "$host_os-$host_vendor" in
+-*linux*|freebsd*-gentoo)
++*linux*|freebsd*-gentoo|freebsd*)
+ 	# libname.so.M -> libname.so.M.N
+ 	${echo} ${RM} ${INSTALLDIR}/$LINK2
+ 	if [ -z "$uninstall" ]; then
Index: devel/readline/files/patch-support_shobj-conf
===================================================================
--- /dev/null
+++ devel/readline/files/patch-support_shobj-conf
@@ -0,0 +1,25 @@
+--- support/shobj-conf.orig	2016-10-05 20:02:11 UTC
++++ support/shobj-conf
+@@ -123,7 +123,7 @@ sunos5*|solaris2*)
+ 	;;
+ 
+ # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd.
+-linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
++linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+@@ -163,11 +163,10 @@ freebsd3*|freebsdaout*)
+ freebsd[4-9]*|freebsd1[0-9]*|freebsdelf*|dragonfly*)
+ 	SHOBJ_CFLAGS=-fPIC
+ 	SHOBJ_LD='${CC}'
+-
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir)'
+ 
+-	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
++	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ 	;;
+ 
+ # Darwin/MacOS X
Index: devel/readline/pkg-plist
===================================================================
--- devel/readline/pkg-plist
+++ devel/readline/pkg-plist
@@ -9,9 +9,11 @@
 lib/libhistory.a
 lib/libhistory.so
 lib/libhistory.so.8
+lib/libhistory.so.8.0
 lib/libreadline.a
 lib/libreadline.so
 lib/libreadline.so.8
+lib/libreadline.so.8.0
 libdata/pkgconfig/readline.pc
 man/man3/history.3.gz
 man/man3/readline.3.gz