diff --git a/databases/postgresql12-client/Makefile b/databases/postgresql12-client/Makefile index ef76a8c6ec70..1133e4894dc5 100644 --- a/databases/postgresql12-client/Makefile +++ b/databases/postgresql12-client/Makefile @@ -1,18 +1,24 @@ PORTNAME= postgresql PORTREVISION= 0 COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql12-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ src/bin/pgbench doc src/makefiles src/test/regress INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF=readline + .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile index af4be8ec800f..a59562e889f8 100644 --- a/databases/postgresql12-contrib/Makefile +++ b/databases/postgresql12-contrib/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution MASTERDIR= ${.CURDIR}/../postgresql12-server -USES= bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USES= bison pgsql:${PORTVERSION:R} BUILD_DIRS= src/port src/include src/common contrib INSTALL_DIRS= contrib # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS= --disable-nls --with-uuid=bsd LDFLAGS+= -lpthread -L${PREFIX}/lib OPTIONS_DEFINE= DOCS OPENSSL XML OPTIONS_DEFAULT=OPENSSL XML OPTIONS_SUB= yes OPENSSL_DESC= Build with OpenSSL support OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl XML_CONFIGURE_WITH= libxslt libxml XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \ libxml2.so:textproc/libxml2 post-configure: - @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile index a92a6e1d5d82..1b9d8c7f1bbf 100644 --- a/databases/postgresql12-plperl/Makefile +++ b/databases/postgresql12-plperl/Makefile @@ -1,27 +1,27 @@ PORTNAME= postgresql # Keep the ?=, this port is used as master by the other plperl. PORTREVISION?= 0 CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=12 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plperl contrib/hstore_plperl contrib/jsonb_plperl SLAVE_ONLY= yes COMPONENT= -plperl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile index 39890880e032..dacc50f87f42 100644 --- a/databases/postgresql12-plpython/Makefile +++ b/databases/postgresql12-plpython/Makefile @@ -1,29 +1,29 @@ PORTNAME= postgresql CATEGORIES= databases python # Keep the ?=, it is used as master by the other plpython ports. PORTREVISION?= 0 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions WWW= https://www.postgresql.org/ USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?= 12 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython SLAVE_ONLY= yes # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-pltcl/Makefile b/databases/postgresql12-pltcl/Makefile index 2004114427ca..25c81560e802 100644 --- a/databases/postgresql12-pltcl/Makefile +++ b/databases/postgresql12-pltcl/Makefile @@ -1,32 +1,32 @@ PORTNAME= postgresql # Keep the ?=, it is used by the other pltcl ports. PORTREVISION?= 0 CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=12 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile index 6ba84eb2c9c6..6256f9d500b8 100644 --- a/databases/postgresql12-server/Makefile +++ b/databases/postgresql12-server/Makefile @@ -1,24 +1,24 @@ -DISTVERSION?= 12.19 +DISTVERSION?= 12.20 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql16-server/Makefile" diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo index a9c254216026..6611b9e57b17 100644 --- a/databases/postgresql12-server/distinfo +++ b/databases/postgresql12-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715095959 -SHA256 (postgresql/postgresql-12.19.tar.bz2) = 617e3de52c22e822f4f57d01d5b2240503e198a9eccaf598a851109bd18e6fbb -SIZE (postgresql/postgresql-12.19.tar.bz2) = 21218699 +TIMESTAMP = 1722892656 +SHA256 (postgresql/postgresql-12.20.tar.bz2) = 2d543af3009fec7fd5af35f7a70c95085d3eef6b508e517aa9493e99b15e9ea9 +SIZE (postgresql/postgresql-12.20.tar.bz2) = 21256573 diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in index 08f6faf12c55..3cf6475a9a9b 100644 --- a/databases/postgresql12-server/files/postgresql.in +++ b/databases/postgresql12-server/files/postgresql.in @@ -1,122 +1,123 @@ #!/bin/sh # PROVIDE: postgresql # REQUIRE: DAEMON mountlate # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional # postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # # leave empty to use the login class set in in /etc/passwd: # postgresql_login_class="my_custom_login_class" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults : ${postgresql_enable:="NO"} : ${postgresql_flags:="-w -s -m fast"} : ${postgresql_user:="%%PG_USER%%"} eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%" : ${postgresql_data:="${_pgdir}"} : ${postgresql_login_class:=""} : ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"} +: ${postgresql_svcj_options:="net_basic"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" promote_cmd="postgresql_command promote" initdb_cmd="postgresql_initdb" su_cmd="/usr/bin/su" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile index 1958a960a653..4d4849b56ebe 100644 --- a/databases/postgresql13-client/Makefile +++ b/databases/postgresql13-client/Makefile @@ -1,18 +1,24 @@ PORTNAME= postgresql PORTREVISION= 0 COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql13-server BUILD_DIRS= config src/include src/interfaces src/port \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ src/bin/pgbench doc src/makefiles src/test/regress INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF=readline + .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile index 4a03a65926a4..ad8a568951ee 100644 --- a/databases/postgresql13-contrib/Makefile +++ b/databases/postgresql13-contrib/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution MASTERDIR= ${.CURDIR}/../postgresql13-server -USES= bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USES= bison pgsql:${PORTVERSION:R} BUILD_DIRS= src/port src/include src/common contrib INSTALL_DIRS= contrib # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS= --disable-nls --with-uuid=bsd LDFLAGS+= -lpthread -L${PREFIX}/lib OPTIONS_DEFINE= DOCS OPENSSL XML OPTIONS_DEFAULT=OPENSSL XML OPTIONS_SUB= yes OPENSSL_DESC= Build with OpenSSL support OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl XML_CONFIGURE_WITH= libxslt libxml XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \ libxml2.so:textproc/libxml2 post-configure: - @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql13-plperl/Makefile b/databases/postgresql13-plperl/Makefile index 0fbc8e295468..24f81e37fd45 100644 --- a/databases/postgresql13-plperl/Makefile +++ b/databases/postgresql13-plperl/Makefile @@ -1,27 +1,27 @@ PORTNAME= postgresql # Keep the ?=, this port is used as master by the other plperl. PORTREVISION?= 0 CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=13 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl SLAVE_ONLY= yes COMPONENT= -plperl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql13-plpython/Makefile b/databases/postgresql13-plpython/Makefile index f0b547833a63..d5ea59e84622 100644 --- a/databases/postgresql13-plpython/Makefile +++ b/databases/postgresql13-plpython/Makefile @@ -1,29 +1,29 @@ PORTNAME= postgresql CATEGORIES= databases python # Keep the ?=, it is used as master by the other plpython ports. PORTREVISION?= 0 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions WWW= https://www.postgresql.org/ USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?= 13 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython SLAVE_ONLY= yes # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql13-pltcl/Makefile b/databases/postgresql13-pltcl/Makefile index a91e161e41b4..82e49bd5554f 100644 --- a/databases/postgresql13-pltcl/Makefile +++ b/databases/postgresql13-pltcl/Makefile @@ -1,32 +1,32 @@ PORTNAME= postgresql # Keep the ?=, it is used by the other pltcl ports. PORTREVISION?= 0 CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=13 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile index 1ff3d0035045..844eac64f852 100644 --- a/databases/postgresql13-server/Makefile +++ b/databases/postgresql13-server/Makefile @@ -1,24 +1,24 @@ -DISTVERSION?= 13.15 +DISTVERSION?= 13.16 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql16-server/Makefile" diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo index 7bed84f9d7ba..7bffa271dab4 100644 --- a/databases/postgresql13-server/distinfo +++ b/databases/postgresql13-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715095960 -SHA256 (postgresql/postgresql-13.15.tar.bz2) = 42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925 -SIZE (postgresql/postgresql-13.15.tar.bz2) = 21597871 +TIMESTAMP = 1722892657 +SHA256 (postgresql/postgresql-13.16.tar.bz2) = c9cbbb6129f02328204828066bb3785c00a85c8ca8fd329c2a8a53c1f5cd8865 +SIZE (postgresql/postgresql-13.16.tar.bz2) = 21639411 diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in index 08f6faf12c55..3cf6475a9a9b 100644 --- a/databases/postgresql13-server/files/postgresql.in +++ b/databases/postgresql13-server/files/postgresql.in @@ -1,122 +1,123 @@ #!/bin/sh # PROVIDE: postgresql # REQUIRE: DAEMON mountlate # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional # postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # # leave empty to use the login class set in in /etc/passwd: # postgresql_login_class="my_custom_login_class" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults : ${postgresql_enable:="NO"} : ${postgresql_flags:="-w -s -m fast"} : ${postgresql_user:="%%PG_USER%%"} eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%" : ${postgresql_data:="${_pgdir}"} : ${postgresql_login_class:=""} : ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"} +: ${postgresql_svcj_options:="net_basic"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" promote_cmd="postgresql_command promote" initdb_cmd="postgresql_initdb" su_cmd="/usr/bin/su" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile index 28d80a5e2858..965e37834a6d 100644 --- a/databases/postgresql14-client/Makefile +++ b/databases/postgresql14-client/Makefile @@ -1,18 +1,24 @@ PORTNAME= postgresql PORTREVISION= 0 COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql14-server BUILD_DIRS= config src/include src/interfaces src/port src/bin/pg_amcheck \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ src/bin/pgbench doc src/makefiles src/test/regress INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF=readline + .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-contrib/Makefile b/databases/postgresql14-contrib/Makefile index 5c4e80059c55..e60bf88b53b4 100644 --- a/databases/postgresql14-contrib/Makefile +++ b/databases/postgresql14-contrib/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution MASTERDIR= ${.CURDIR}/../postgresql14-server -USES= bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USES= bison pgsql:${PORTVERSION:R} BUILD_DIRS= src/port src/include src/common contrib INSTALL_DIRS= contrib # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS= --disable-nls --with-uuid=bsd LDFLAGS+= -lpthread -L${PREFIX}/lib OPTIONS_DEFINE= DOCS OPENSSL XML OPTIONS_DEFAULT=OPENSSL XML OPTIONS_SUB= yes OPENSSL_DESC= Build with OpenSSL support OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl XML_CONFIGURE_WITH= libxslt libxml XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \ libxml2.so:textproc/libxml2 post-configure: - @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-docs/Makefile b/databases/postgresql14-docs/Makefile index ced0a182a749..b1543fa51ad2 100644 --- a/databases/postgresql14-docs/Makefile +++ b/databases/postgresql14-docs/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=14 DISTV= ${DISTVERSION:R} SLAVE_ONLY= YES COMPONENT= -docs PGDOCSREL?= ${DOCSDIR_REL}/release-${WANT_PGSQL_VER} PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} sgmldir= ${LOCALBASE}/share/sgml dbdir= ${sgmldir}/docbook BUILD_DEPENDS+= onsgmls:textproc/opensp \ openjade:textproc/openjade \ ${sgmldir}/iso8879/catalog:textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ docbook-sgml>0:textproc/docbook-sgml CONFIGURE_ARGS= --without-readline NO_ARCH= yes do-build: ${MAKE_CMD} -C ${WRKSRC} html do-install: @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-plperl/Makefile b/databases/postgresql14-plperl/Makefile index 6eb771999a68..3cb6e894c99e 100644 --- a/databases/postgresql14-plperl/Makefile +++ b/databases/postgresql14-plperl/Makefile @@ -1,27 +1,27 @@ PORTNAME= postgresql # Keep the ?=, this port is used as master by the other plperl. PORTREVISION?= 0 CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=14 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl SLAVE_ONLY= yes COMPONENT= -plperl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-plpython/Makefile b/databases/postgresql14-plpython/Makefile index 44d70613b9b7..47c468226bdc 100644 --- a/databases/postgresql14-plpython/Makefile +++ b/databases/postgresql14-plpython/Makefile @@ -1,29 +1,29 @@ PORTNAME= postgresql CATEGORIES= databases python # Keep the ?=, it is used as master by the other plpython ports. PORTREVISION?= 0 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions WWW= https://www.postgresql.org/ USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?= 14 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython SLAVE_ONLY= yes # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-pltcl/Makefile b/databases/postgresql14-pltcl/Makefile index fe4078b0fe21..d7468f28f0ca 100644 --- a/databases/postgresql14-pltcl/Makefile +++ b/databases/postgresql14-pltcl/Makefile @@ -1,32 +1,32 @@ PORTNAME= postgresql # Keep the ?=, it is used by the other pltcl ports. PORTREVISION?= 0 CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=14 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile index 6dc8a6c17b13..1c4bfcbf70fe 100644 --- a/databases/postgresql14-server/Makefile +++ b/databases/postgresql14-server/Makefile @@ -1,24 +1,24 @@ -DISTVERSION?= 14.12 +DISTVERSION?= 14.13 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql16-server/Makefile" diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo index 97f5e287f4d5..1b18f55021c2 100644 --- a/databases/postgresql14-server/distinfo +++ b/databases/postgresql14-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715095961 -SHA256 (postgresql/postgresql-14.12.tar.bz2) = 6118d08f9ddcc1bd83cf2b7cc74d3b583bdcec2f37e6245a8ac003b8faa80923 -SIZE (postgresql/postgresql-14.12.tar.bz2) = 22390865 +TIMESTAMP = 1722892658 +SHA256 (postgresql/postgresql-14.13.tar.bz2) = 59aa3c4b495ab26a9ec69f3ad0a0228c51f0fe6facf3634dfad4d1197d613a56 +SIZE (postgresql/postgresql-14.13.tar.bz2) = 22414381 diff --git a/databases/postgresql14-server/files/postgresql.in b/databases/postgresql14-server/files/postgresql.in index 08f6faf12c55..3cf6475a9a9b 100644 --- a/databases/postgresql14-server/files/postgresql.in +++ b/databases/postgresql14-server/files/postgresql.in @@ -1,122 +1,123 @@ #!/bin/sh # PROVIDE: postgresql # REQUIRE: DAEMON mountlate # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional # postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # # leave empty to use the login class set in in /etc/passwd: # postgresql_login_class="my_custom_login_class" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults : ${postgresql_enable:="NO"} : ${postgresql_flags:="-w -s -m fast"} : ${postgresql_user:="%%PG_USER%%"} eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%" : ${postgresql_data:="${_pgdir}"} : ${postgresql_login_class:=""} : ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"} +: ${postgresql_svcj_options:="net_basic"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" promote_cmd="postgresql_command promote" initdb_cmd="postgresql_initdb" su_cmd="/usr/bin/su" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql15-client/Makefile b/databases/postgresql15-client/Makefile index 7c66f707ba1d..dc5fd4c3da8e 100644 --- a/databases/postgresql15-client/Makefile +++ b/databases/postgresql15-client/Makefile @@ -1,18 +1,24 @@ PORTNAME= postgresql PORTREVISION= 0 COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql15-server BUILD_DIRS= config src/include src/interfaces src/port src/bin/pg_amcheck \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ src/bin/pgbench doc src/makefiles src/test/regress INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF=readline + .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-contrib/Makefile b/databases/postgresql15-contrib/Makefile index 4db178d55483..8d8803e14f03 100644 --- a/databases/postgresql15-contrib/Makefile +++ b/databases/postgresql15-contrib/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution MASTERDIR= ${.CURDIR}/../postgresql15-server -USES= bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USES= bison pgsql:${PORTVERSION:R} BUILD_DIRS= src/port src/include src/common contrib INSTALL_DIRS= contrib # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS= --disable-nls --with-uuid=bsd LDFLAGS+= -lpthread -L${PREFIX}/lib OPTIONS_DEFINE= DOCS OPENSSL XML OPTIONS_DEFAULT=OPENSSL XML OPTIONS_SUB= yes OPENSSL_DESC= Build with OpenSSL support OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl XML_CONFIGURE_WITH= libxslt libxml XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \ libxml2.so:textproc/libxml2 post-configure: - @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks + @cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} symlinks post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-docs/Makefile b/databases/postgresql15-docs/Makefile index 3946e7890607..f3019986cf6c 100644 --- a/databases/postgresql15-docs/Makefile +++ b/databases/postgresql15-docs/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=15 DISTV= ${DISTVERSION:R} SLAVE_ONLY= YES COMPONENT= -docs PGDOCSREL?= ${DOCSDIR_REL}/release-${WANT_PGSQL_VER} PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} sgmldir= ${LOCALBASE}/share/sgml dbdir= ${sgmldir}/docbook BUILD_DEPENDS+= onsgmls:textproc/opensp \ openjade:textproc/openjade \ ${sgmldir}/iso8879/catalog:textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ docbook-sgml>0:textproc/docbook-sgml CONFIGURE_ARGS= --without-readline NO_ARCH= yes do-build: ${MAKE_CMD} -C ${WRKSRC} html do-install: @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-plperl/Makefile b/databases/postgresql15-plperl/Makefile index f6e703bde82d..996289b0b187 100644 --- a/databases/postgresql15-plperl/Makefile +++ b/databases/postgresql15-plperl/Makefile @@ -1,27 +1,27 @@ PORTNAME= postgresql # Keep the ?=, this port is used as master by the other plperl. PORTREVISION?= 0 CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=15 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl SLAVE_ONLY= yes COMPONENT= -plperl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-plpython/Makefile b/databases/postgresql15-plpython/Makefile index 838960cf4f27..5545b860c18b 100644 --- a/databases/postgresql15-plpython/Makefile +++ b/databases/postgresql15-plpython/Makefile @@ -1,29 +1,29 @@ PORTNAME= postgresql CATEGORIES= databases python # Keep the ?=, it is used as master by the other plpython ports. PORTREVISION?= 0 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions WWW= https://www.postgresql.org/ USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?= 15 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython SLAVE_ONLY= yes # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-pltcl/Makefile b/databases/postgresql15-pltcl/Makefile index d62ee99fdc36..497032f0d07b 100644 --- a/databases/postgresql15-pltcl/Makefile +++ b/databases/postgresql15-pltcl/Makefile @@ -1,32 +1,32 @@ PORTNAME= postgresql # Keep the ?=, it is used by the other pltcl ports. PORTREVISION?= 0 CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=15 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile index ad7d23054e86..ac4c753660f0 100644 --- a/databases/postgresql15-server/Makefile +++ b/databases/postgresql15-server/Makefile @@ -1,24 +1,24 @@ -DISTVERSION?= 15.7 +DISTVERSION?= 15.8 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 MAINTAINER?= pgsql@FreeBSD.org INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 .include "${.CURDIR}/../postgresql16-server/Makefile" diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo index 845cdd374469..cad7dae9f7de 100644 --- a/databases/postgresql15-server/distinfo +++ b/databases/postgresql15-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715095962 -SHA256 (postgresql/postgresql-15.7.tar.bz2) = a46fe49485ab6385e39dabbbb654f5d3049206f76cd695e224268729520998f7 -SIZE (postgresql/postgresql-15.7.tar.bz2) = 23112318 +TIMESTAMP = 1722892659 +SHA256 (postgresql/postgresql-15.8.tar.bz2) = 4403515f9a69eeb3efebc98f30b8c696122bfdf895e92b3b23f5b8e769edcb6a +SIZE (postgresql/postgresql-15.8.tar.bz2) = 23119460 diff --git a/databases/postgresql15-server/files/postgresql.in b/databases/postgresql15-server/files/postgresql.in index 08f6faf12c55..3cf6475a9a9b 100644 --- a/databases/postgresql15-server/files/postgresql.in +++ b/databases/postgresql15-server/files/postgresql.in @@ -1,122 +1,123 @@ #!/bin/sh # PROVIDE: postgresql # REQUIRE: DAEMON mountlate # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional # postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # # leave empty to use the login class set in in /etc/passwd: # postgresql_login_class="my_custom_login_class" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults : ${postgresql_enable:="NO"} : ${postgresql_flags:="-w -s -m fast"} : ${postgresql_user:="%%PG_USER%%"} eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%" : ${postgresql_data:="${_pgdir}"} : ${postgresql_login_class:=""} : ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"} +: ${postgresql_svcj_options:="net_basic"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" promote_cmd="postgresql_command promote" initdb_cmd="postgresql_initdb" su_cmd="/usr/bin/su" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1" diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile index f610a9931796..7c4351eb7245 100644 --- a/databases/postgresql16-client/Makefile +++ b/databases/postgresql16-client/Makefile @@ -1,18 +1,24 @@ PORTNAME= postgresql PORTREVISION= 0 COMMENT= PostgreSQL database (client) MASTERDIR= ${.CURDIR}/../postgresql16-server BUILD_DIRS= config src/include src/interfaces src/port src/bin/pg_amcheck \ src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \ src/bin/pgbench doc src/makefiles src/test/regress INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes USES= pkgconfig +OPTIONS_DEFINE+=LIBEDIT DOCS +LIBEDIT_DESC= Use non-GPL libedit instead of readline +LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred +LIBEDIT_USES= libedit +LIBEDIT_USES_OFF=readline + .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-contrib/Makefile b/databases/postgresql16-contrib/Makefile index cc85d3203809..cd8376580200 100644 --- a/databases/postgresql16-contrib/Makefile +++ b/databases/postgresql16-contrib/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 CATEGORIES= databases MAINTAINER= pgsql@FreeBSD.org COMMENT= The contrib utilities from the PostgreSQL distribution MASTERDIR= ${.CURDIR}/../postgresql16-server -USES= bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} +USES= bison pgsql:${PORTVERSION:R} BUILD_DIRS= src/port src/include src/common contrib INSTALL_DIRS= contrib # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes SLAVE_ONLY= yes COMPONENT= -contrib CONFIGURE_ARGS= --disable-nls --with-uuid=bsd LDFLAGS+= -lpthread -L${PREFIX}/lib OPTIONS_DEFINE= DOCS OPENSSL XML OPTIONS_DEFAULT=OPENSSL XML OPTIONS_SUB= yes OPENSSL_DESC= Build with OpenSSL support OPENSSL_USES= ssl OPENSSL_CONFIGURE_WITH= openssl XML_CONFIGURE_WITH= libxslt libxml XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \ libxml2.so:textproc/libxml2 post-configure: - @cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers + @cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-docs/Makefile b/databases/postgresql16-docs/Makefile index 5b17a6c2acb8..f82101032848 100644 --- a/databases/postgresql16-docs/Makefile +++ b/databases/postgresql16-docs/Makefile @@ -1,41 +1,41 @@ PORTNAME= postgresql PORTREVISION= 0 PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S,.,,}-docs MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=16 DISTV= ${DISTVERSION:R} SLAVE_ONLY= YES COMPONENT= -docs PGDOCSREL?= ${DOCSDIR_REL}/release-${WANT_PGSQL_VER} PGDOCSDIR?= ${PREFIX}/${PGDOCSREL} sgmldir= ${LOCALBASE}/share/sgml dbdir= ${sgmldir}/docbook BUILD_DEPENDS+= onsgmls:textproc/opensp \ openjade:textproc/openjade \ ${sgmldir}/iso8879/catalog:textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ docbook-sgml>0:textproc/docbook-sgml CONFIGURE_ARGS= --without-readline --without-icu NO_ARCH= yes do-build: ${MAKE_CMD} -C ${WRKSRC} html do-install: @ ${MKDIR} ${STAGEDIR}${PGDOCSDIR} ( cd ${WRKSRC}/doc/src/sgml/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} ) post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST} .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-plperl/Makefile b/databases/postgresql16-plperl/Makefile index 0e1cd98fb533..11fb616ea16c 100644 --- a/databases/postgresql16-plperl/Makefile +++ b/databases/postgresql16-plperl/Makefile @@ -1,27 +1,27 @@ PORTNAME= postgresql # Keep the ?=, this port is used as master by the other plperl. PORTREVISION?= 0 CATEGORIES= databases perl5 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server +RUN_DEPENDS= postgres:databases/postgresql${WANT_PGSQL_VER}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=16 USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl SLAVE_ONLY= yes COMPONENT= -plperl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-plpython/Makefile b/databases/postgresql16-plpython/Makefile index 55bb8de1ab4e..5f68bc60a927 100644 --- a/databases/postgresql16-plpython/Makefile +++ b/databases/postgresql16-plpython/Makefile @@ -1,29 +1,29 @@ PORTNAME= postgresql CATEGORIES= databases python # Keep the ?=, it is used as master by the other plpython ports. PORTREVISION?= 0 -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions WWW= https://www.postgresql.org/ USES+= pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE} WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?= 16 WANT_PYTHON_USE?= python CONFIGURE_ARGS= --with-python COMPONENT= -plpython BUILD_DIRS= src/backend ${INSTALL_DIRS} INSTALL_DIRS?= src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython SLAVE_ONLY= yes # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-pltcl/Makefile b/databases/postgresql16-pltcl/Makefile index 05ae8083d026..e0c84196b3c5 100644 --- a/databases/postgresql16-pltcl/Makefile +++ b/databases/postgresql16-pltcl/Makefile @@ -1,32 +1,32 @@ PORTNAME= postgresql # Keep the ?=, it is used by the other pltcl ports. PORTREVISION?= 0 CATEGORIES= databases tcl -PKGNAMESUFFIX?= ${WANT_PGSQL_VER:S/.//}${COMPONENT} +PKGNAMESUFFIX?= ${WANT_PGSQL_VER}${COMPONENT} MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server WANT_PGSQL_VER?=16 USES+= tcl pgsql:${WANT_PGSQL_VER} WANT_PGSQL= server CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" CONFIGURE_ENV+= TCLSH="${TCLSH}" MAKE_ENV+= TCL_INCDIR="${TCL_INCLUDEDIR}" BUILD_DIRS= src/backend src/pl/tcl INSTALL_DIRS= src/pl/tcl SLAVE_ONLY= yes COMPONENT= -pltcl # this port fails to build in parallel MAKE_JOBS_UNSAFE= yes .include "${MASTERDIR}/Makefile" diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile index c73f0d255be9..13bf3276257e 100644 --- a/databases/postgresql16-server/Makefile +++ b/databases/postgresql16-server/Makefile @@ -1,287 +1,276 @@ PORTNAME?= postgresql -DISTVERSION?= 16.3 +DISTVERSION?= 16.4 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and # not their own. Probably best to keep it at ?=0 when reset here too. PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org COMMENT?= PostgreSQL is the most advanced open-source database available anywhere WWW= https://www.postgresql.org/ LICENSE= PostgreSQL CONFLICTS+= ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql OPTIONS_SUB= yes PKGINSTALL?= ${PKGDIR}/pkg-install${COMPONENT} USES+= tar:bzip2 cpe .if !defined(NO_BUILD) USES+= gmake GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share .endif PG_USER?= postgres PG_GROUP?= postgres PG_UID?= 770 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \ --with-includes=${PREFIX}/include \ --enable-thread-safety CONFIGURE_ENV+= INCLUDES="${INCLUDES}" \ PTHREAD_LIBS="-lpthread" \ LDFLAGS_SL="${LDFLAGS_SL}" LDFLAGS+= -lpthread MAKE_ENV= MAKELEVEL=0 PLIST= ${PKGDIR}/pkg-plist${COMPONENT} INSTALL_DIRS?= src/common src/timezone src/backend \ src/backend/utils/mb/conversion_procs \ src/backend/snowball src/backend/replication/libpqwalreceiver \ src/backend/replication/pgoutput \ src/bin/initdb src/bin/pg_ctl \ src/bin/pg_archivecleanup src/bin/pg_basebackup \ src/bin/pg_checksums \ src/bin/pg_controldata src/bin/pg_resetwal src/pl \ src/bin/pg_rewind \ src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_waldump src/bin/pg_upgrade BUILD_DIRS?= src/port ${INSTALL_DIRS} INSTALL_TARGET?=install-strip .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY) SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif OPTIONS_SUB= yes -.if defined(CLIENT_ONLY) -OPTIONS_DEFINE+=LIBEDIT DOCS -LIBEDIT_DESC= Use non-GPL libedit instead of readline -.else MAKE_ENV+= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} -.endif .if defined(SERVER_ONLY) OPTIONS_DEFINE= DTRACE LDAP TZDATA XML DOCS LDAP_DESC= Build with LDAP authentication support TZDATA_DESC= Use internal timezone database XML_DESC= Build with XML data type DTRACE_CONFIGURE_ENABLE=dtrace DTRACE_LDFLAGS= -lelf DTRACE_INSTALL_TARGET= install . if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14 OPTIONS_DEFINE+= LZ4 OPTIONS_DEFAULT+= LZ4 LZ4_DESC= Build with LZ4 compression support LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 . endif . if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15 OPTIONS_DEFINE+= ZSTD OPTIONS_DEFAULT+= ZSTD ZSTD_DESC= Build with ZSTD compression support ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS+= libzstd.so:archivers/zstd . endif OPTIONS_DEFINE+= LLVM OPTIONS_DEFAULT+= LLVM LLVM_DESC= Build with support for JIT-compiling expressions LLVM_CONFIGURE_WITH= llvm LLVM_CONFIGURE_ENV= LLVM_CONFIG=${LLVM_CONFIG} \ CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION} -LLVM_USES= llvm:max=15,min=11,lib +LLVM_USES= llvm:min=11,lib CONFIGURE_ARGS+= --with-icu LIB_DEPENDS+= libicudata.so:devel/icu USES+= pkgconfig .else CONFIGURE_ARGS+= --without-icu .endif .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages PAM_DESC= Build with PAM Support MIT_KRB5_DESC= Build with MIT kerberos support HEIMDAL_KRB5_DESC= Builds with Heimdal kerberos GSSAPI_DESC= Build with GSSAPI support OPTIMIZED_CFLAGS_DESC= Builds with compiler optimizations (-O3) OPTIONS_DEFINE+= SSL SSL_DESC= Build with OpenSSL support OPTIONS_DEFAULT+= SSL GSSAPI_CONFIGURE_WITH= gssapi .endif # !SLAVE_ONLY -.if defined(CLIENT_ONLY) -LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred -LIBEDIT_USES= libedit -LIBEDIT_USES_OFF= readline -.endif # CLIENT_ONLY - SSL_USES= ssl SSL_CONFIGURE_WITH= openssl PAM_CONFIGURE_WITH= pam XML_CONFIGURE_WITH= libxml XML_LIB_DEPENDS= libxml2.so:textproc/libxml2 TZDATA_CONFIGURE_OFF= --with-system-tzdata=/usr/share/zoneinfo NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext LDAP_CONFIGURE_WITH= ldap LDAP_USES= ldap OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops DEBUG_CONFIGURE_ENABLE= debug PLIST_SUB+= PG_VERSION=${PORTVERSION:R} \ PG_USER=${PG_USER} \ PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \ PG_GROUP=${PG_GROUP} \ PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]] SUB_LIST+= PG_VERSION=${PORTVERSION:R} \ PG_GROUP=${PG_GROUP} \ PG_USER=${PG_USER} \ PG_UID=${PG_UID} .include # i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2 # For such ancient CPUs, gcc must be used to build PostgreSQL. # https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org .if ${ARCH} == "i386" CFLAGS+= -msse2 .endif .if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 .if ${PORT_OPTIONS:MGSSAPI} .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) # Kerberos libraries will pull the proper GSSAPI library # via linker dependencies, but otherwise we must specify # it explicitely: ld --as-needed is used for compilation, # so configure's -lgssapi_krb5 won't go. LDFLAGS+= -lgssapi LDFLAGS_SL+= -lgssapi .endif .endif . if ${PORT_OPTIONS:MMIT_KRB5} . if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)) IGNORE= requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB . else CONFIGURE_ARGS+=--with-krb5 # Allow defining a home built MIT Kerberos by setting KRB5_HOME . if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config) LIB_DEPENDS+= libkrb5.so.3:security/krb5 . endif . endif . endif . if ${PORT_OPTIONS:MHEIMDAL_KRB5} CONFIGURE_ARGS+=--with-krb5 . endif .endif # !SLAVE_ONLY # For testing files in FILESDIR .include .if ${PORT_OPTIONS:MLLVM} INSTALL_DIRS+= src/backend/jit/llvm .endif .if defined(SERVER_ONLY) pre-build: @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) && !target(do-build) do-build: @ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers @ for dir in ${BUILD_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) SUB_FILES+= pkg-message${COMPONENT} PKGMESSAGE= ${WRKSRC}/pkg-message${COMPONENT} . endif . if exists(${FILESDIR}/pkg-install${COMPONENT}.in) SUB_FILES+= pkg-install${COMPONENT} . endif post-patch: . if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT) @${REINPLACE_CMD} \ -e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \ ${WRKSRC}/src/interfaces/libpq/Makefile . endif do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\ ${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \ ${STAGEDIR}${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) @ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ ${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\ fi .endif # !NO_BUILD .if defined(SERVER_ONLY) check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ fi .endif .include diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo index a5b9b692f324..04974993010a 100644 --- a/databases/postgresql16-server/distinfo +++ b/databases/postgresql16-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715095963 -SHA256 (postgresql/postgresql-16.3.tar.bz2) = 331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585 -SIZE (postgresql/postgresql-16.3.tar.bz2) = 24737644 +TIMESTAMP = 1722892660 +SHA256 (postgresql/postgresql-16.4.tar.bz2) = 971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f +SIZE (postgresql/postgresql-16.4.tar.bz2) = 24765786 diff --git a/databases/postgresql16-server/files/postgresql.in b/databases/postgresql16-server/files/postgresql.in index 08f6faf12c55..3cf6475a9a9b 100644 --- a/databases/postgresql16-server/files/postgresql.in +++ b/databases/postgresql16-server/files/postgresql.in @@ -1,122 +1,123 @@ #!/bin/sh # PROVIDE: postgresql # REQUIRE: DAEMON mountlate # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable PostgreSQL: # # postgresql_enable="YES" # # optional # postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%" # postgresql_flags="-w -s -m fast" # postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C" # # leave empty to use the login class set in in /etc/passwd: # postgresql_login_class="my_custom_login_class" # postgresql_profiles="" # # See %%PREFIX%%/share/doc/postgresql/README-server for more info # # This scripts takes one of the following commands: # # start stop restart reload status initdb # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf command=%%PREFIX%%/bin/pg_ctl . /etc/rc.subr load_rc_config postgresql # set defaults : ${postgresql_enable:="NO"} : ${postgresql_flags:="-w -s -m fast"} : ${postgresql_user:="%%PG_USER%%"} eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%" : ${postgresql_data:="${_pgdir}"} : ${postgresql_login_class:=""} : ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"} +: ${postgresql_svcj_options:="net_basic"} name=postgresql rcvar=postgresql_enable extra_commands="reload initdb" start_cmd="postgresql_command start" stop_cmd="postgresql_command stop" restart_cmd="postgresql_command restart" reload_cmd="postgresql_command reload" status_cmd="postgresql_command status" promote_cmd="postgresql_command promote" initdb_cmd="postgresql_initdb" su_cmd="/usr/bin/su" if [ -n "$2" ]; then profile="$2" if [ "x${postgresql_profiles}" != "x" ]; then eval postgresql_data="\${postgresql_${profile}_data:-}" if [ "x${postgresql_data}" = "x" ]; then echo "You must define a data directory (postgresql_${profile}_data)" exit 1 fi eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}" eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}" eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}" eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}" eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}" fi else if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then for profile in ${postgresql_profiles}; do eval _enable="\${postgresql_${profile}_enable}" case "x${_enable:-${postgresql_enable}}" in x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee]) continue ;; x[Yy][Ee][Ss]) ;; *) if test -z "$_enable"; then _var=postgresql_enable else _var=postgresql_"${profile}"_enable fi echo "Bad value" \ "'${_enable:-${postgresql_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> postgresql profile: ${profile}" %%PREFIX%%/etc/rc.d/postgresql $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" else success="${profile} ${success:-}" fi done exit 0 fi fi command_args="-D ${postgresql_data} ${postgresql_flags}" postgresql_command() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec ${command} ${command_args} ${rc_arg}" } postgresql_initdb() { ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \ -l ${postgresql_user} \ -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}" } run_rc_command "$1"