Re: PostgreSQL 13.1 Upgrade

> > @conflict postgresql-*
> > -@ask-update postgresql-server-<${V_MAJOR} Make sure your existing database is backed up
> > +@ask-update postgresql-server-<${PREV_MAJOR} Old version too old for pg_upgrade, make sure your database is backed up
>
>
> yes ok pea@

Here is an updated version of the pgsql 13.1 update, based on
https://marc.info/?l=openbsd-ports&m=160592088315669&w=2 with the
above and the following other changes (some of which were mentioned
in the thread but I didn't find another full diff):

- don't bump libraries unnecessarily; only pq has a minor bump
- https homepage
- sync WANTLIB/LIB_DEPENDS
- knock out backtrace_symbols/libexecinfo (found by Mark Patruck ;)
- line up some tabs

this one is OK with me


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql/Makefile,v
retrieving revision 1.266
diff -u -p -r1.266 Makefile
--- Makefile 14 Nov 2020 13:03:49 -0000 1.266
+++ Makefile 4 Feb 2021 13:28:44 -0000
@@ -7,8 +7,8 @@ COMMENT-contrib=PostgreSQL RDBMS contrib
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version

-VERSION= 12.5
-PREV_MAJOR= 11
+VERSION= 13.1
+PREV_MAJOR= 12
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
PKGNAME-server= postgresql-server-${VERSION}
@@ -16,16 +16,16 @@ PKGNAME-docs= postgresql-docs-${VERSION}
PKGNAME-contrib=postgresql-contrib-${VERSION}
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
-REVISION-server= 0

+DPB_PROPERTIES= parallel

CATEGORIES= databases
SHARED_LIBS= ecpg 7.10 \
ecpg_compat 4.10 \
pgtypes 4.9 \
- pq 6.11
+ pq 6.12

-HOMEPAGE= http://www.postgresql.org/
+HOMEPAGE= https://www.postgresql.org/

MAINTAINER= Pierre-Emmanuel Andre <pea@openbsd.org>

@@ -51,10 +51,12 @@ MODULES= lang/python
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_ARGS= --disable-rpath --with-openssl=/usr \
+CONFIGURE_ARGS= --disable-rpath \
+ --with-openssl=/usr \
--with-bsd-auth \
--with-perl \
--with-python \
@@ -76,7 +78,7 @@ CONFIGURE_ARGS= --disable-rpath --with-o
# (apparently) a serious performance hit doing this.

.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "hppa"
-CONFIGURE_ARGS+=--disable-spinlocks
+CONFIGURE_ARGS+= --disable-spinlocks
.endif

# To avoid problems with missed floating point overflow checks.
@@ -96,30 +98,27 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conf
ALL_TARGET= world
INSTALL_TARGET= install-world

-LIB_DEPENDS-main= archivers/xz \
- converters/libiconv \
- textproc/libxml
-WANTLIB-main = ${WANTLIB} iconv lzma xml2
+LIB_DEPENDS-main= textproc/libxml
+WANTLIB-main= ${WANTLIB} xml2

-
-LIB_DEPENDS-server= databases/postgresql=${VERSION} \
- ${LIB_DEPENDS-main}
-WANTLIB-server= ${WANTLIB-main} perl pq
-
-RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
-LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
- ${LIB_DEPENDS-main}
+LIB_DEPENDS-server= databases/postgresql=${VERSION} \
+ ${LIB_DEPENDS-main}
+WANTLIB-server= ${WANTLIB-main} perl pq
+
+RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
+LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
+ ${LIB_DEPENDS-main}
WANTLIB-contrib= ${WANTLIB-main} perl pq

RUN_DEPENDS-pg_upgrade= databases/postgresql,-server=${VERSION} \
databases/postgresql-previous>=${PREV_MAJOR}
LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
- ${LIB_DEPENDS-main}
+ ${LIB_DEPENDS-main}

-WANTLIB-pg_upgrade = ${WANTLIB-main} pq
+WANTLIB-pg_upgrade= ${WANTLIB-main} pq

LIB_DEPENDS-plpython= ${MODPY_LIB_DEPENDS}
-WANTLIB-plpython = c m pthread util \
+WANTLIB-plpython= c intl m pthread util \
${MODPY_WANTLIB}
RUN_DEPENDS-plpython= databases/postgresql,-server=${VERSION}

Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql/distinfo,v
retrieving revision 1.86
diff -u -p -r1.86 distinfo
--- distinfo 13 Nov 2020 19:00:10 -0000 1.86
+++ distinfo 4 Feb 2021 13:28:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql-12.5.tar.gz) = 2IPpfP0ss7OrqUkVQdtrMM/jO7akAxzbCOxQFNBNbpY=
-SIZE (postgresql-12.5.tar.gz) = 27137095
+SHA256 (postgresql-13.1.tar.gz) = xHSnD9rLSeWEHpibR/EWCAwsIf90MxL3P00soy/x190=
+SIZE (postgresql-13.1.tar.gz) = 27483946
Index: patches/patch-src_Makefile_shlib
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_Makefile_shlib,v
retrieving revision 1.12
diff -u -p -r1.12 patch-src_Makefile_shlib
--- patches/patch-src_Makefile_shlib 3 Dec 2018 16:22:08 -0000 1.12
+++ patches/patch-src_Makefile_shlib 4 Feb 2021 13:28:44 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_Makefile_shlib,v 1.1
Index: src/Makefile.shlib
--- src/Makefile.shlib.orig
+++ src/Makefile.shlib
-@@ -80,7 +80,7 @@ shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION
+@@ -79,7 +79,7 @@ shlib_major = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION
shlib_bare = lib$(NAME)$(DLSUFFIX)
# Testing the soname variable is a reliable way to determine whether a
# linkable library is being built.
Index: patches/patch-src_bin_scripts_vacuumdb_c
===================================================================
RCS file: /cvs/ports/databases/postgresql/patches/patch-src_bin_scripts_vacuumdb_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_bin_scripts_vacuumdb_c
--- patches/patch-src_bin_scripts_vacuumdb_c 6 Feb 2020 00:36:12 -0000 1.3
+++ patches/patch-src_bin_scripts_vacuumdb_c 4 Feb 2021 13:28:44 -0000
@@ -2,12 +2,12 @@ $OpenBSD: patch-src_bin_scripts_vacuumdb
Index: src/bin/scripts/vacuumdb.c
--- src/bin/scripts/vacuumdb.c.orig
+++ src/bin/scripts/vacuumdb.c
-@@ -14,6 +14,8 @@
- #define FD_SETSIZE 1024 /* must set before winsock2.h is included */
-