sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
PR:	ports/197362
This commit is contained in:
Palle Girgensohn 2015-02-07 17:05:07 +00:00
parent 53969044d6
commit cbb709bca2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=378604
7 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
databases/postgresql90-client/Makefile
View file

@ -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"

5
databases/postgresql91-client/Makefile
View file

@ -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"

14
databases/postgresql91-server/Makefile
View file

@ -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

5
databases/postgresql92-client/Makefile
View file

@ -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"

14
databases/postgresql92-server/Makefile
View file

@ -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

5
databases/postgresql93-client/Makefile
View file

@ -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"

4
databases/postgresql94-client/Makefile
View file

@ -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"