Update to 10.6

ok jeremy@
This commit is contained in:
pea 2018-12-01 17:48:03 +00:00
parent defa60d3c1
commit d8997a6e46
5 changed files with 17 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.243 2018/10/04 14:48:15 jeremy Exp $
# $OpenBSD: Makefile,v 1.244 2018/12/01 17:48:03 pea Exp $
COMMENT-main= PostgreSQL RDBMS (client)
COMMENT-server= PostgreSQL RDBMS (server)
@ -7,7 +7,7 @@ COMMENT-contrib=PostgreSQL RDBMS contributions
COMMENT-plpython=Python procedural language for PostgreSQL
COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version
VERSION= 10.5
VERSION= 10.6
PREV_MAJOR= 9.6
DISTNAME= postgresql-${VERSION}
PKGNAME-main= postgresql-client-${VERSION}
@ -16,11 +16,6 @@ PKGNAME-docs= postgresql-docs-${VERSION}
PKGNAME-contrib=postgresql-contrib-${VERSION}
PKGNAME-plpython=postgresql-plpython-${VERSION}
PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
REVISION-main= 1
REVISION-server= 4
REVISION-contrib= 0
REVISION-plpython= 0
REVISION-pg_upgrade= 0
CATEGORIES= databases
SHARED_LIBS= ecpg 7.9 \
@ -35,7 +30,7 @@ MAINTAINER= Pierre-Emmanuel Andre <pea@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c crypto m readline ssl termcap z
WANTLIB += c crypto curses m readline ssl z
MASTER_SITES= https://ftp.postgresql.org/pub/source/v${VERSION}/ \
ftp://ftp.postgresql.org/pub/source/v${VERSION}/
@ -93,18 +88,19 @@ WANTLIB-main = ${WANTLIB} xml2
LIB_DEPENDS-server= databases/postgresql=${VERSION} \
${LIB_DEPENDS-main}
WANTLIB-server= ${WANTLIB-main} perl pq>=4
WANTLIB-server= ${WANTLIB-main} perl
RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION}
LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \
${LIB_DEPENDS-main}
WANTLIB-contrib= ${WANTLIB-main} pq>=4 perl
WANTLIB-contrib= ${WANTLIB-main} perl
RUN_DEPENDS-pg_upgrade= databases/postgresql,-server=${VERSION} \
databases/postgresql-previous>=${PREV_MAJOR}
LIB_DEPENDS-pg_upgrade= databases/postgresql=${VERSION} \
${LIB_DEPENDS-main}
WANTLIB-pg_upgrade= ${WANTLIB-main} pq>=4
WANTLIB-pg_upgrade = ${WANTLIB-main}
LIB_DEPENDS-plpython= ${MODPY_LIB_DEPENDS}
WANTLIB-plpython = c m pthread util \

View File

@ -1,2 +1,2 @@
SHA256 (postgresql-10.5.tar.gz) = E75wU7HYrU4klDsk2AFwV0/HAbSbPxTmil8b2kUs49E=
SIZE (postgresql-10.5.tar.gz) = 26818092
SHA256 (postgresql-10.6.tar.gz) = fMtwrJHZaOMvZCpPQKeIUkU1L6t+6FMO3OEn3qbmICs=
SIZE (postgresql-10.6.tar.gz) = 26902911

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_pl_plperl_GNUmakefile,v 1.2 2017/08/14 11:56:54 pea Exp $
Index: src/pl/plperl/GNUmakefile
--- src/pl/plperl/GNUmakefile.orig
+++ src/pl/plperl/GNUmakefile
@@ -16,7 +16,7 @@ endif
# probably because it sometimes contains some header files with names
# that clash with some of ours, or with some that we include, notably on
# Windows.
-override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) $(perl_embed_ccflags) -I$(perl_archlibexp)/CORE -DNO_LOCALE_NUMERIC -DNO_LOCALE_COLLATE -DBIG_TIME
rpathdir = $(perl_archlibexp)/CORE

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-contrib,v 1.18 2018/05/17 18:42:42 pea Exp $
@comment $OpenBSD: PLIST-contrib,v 1.19 2018/12/01 17:48:03 pea Exp $
@conflict postgresql-uuid-*
@conflict postgresql-server-<8.4.3
@pkgpath devel/uuid,-pgsql
@ -188,6 +188,7 @@ share/postgresql/extension/pg_stat_statements--1.1--1.2.sql
share/postgresql/extension/pg_stat_statements--1.2--1.3.sql
share/postgresql/extension/pg_stat_statements--1.3--1.4.sql
share/postgresql/extension/pg_stat_statements--1.4--1.5.sql
share/postgresql/extension/pg_stat_statements--1.5--1.6.sql
share/postgresql/extension/pg_stat_statements--1.4.sql
share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
share/postgresql/extension/pg_stat_statements.control

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.86 2018/08/09 15:32:36 pea Exp $
@comment $OpenBSD: PLIST-docs,v 1.87 2018/12/01 17:48:03 pea Exp $
share/doc/postgresql/
share/doc/postgresql/COPYRIGHT
share/doc/postgresql/HISTORY
@ -657,6 +657,7 @@ share/doc/postgresql/html/release-10-2.html
share/doc/postgresql/html/release-10-3.html
share/doc/postgresql/html/release-10-4.html
share/doc/postgresql/html/release-10-5.html
share/doc/postgresql/html/release-10-6.html
share/doc/postgresql/html/release-10.html
share/doc/postgresql/html/release-6-0.html
share/doc/postgresql/html/release-6-1-1.html
@ -956,6 +957,7 @@ share/doc/postgresql/html/release-9-3-21.html
share/doc/postgresql/html/release-9-3-22.html
share/doc/postgresql/html/release-9-3-23.html
share/doc/postgresql/html/release-9-3-24.html
share/doc/postgresql/html/release-9-3-25.html
share/doc/postgresql/html/release-9-3-3.html
share/doc/postgresql/html/release-9-3-4.html
share/doc/postgresql/html/release-9-3-5.html
@ -976,6 +978,7 @@ share/doc/postgresql/html/release-9-4-17.html
share/doc/postgresql/html/release-9-4-18.html
share/doc/postgresql/html/release-9-4-19.html
share/doc/postgresql/html/release-9-4-2.html
share/doc/postgresql/html/release-9-4-20.html
share/doc/postgresql/html/release-9-4-3.html
share/doc/postgresql/html/release-9-4-4.html
share/doc/postgresql/html/release-9-4-5.html
@ -990,6 +993,7 @@ share/doc/postgresql/html/release-9-5-11.html
share/doc/postgresql/html/release-9-5-12.html
share/doc/postgresql/html/release-9-5-13.html
share/doc/postgresql/html/release-9-5-14.html
share/doc/postgresql/html/release-9-5-15.html
share/doc/postgresql/html/release-9-5-2.html
share/doc/postgresql/html/release-9-5-3.html
share/doc/postgresql/html/release-9-5-4.html
@ -1001,6 +1005,7 @@ share/doc/postgresql/html/release-9-5-9.html
share/doc/postgresql/html/release-9-5.html
share/doc/postgresql/html/release-9-6-1.html
share/doc/postgresql/html/release-9-6-10.html
share/doc/postgresql/html/release-9-6-11.html
share/doc/postgresql/html/release-9-6-2.html
share/doc/postgresql/html/release-9-6-3.html
share/doc/postgresql/html/release-9-6-4.html