svn commit: r378604 - in head/databases: postgresql90-client postgresql91-client postgresql91-server postgresql92-client postgresql92-server postgresql93-client postgresql94-client
Palle Girgensohn
girgen at FreeBSD.org
Sat Feb 7 17:05:10 UTC 2015
Author: girgen
Date: Sat Feb 7 17:05:07 2015
New Revision: 378604
URL: https://svnweb.freebsd.org/changeset/ports/378604
QAT: https://qat.redports.org/buildarchive/r378604/
Log:
Revert the change from readline to libedit, and instead make libedit optional.
PR: ports/197362
Modified:
head/databases/postgresql90-client/Makefile
head/databases/postgresql91-client/Makefile
head/databases/postgresql91-server/Makefile
head/databases/postgresql92-client/Makefile
head/databases/postgresql92-server/Makefile
head/databases/postgresql93-client/Makefile
head/databases/postgresql94-client/Makefile
Modified: head/databases/postgresql90-client/Makefile
==============================================================================
--- head/databases/postgresql90-client/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql90-client/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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"
Modified: head/databases/postgresql91-client/Makefile
==============================================================================
--- head/databases/postgresql91-client/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql91-client/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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"
Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql91-server/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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
.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
Modified: head/databases/postgresql92-client/Makefile
==============================================================================
--- head/databases/postgresql92-client/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql92-client/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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"
Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql92-server/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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
.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
Modified: head/databases/postgresql93-client/Makefile
==============================================================================
--- head/databases/postgresql93-client/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql93-client/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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"
Modified: head/databases/postgresql94-client/Makefile
==============================================================================
--- head/databases/postgresql94-client/Makefile Sat Feb 7 16:17:44 2015 (r378603)
+++ head/databases/postgresql94-client/Makefile Sat Feb 7 17:05:07 2015 (r378604)
@@ -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"
More information about the svn-ports-all
mailing list