On 11/15 05:29, Pierre-Emmanuel Andr? wrote:
> On Thu, Nov 14, 2019 at 10:17:14PM +0100, Pierre-Emmanuel Andr? wrote:
> > On Tue, Nov 05, 2019 at 01:29:41AM -0800, Jeremy Evans wrote:
> > > On 10/29 07:35, Jeremy Evans wrote:
> > > > I ran a partial bulk of the PostgreSQL dependencies, and this is what is
> > > > broke with PostgreSQL 12:
> > > >
> > > > databases/citus
> > > > databases/pg_statsinfo
> > > > databases/kdb
> > > > databases/postgresql-pllua
> > > > databases/postgresql-plv8
> > > > databases/skytools
> > > > security/heimdal,-libs (appears unrelated, will try rebuilding)
> > > > x11/qt3,-examples
> > >
> > > The security/heimdal failure was unrelated. I just removed
> > > postgresql-plv8.
> > >
> > > Below is a diff to update PostgreSQL to 12.0, postgresql-previous to
> > > 11.5, and handle the fallout in the other ports mentioned above.
> > >
> > > I recommend we wait until 12.1, update this patch for 12.1, then run a
> > > bulk and commit if there are no problems.
> > >
> > > We might want to consider removing skytools in the next major PostgreSQL
> > > update if it breaks, as it appears to be dead upstream.
> > >
> > > Thanks,
> > > Jeremy
> >
> > Hello,
> >
> > Diff updated to the latest version of PostgreSQL : 12.1.
> > I think it's time to put it in a bulk.
> >
> > Regards,
> >
>
> Updated diff after the upgrade to 11.6.
Here's a diff for plr and pgpointcloud.
Thanks,
Jeremy
Index: databases/postgresql-plr/Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-plr/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- databases/postgresql-plr/Makefile 12 Jul 2019 20:43:59 -0000 1.5
+++ databases/postgresql-plr/Makefile 19 Nov 2019 16:17:28 -0000
@@ -2,8 +2,8 @@
COMMENT = R procedural language for PostgreSQL
-VERSION = 8.3.0.18
-DISTNAME = REL8_3_0_18
+VERSION = 8.4
+DISTNAME = REL8_4
PKGNAME = postgresql-plr-${VERSION}
CATEGORIES = databases
Index: databases/postgresql-plr/distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql-plr/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- databases/postgresql-plr/distinfo 19 Feb 2019 05:11:15 -0000 1.2
+++ databases/postgresql-plr/distinfo 19 Nov 2019 16:17:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (REL8_3_0_18.tar.gz) = 4toAY7xQKsh5ts9UyT55Hv9JmYaRs9Q8SBId160Ryu0=
-SIZE (REL8_3_0_18.tar.gz) = 263146
+SHA256 (REL8_4.tar.gz) = v5w4IeY+IDsl8vrlzbdhBBb0q8y8ZSu3jp5oAHE4FjA=
+SIZE (REL8_4.tar.gz) = 264511
Index: databases/postgresql-plr/patches/patch-Makefile
===================================================================
RCS file: databases/postgresql-plr/patches/patch-Makefile
diff -N databases/postgresql-plr/patches/patch-Makefile
--- databases/postgresql-plr/patches/patch-Makefile 1 Nov 2017 21:51:22
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/11/01 21:51:22 jeremy Exp $
-
-Add RPATH to the ELF header for libR, since it is installed in a location
-outside the default ld.so search path.
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -21,7 +21,7 @@ MODULE_big = plr
- PG_CPPFLAGS += $(r_includespec)
- SRCS += plr.c pg_conversion.c pg_backend_support.c pg_userfuncs.c
pg_rsupport.c
- OBJS := $(SRCS:.c=.o)
--SHLIB_LINK += -L$(r_libdir1x) -L$(r_libdir2x) -lR
-+SHLIB_LINK += -L$(r_libdir1x) -L$(r_libdir2x) -Wl,-R$(r_libdir1x) -lR
- DATA_built = plr.sql
- DATA = plr--8.3.0.17.sql plr--unpackaged--8.3.0.17.sql
- DOCS = README.plr
Index: databases/postgresql-plr/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/postgresql-plr/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- databases/postgresql-plr/pkg/PLIST 19 Feb 2019 05:11:15 -0000 1.2
+++ databases/postgresql-plr/pkg/PLIST 19 Nov 2019 16:17:28 -0000
@@ -1,9 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/02/19 05:11:15 jeremy Exp $
lib/postgresql/plr.so
-share/doc/postgresql/
-share/doc/postgresql/extension/
-share/doc/postgresql/extension/README.plr
-share/postgresql/extension/plr--8.3.0.18.sql
-share/postgresql/extension/plr--unpackaged--8.3.0.18.sql
+share/postgresql/extension/plr--8.3.0.18--8.4.sql
+share/postgresql/extension/plr--8.4.sql
+share/postgresql/extension/plr--unpackaged--8.4.sql
share/postgresql/extension/plr.control
-share/postgresql/extension/plr.sql
Index: geo/pgpointcloud/Makefile
===================================================================
RCS file: /cvs/ports/geo/pgpointcloud/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- geo/pgpointcloud/Makefile 12 Jul 2019 20:46:55 -0000 1.7
+++ geo/pgpointcloud/Makefile 19 Nov 2019 16:17:28 -0000
@@ -8,9 +8,10 @@ GH_ACCOUNT = pgpointcloud
CATEGORIES = geo databases
-REVISION = 0
+REVISION = 1
MASTER_SITES0 =
https://github.com/pgpointcloud/pointcloud/commit/
-PATCHFILES =
pgpointcloud-patch1.patch{3e64c68dd4e0b9b9fdf0a74492ab49023161f6f1.diff}:0
+PATCHFILES =
pgpointcloud-patch1.patch{3e64c68dd4e0b9b9fdf0a74492ab49023161f6f1.diff}:0 \
+
pgpointcloud-patch2.patch{fa6faa4ec4ba28b61a9f6d160624257420ce7555.diff}:0
PATCH_DIST_STRIP = -p1
# BSD
Index: geo/pgpointcloud/distinfo
===================================================================
RCS file: /cvs/ports/geo/pgpointcloud/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- geo/pgpointcloud/distinfo 19 Feb 2019 05:12:31 -0000 1.3
+++ geo/pgpointcloud/distinfo 19 Nov 2019 16:17:28 -0000
@@ -1,4 +1,6 @@
SHA256 (pgpointcloud-patch1.patch) =
crVC7HyK06YRhuX7JOZVXfOZg2HuX0p1A0th21FPFt8=
+SHA256 (pgpointcloud-patch2.patch) =
uNeth90+OnYu8+bPZYPFzEysEDqETxPNBJxAIUNxkhU=
SHA256 (pointcloud-1.2.0.tar.gz) = hUKkxxS00MZ/ENCSKRpDtWUIcbTsjK+DHkkoEPJbuTw=
SIZE (pgpointcloud-patch1.patch) = 964
+SIZE (pgpointcloud-patch2.patch) = 3932
SIZE (pointcloud-1.2.0.tar.gz) = 311231
