Revert the change from readline to libedit, and instead make libedit optional.

PR:	ports/197362

7 files changed, 31 insertions, 21 deletions

diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index df55e41d5a18..cdc9a8294239 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
-
 COMMENT=	PostgreSQL database (client)
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../postgresql90-server
 
-LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@@ -16,6 +14,5 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--with-libedit-preferred
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index db6237611105..41a8fe3afbfb 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
-
 COMMENT=	PostgreSQL database (client)
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../postgresql91-server
 
-LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@@ -17,6 +15,5 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--with-libedit-preferred
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 2d821a75043c..981e14ff5568 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -71,7 +71,10 @@ GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
-.if !defined(CLIENT_ONLY)
+.if defined(CLIENT_ONLY)
+OPTIONS_DEFINE+=LIBEDIT
+LIBEDIT_DESC=   Use non-GPL libedit instead of readline
+.else
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 .endif
@@ -112,6 +115,15 @@ OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
 
 .include <bsd.port.options.mk>
 
+.if defined(CLIENT_ONLY)
+.  if ${PORT_OPTIONS:MLIBEDIT}
+CONFIGURE_ARGS+=--with-libedit-preferred
+LIB_DEPENDS=    libedit.so.0:${PORTSDIR}/devel/libedit
+.  else
+USES+=          readline
+.  endif
+.endif # CLIENT_ONLY
+
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile
index 85bda93a21c2..d5e0008a7551 100644
--- a/databases/postgresql92-client/Makefile
+++ b/databases/postgresql92-client/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
-
 COMMENT=	PostgreSQL database (client)
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../postgresql92-server
 
-LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@@ -17,6 +15,5 @@ INSTALL_DIRS=	${BUILD_DIRS}
 CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=--with-libedit-preferred
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index a949400ff509..5c0852599ef1 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -71,7 +71,10 @@ GROUPS=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
-.if !defined(CLIENT_ONLY)
+.if defined(CLIENT_ONLY)
+OPTIONS_DEFINE+=LIBEDIT
+LIBEDIT_DESC=	Use non-GPL libedit instead of readline
+.else
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 .endif
@@ -111,6 +114,15 @@ OPTIONS_DEFAULT=	NLS XML TZDATA INTDATE SSL
 
 .include <bsd.port.options.mk>
 
+.if defined(CLIENT_ONLY)
+.  if ${PORT_OPTIONS:MLIBEDIT}
+CONFIGURE_ARGS+=--with-libedit-preferred
+LIB_DEPENDS=    libedit.so.0:${PORTSDIR}/devel/libedit
+.  else
+USES+=		readline
+.  endif
+.endif # CLIENT_ONLY
+
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-openssl
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index 4420f2bdaddf..da041c94c0cd 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -2,13 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
-
 COMMENT=	PostgreSQL database (client)
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../postgresql93-server
 
-LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@@ -18,6 +16,5 @@ CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES+=		pkgconfig
-CONFIGURE_ARGS+=--with-libedit-preferred
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile
index f21626fb42bc..3fd3ae8a265d 100644
--- a/databases/postgresql94-client/Makefile
+++ b/databases/postgresql94-client/Makefile
@@ -3,11 +3,10 @@
 
 PORTNAME=	postgresql
 COMMENT=	PostgreSQL database (client)
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../postgresql94-server
 
-LIB_DEPENDS=	libedit.so.0:${PORTSDIR}/devel/libedit
 BUILD_DIRS=	config src/include src/interfaces src/port \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		doc src/makefiles
@@ -17,6 +16,5 @@ CLIENT_ONLY=	yes
 COMPONENT=	-client
 USE_LDCONFIG=	yes
 USES=		pkgconfig
-CONFIGURE_ARGS+=--with-libedit-preferred
 
 .include "${MASTERDIR}/Makefile"