postgresql tweaks:

- add hidden dep on libexecinfo, which i hadn't disabled as well as i had hoped
- add missing -D in initdb command line in pkg-readme for some use cases
- put back the @ask-update warning as people using some pgsql extensions can't
use pg_upgrade

databases/postgresql/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.269 2021/02/23 19:39:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.270 2021/03/01 13:40:08 sthen Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@@ -9,6 +9,7 @@ COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
 
 VERSION=	13.2
 PREV_MAJOR=	12
+REVISION=	0
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
@@ -48,13 +49,12 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 
 MODULES=	lang/python
-MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION=	${MODPY_DEFAULT_VERSION_2}
 MODPY_RUNDEP=	No
 
-CONFIGURE_ENV=	ac_cv_path_PYTHON=${MODPY_BIN} \
-		ac_cv_search_backtrace_symbols=no \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PYTHON=${MODPY_BIN}
 
 CONFIGURE_ARGS=	--disable-rpath \
 		--with-openssl=/usr \
@@ -87,7 +87,6 @@ CONFIGURE_ARGS+= --disable-spinlocks
 # If clang gains "-fexcess-precision=standard" support then this
 # should be removed.
 MODULES+=	gcc4
-MODPY_VERSION =	${MODPY_DEFAULT_VERSION_2}
 MODGCC4_ARCHS=	i386
 MODGCC4_LANGS=	c
 # An alternative workaround:
@@ -100,8 +99,9 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/config
 ALL_TARGET=	world
 INSTALL_TARGET=	install-world
 
-LIB_DEPENDS-main=	textproc/libxml
-WANTLIB-main=		${WANTLIB} xml2
+LIB_DEPENDS-main=	devel/libexecinfo \
+			textproc/libxml
+WANTLIB-main=		${WANTLIB} execinfo xml2
 
 LIB_DEPENDS-server=	databases/postgresql=${VERSION} \
 			${LIB_DEPENDS-main}

databases/postgresql/pkg/PLIST-server

@@ -1,12 +1,21 @@
-@comment $OpenBSD: PLIST-server,v 1.41 2021/02/09 20:01:37 sthen Exp $
+@comment $OpenBSD: PLIST-server,v 1.42 2021/03/01 13:40:08 sthen Exp $
 @conflict pgsql-*
 @conflict pgsql-clients-*
 @conflict postgresql-clients-*
 @conflict postgresql-server-*
 @conflict postgresql-*
-@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for pg_upgrade, make sure your database is backed up
+@ask-update postgresql-server-<${V_MAJOR} Updating across a major version - data migration needed, see the pkg-readme
+@ask-update postgresql-server-<${PREV_MAJOR} CAUTION! Version before ${PREV_MAJOR} is too old for pg_upgrade. Make sure your database is backed up
 @newgroup _postgresql:503
 @newuser _postgresql:503:_postgresql:daemon:PostgreSQL Manager:/var/postgresql:/bin/sh
+@rcscript ${RCDIR}/postgresql
+@mode 755
+@owner _postgresql
+@group _postgresql
+@sample /var/postgresql/
+@mode
+@owner
+@group
 @bin bin/initdb
 @bin bin/pg_basebackup
 @bin bin/pg_checksums
@@ -950,8 +959,3 @@ share/postgresql/tsearch_data/thesaurus_sample.ths
 share/postgresql/tsearch_data/turkish.stop
 share/postgresql/tsearch_data/unaccent.rules
 share/postgresql/tsearch_data/xsyn_sample.rules
-@rcscript ${RCDIR}/postgresql
-@mode 755
-@owner _postgresql
-@group _postgresql
-@sample /var/postgresql/

databases/postgresql/pkg/README-server

@@ -1,4 +1,4 @@
-$OpenBSD: README-server,v 1.32 2021/02/09 20:01:37 sthen Exp $
+$OpenBSD: README-server,v 1.33 2021/03/01 13:40:08 sthen Exp $
 
 +-----------------------------------------------------------------------
 | Running ${PKGSTEM} on OpenBSD
@@ -168,7 +168,7 @@ faster than a dump and reload, especially for large databases.
 
 (The database environment defaults to UTF-8 if your terminal is already
 in a UTF-8 locale; if that is the case and you require an ASCII database
-environment, use "initdb --locale=C /var/postgresql/data [...]").
+environment, use "initdb --locale=C -D /var/postgresql/data [...]").
 
 5) Temporarily support connecting without a password for local users by
    editing pg_hba.conf to include "local all postgres trust"