Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Aug 2023 07:52:03 GMT
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 97a09a883f9e - 2023Q3 - databases/postgresql16-*: Introduce postgresql16 beta 1
Message-ID:  <202308110752.37B7q3QT070672@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by girgen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97a09a883f9ee82f27adef826caaf1c0d04bdfc7

commit 97a09a883f9ee82f27adef826caaf1c0d04bdfc7
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2023-05-25 15:53:31 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2023-08-11 07:51:55 +0000

    databases/postgresql16-*: Introduce postgresql16 beta 1
    
    URL:    https://www.postgresql.org/about/news/postgresql-16-beta-1-released-2643/
    Release notes:  https://www.postgresql.org/docs/16/release-16.html
    
    (cherry picked from commit 4ee225f90aa3f81a418859086a0bca660f44e7ef)
---
 Mk/Uses/pgsql.mk                                   |    2 +-
 databases/postgresql11-docs/Makefile               |    2 +-
 databases/postgresql11-plperl/Makefile             |    2 +-
 databases/postgresql11-plpython/Makefile           |    2 +-
 databases/postgresql11-pltcl/Makefile              |    2 +-
 databases/postgresql11-server/Makefile             |    2 +-
 databases/postgresql12-docs/Makefile               |    2 +-
 databases/postgresql12-server/Makefile             |    2 +-
 databases/postgresql13-docs/Makefile               |    2 +-
 databases/postgresql13-server/Makefile             |    2 +-
 databases/postgresql14-server/Makefile             |    2 +-
 databases/postgresql15-server/Makefile             |  321 +---
 databases/postgresql16-client/Makefile             |   18 +
 databases/postgresql16-contrib/Makefile            |   41 +
 databases/postgresql16-contrib/pkg-descr           |   21 +
 databases/postgresql16-docs/Makefile               |   41 +
 databases/postgresql16-pgtcl/Makefile              |    9 +
 databases/postgresql16-plperl/Makefile             |   27 +
 databases/postgresql16-plpython/Makefile           |   29 +
 databases/postgresql16-plpython/pkg-descr          |    4 +
 databases/postgresql16-pltcl/Makefile              |   32 +
 databases/postgresql16-server/Makefile             |  335 ++++
 databases/postgresql16-server/distinfo             |    3 +
 databases/postgresql16-server/files/502.pgsql.in   |  114 ++
 databases/postgresql16-server/files/dot.cshrc.in   |   11 +
 databases/postgresql16-server/files/dot.profile.in |   22 +
 .../files/patch-disable-llvm-jit-inlining-with-tls |   24 +
 .../postgresql16-server/files/patch-doc-Makefile   |    9 +
 .../files/patch-doc-src-sgml-Makefile              |   41 +
 .../files/patch-src-Makefile.shlib                 |   11 +
 .../files/patch-src-backend-Makefile               |   11 +
 ...h-src_backend_utils_misc_postgresql.conf.sample |   21 +
 .../files/pkg-message-client.in                    |   38 +
 .../files/pkg-message-contrib.in                   |    9 +
 .../files/pkg-message-plperl.in                    |    9 +
 .../files/pkg-message-plpython.in                  |    9 +
 .../postgresql16-server/files/pkg-message-pltcl.in |    9 +
 .../files/pkg-message-server.in                    |   69 +
 .../postgresql16-server/files/pkgIndex.tcl.in      |    4 +
 databases/postgresql16-server/files/postgresql.in  |  115 ++
 databases/postgresql16-server/pkg-descr            |   21 +
 databases/postgresql16-server/pkg-install-server   |   23 +
 databases/postgresql16-server/pkg-plist-client     | 1346 ++++++++++++++++
 databases/postgresql16-server/pkg-plist-contrib    |  267 ++++
 databases/postgresql16-server/pkg-plist-plperl     |   23 +
 databases/postgresql16-server/pkg-plist-plpython   |   31 +
 databases/postgresql16-server/pkg-plist-pltcl      |    6 +
 databases/postgresql16-server/pkg-plist-server     | 1674 ++++++++++++++++++++
 48 files changed, 4492 insertions(+), 328 deletions(-)

diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 2755cf03649e..9a150f27fb08 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -39,7 +39,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	11 12 13 14 15
+VALID_PGSQL_VER=	11 12 13 14 15 16
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
diff --git a/databases/postgresql11-docs/Makefile b/databases/postgresql11-docs/Makefile
index ec19006ad969..97c8c8b6fd41 100644
--- a/databases/postgresql11-docs/Makefile
+++ b/databases/postgresql11-docs/Makefile
@@ -1,3 +1,3 @@
 WANT_PGSQL_VER=11
 
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
+.include "${.CURDIR}/../postgresql16-docs/Makefile"
diff --git a/databases/postgresql11-plperl/Makefile b/databases/postgresql11-plperl/Makefile
index 9523340eb54c..ce2b6238a258 100644
--- a/databases/postgresql11-plperl/Makefile
+++ b/databases/postgresql11-plperl/Makefile
@@ -3,4 +3,4 @@ WANT_PGSQL_VER=	11
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
-.include "${.CURDIR}/../postgresql14-plperl/Makefile"
+.include "${.CURDIR}/../postgresql16-plperl/Makefile"
diff --git a/databases/postgresql11-plpython/Makefile b/databases/postgresql11-plpython/Makefile
index 2a5b929c4259..13afed4bee75 100644
--- a/databases/postgresql11-plpython/Makefile
+++ b/databases/postgresql11-plpython/Makefile
@@ -3,4 +3,4 @@ WANT_PGSQL_VER=	11
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
-.include "${.CURDIR}/../postgresql14-plpython/Makefile"
+.include "${.CURDIR}/../postgresql16-plpython/Makefile"
diff --git a/databases/postgresql11-pltcl/Makefile b/databases/postgresql11-pltcl/Makefile
index 4cfb41ac682f..d6a9a0fd30a0 100644
--- a/databases/postgresql11-pltcl/Makefile
+++ b/databases/postgresql11-pltcl/Makefile
@@ -3,4 +3,4 @@ WANT_PGSQL_VER=	11
 # this port fails to build in parallel
 MAKE_JOBS_UNSAFE=	yes
 
-.include "${.CURDIR}/../postgresql14-pltcl/Makefile"
+.include "${.CURDIR}/../postgresql16-pltcl/Makefile"
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
index 08ff7ed3f0eb..58c612dc589e 100644
--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@@ -23,4 +23,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql14-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql12-docs/Makefile b/databases/postgresql12-docs/Makefile
index 40331736ab7c..9a7e76ea0885 100644
--- a/databases/postgresql12-docs/Makefile
+++ b/databases/postgresql12-docs/Makefile
@@ -1,3 +1,3 @@
 WANT_PGSQL_VER=12
 
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
+.include "${.CURDIR}/../postgresql16-docs/Makefile"
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 703060350175..9cb76e880f73 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql14-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql13-docs/Makefile b/databases/postgresql13-docs/Makefile
index 07213552866f..8b62e05d816b 100644
--- a/databases/postgresql13-docs/Makefile
+++ b/databases/postgresql13-docs/Makefile
@@ -1,3 +1,3 @@
 WANT_PGSQL_VER=13
 
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
+.include "${.CURDIR}/../postgresql16-docs/Makefile"
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index cc3f1dd18961..e23f70b4a118 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql14-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index 2b02150f7460..32e9c386dbd5 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -21,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql15-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
index a44c1093df4b..6dd6bcc49cb0 100644
--- a/databases/postgresql15-server/Makefile
+++ b/databases/postgresql15-server/Makefile
@@ -1,48 +1,9 @@
-PORTNAME?=	postgresql
 DISTVERSION?=	15.3
 # 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
-.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 \
@@ -56,282 +17,8 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		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 INTDATE 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
-
-.if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 11
-OPTIONS_DEFINE+=	LLVM
-OPTIONS_DEFAULT+=	LLVM
-LLVM_DESC=		Build with support for JIT-compiling expressions
-OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_powerpc64_12=	LLVM
-.endif
-
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-USES+=		pkgconfig
-
-# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
-# (requires dump/restore if modified.)
-OPTIONS_DEFINE+=	INTDATE
-INTDATE_DESC=		Builds with 64-bit date/time type
-OPTIONS_DEFAULT+=	INTDATE
-.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
-
-INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
-
-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 <bsd.port.options.mk>
-
-.if ${ARCH} == "i386"
-USES+=		compiler:gcc-c++11-lib
-.else
-USES+=		compiler
-.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 <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MLLVM}
-CONFIGURE_ARGS+=	--with-llvm
-BUILD_DEPENDS+=		llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION}
-BUILD_DEPENDS+=		llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
-RUN_DEPENDS+=		llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
-CONFIGURE_ENV+=		LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION}
-.endif
-
-# Convert LLVM_DEFAULT to COMPILER_VERSION format to make it
-# suitable for version comparison.
-.if ${LLVM_DEFAULT} >= 70 && ${LLVM_DEFAULT} <= 90
-LLVM_DEFAULT_VERSION=	${LLVM_DEFAULT}
-.else
-LLVM_DEFAULT_VERSION=	${LLVM_DEFAULT}0
-.endif
-
-# Convert COMPILER_VERSION to LLVM_DEFAULT format to make it
-# suitable for LLVM port name.
-# All supported FreeBSD versions have Clang 10.0.1 or later.
-LLVM_PORT_SUFFIX=	${COMPILER_VERSION:C/.$//}
-
-# sync LLVM to the preferred compiler if possible
-# or else use a lower version compiler that is compatible
-.if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION}
-# LLVM versions in ports are, in order, 70, 80 90, 10, 11, 12... where 10 > 90. [sic]
-.  if ${LLVM_PORT_SUFFIX} < 70
-PG_LLVM_VERSION=${LLVM_PORT_SUFFIX}
-PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX}
-.  else
-PG_LLVM_VERSION=11
-PG_COMPILER_VERSION=11
-.  endif
-.else
-PG_LLVM_VERSION=${LLVM_DEFAULT}
-PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX}
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11
-.  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM}
-INSTALL_DIRS+=		src/backend/jit/llvm
-.    if ${LLVM_PORT_SUFFIX} != ${PG_COMPILER_VERSION}
-LLVM_CONFIGURE_ARGS?=	CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION}
-.    endif
-.  endif
-.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 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${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(SERVER_ONLY) && ${PORT_OPTIONS:MICU}
-	@${REINPLACE_CMD} \
-		-e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \
-		-e '/icu/s/_57//' \
-		${WRKSRC}/configure.in
-.  elif 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} && \
-		${SETENV} ${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 && ${SETENV} ${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
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile
new file mode 100644
index 000000000000..f610a9931796
--- /dev/null
+++ b/databases/postgresql16-client/Makefile
@@ -0,0 +1,18 @@
+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
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-contrib/Makefile b/databases/postgresql16-contrib/Makefile
new file mode 100644
index 000000000000..cc85d3203809
--- /dev/null
+++ b/databases/postgresql16-contrib/Makefile
@@ -0,0 +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}
+
+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
+
+post-install:
+	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-contrib/pkg-descr b/databases/postgresql16-contrib/pkg-descr
new file mode 100644
index 000000000000..a384c76fdbde
--- /dev/null
+++ b/databases/postgresql16-contrib/pkg-descr
@@ -0,0 +1,21 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree.  This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types.  After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file.  For example,
+
+        $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql16-docs/Makefile b/databases/postgresql16-docs/Makefile
new file mode 100644
index 000000000000..5b17a6c2acb8
--- /dev/null
+++ b/databases/postgresql16-docs/Makefile
@@ -0,0 +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
+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-pgtcl/Makefile b/databases/postgresql16-pgtcl/Makefile
new file mode 100644
index 000000000000..d00c1675f6a7
--- /dev/null
+++ b/databases/postgresql16-pgtcl/Makefile
@@ -0,0 +1,9 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-postgresql16
+
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012345-789]
+
+PGTCL_SLAVE=	16
+MASTERDIR=	${.CURDIR}/../pgtcl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plperl/Makefile b/databases/postgresql16-plperl/Makefile
new file mode 100644
index 000000000000..0e1cd98fb533
--- /dev/null
+++ b/databases/postgresql16-plperl/Makefile
@@ -0,0 +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}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Write SQL functions for PostgreSQL using Perl5
+
+RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-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
new file mode 100644
index 000000000000..55bb8de1ab4e
--- /dev/null
+++ b/databases/postgresql16-plpython/Makefile
@@ -0,0 +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}
+
+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
+
+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-plpython/pkg-descr b/databases/postgresql16-plpython/pkg-descr
new file mode 100644
index 000000000000..61c4875985f7
--- /dev/null
+++ b/databases/postgresql16-plpython/pkg-descr
@@ -0,0 +1,4 @@
+PL/Python allows one to write PostgeSQL stored functions and
+procedures in Python (http://www.python.org/).
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql16-pltcl/Makefile b/databases/postgresql16-pltcl/Makefile
new file mode 100644
index 000000000000..05ae8083d026
--- /dev/null
+++ b/databases/postgresql16-pltcl/Makefile
@@ -0,0 +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}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Tcl to write SQL functions
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-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
new file mode 100644
index 000000000000..e3b783e7fa41
--- /dev/null
+++ b/databases/postgresql16-server/Makefile
@@ -0,0 +1,335 @@
+PORTNAME?=	postgresql
+DISTVERSION?=	16beta1
+# 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
+.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 INTDATE 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
+
+.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 11
+OPTIONS_DEFINE+=	LLVM
+OPTIONS_DEFAULT+=	LLVM
+LLVM_DESC=		Build with support for JIT-compiling expressions
+OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
+OPTIONS_EXCLUDE_powerpc64_12=	LLVM
+.  endif
+
+# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
+# (requires dump/restore if modified.)
+OPTIONS_DEFINE+=	INTDATE
+INTDATE_DESC=		Builds with 64-bit date/time type
+OPTIONS_DEFAULT+=	INTDATE
+
+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
+
+INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
+
+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 <bsd.port.options.mk>
+
*** 4224 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308110752.37B7q3QT070672>