On Mon, Mar 01, 2021 at 01:43:05PM +0000, Stuart Henderson wrote:
> On 2021/02/24 17:50, Stuart Henderson wrote:
> > Seems a good time to move pgsql to python 3. While there I fixed a
> > missing flag in pkg-readme and, on reflection (and following feedback
> > from other developers) there are some cases where pg_upgrade doesn't
> > work (especially involving extensions) so I have brought back the
> > @ask-update that I changed from "previous" to "previous - 1".
> > 
> > comments? ok?
> 
> I've committed the other tweaks as they're trivial, plus a libexecinfo
> fix as it was breaking in bulk build, but haven't changed to py3 yet.
> Here's an updated diff with the py3 parts.
>

Yes looks good to me.
ok pea@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.270
> diff -u -p -r1.270 Makefile
> --- Makefile  1 Mar 2021 13:40:08 -0000       1.270
> +++ Makefile  1 Mar 2021 13:41:16 -0000
> @@ -9,7 +9,7 @@ COMMENT-pg_upgrade=Support for upgrading
>  
>  VERSION=     13.2
>  PREV_MAJOR=  12
> -REVISION=    0
> +REVISION=    1
>  DISTNAME=    postgresql-${VERSION}
>  PKGNAME-main=        postgresql-client-${VERSION}
>  PKGNAME-server=      postgresql-server-${VERSION}
> @@ -49,7 +49,6 @@ USE_GMAKE=  Yes
>  CONFIGURE_STYLE=gnu
>  
>  MODULES=     lang/python
> -MODPY_VERSION=       ${MODPY_DEFAULT_VERSION_2}
>  MODPY_RUNDEP=        No
>  
>  CONFIGURE_ENV=       CPPFLAGS="-I${LOCALBASE}/include" \
> Index: pkg/PLIST-plpython
> ===================================================================
> RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-plpython,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-plpython
> --- pkg/PLIST-plpython        9 Feb 2021 20:01:37 -0000       1.10
> +++ pkg/PLIST-plpython        1 Mar 2021 13:41:16 -0000
> @@ -1,10 +1,10 @@
>  @comment $OpenBSD: PLIST-plpython,v 1.10 2021/02/09 20:01:37 sthen Exp $
>  include/postgresql/server/plpy_util.h
>  include/postgresql/server/plpython.h
> -@so lib/postgresql/hstore_plpython2.so
> -@so lib/postgresql/jsonb_plpython2.so
> -@so lib/postgresql/ltree_plpython2.so
> -@so lib/postgresql/plpython2.so
> +@so lib/postgresql/hstore_plpython3.so
> +@so lib/postgresql/jsonb_plpython3.so
> +@so lib/postgresql/ltree_plpython3.so
> +@so lib/postgresql/plpython3.so
>  share/postgresql/extension/hstore_plpython2u--1.0.sql
>  share/postgresql/extension/hstore_plpython2u.control
>  share/postgresql/extension/hstore_plpython3u--1.0.sql
> @@ -23,7 +23,5 @@ share/postgresql/extension/ltree_plpytho
>  share/postgresql/extension/ltree_plpython3u.control
>  share/postgresql/extension/ltree_plpythonu--1.0.sql
>  share/postgresql/extension/ltree_plpythonu.control
> -share/postgresql/extension/plpython2u--1.0.sql
> -share/postgresql/extension/plpython2u.control
> -share/postgresql/extension/plpythonu--1.0.sql
> -share/postgresql/extension/plpythonu.control
> +share/postgresql/extension/plpython3u--1.0.sql
> +share/postgresql/extension/plpython3u.control
> 

Reply via email to