+cc maintainer
This has bugged me for some time, I think enabling ICU makes sense. Here's a wip diff. I fear it might cause issues with existing databases. Real world tests would probably help. FWIW I would also like to enable DEBUG_PACKAGES and investigate whether --disable-thread-safety really is appropriate. Index: Makefile =================================================================== RCS file: /cvs/ports/databases/postgresql/Makefile,v retrieving revision 1.257 diff -u -p -r1.257 Makefile --- Makefile 15 Nov 2019 13:19:10 -0000 1.257 +++ Makefile 12 Dec 2019 00:40:41 -0000 @@ -8,6 +8,7 @@ COMMENT-plpython=Python procedural langu COMMENT-pg_upgrade=Support for upgrading PostgreSQL data from previous version VERSION= 11.6 +REVISION= 0 PREV_MAJOR= 10 DISTNAME= postgresql-${VERSION} PKGNAME-main= postgresql-client-${VERSION} @@ -24,7 +25,7 @@ SHARED_LIBS= ecpg 7.9 \ pgtypes 4.8 \ pq 6.10 -HOMEPAGE= http://www.postgresql.org/ +HOMEPAGE= https://www.postgresql.org/ MAINTAINER= Pierre-Emmanuel Andre <p...@openbsd.org> @@ -68,6 +69,7 @@ CONFIGURE_ARGS= --disable-rpath --with-o --with-system-tzdata="/usr/share/zoneinfo" \ --with-openssl \ --with-libxml \ + --with-icu \ --disable-thread-safety # There is no spinlock support for alpha or hppa yet. Until we have access to @@ -100,8 +102,9 @@ WANTLIB-main = ${WANTLIB} xml2 LIB_DEPENDS-server= databases/postgresql=${VERSION} \ - ${LIB_DEPENDS-main} -WANTLIB-server= ${WANTLIB-main} perl pq + ${LIB_DEPENDS-main} \ + textproc/icu4c +WANTLIB-server= ${WANTLIB-main} icudata icui18n icuuc perl pq RUN_DEPENDS-contrib= databases/postgresql,-server=${VERSION} LIB_DEPENDS-contrib= databases/postgresql=${VERSION} \ @@ -117,7 +120,7 @@ WANTLIB-pg_upgrade = ${WANTLIB-main} pq LIB_DEPENDS-plpython= ${MODPY_LIB_DEPENDS} WANTLIB-plpython = c m pthread util \ - ${MODPY_WANTLIB} + intl ${MODPY_WANTLIB} RUN_DEPENDS-plpython= databases/postgresql,-server=${VERSION} WANTLIB-docs= Index: pkg/PLIST-contrib =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-contrib,v retrieving revision 1.20 diff -u -p -r1.20 PLIST-contrib --- pkg/PLIST-contrib 19 Feb 2019 05:09:18 -0000 1.20 +++ pkg/PLIST-contrib 12 Dec 2019 00:40:41 -0000 @@ -9,51 +9,51 @@ @bin bin/pg_test_timing @bin bin/pgbench @bin bin/vacuumlo -lib/postgresql/_int.so -lib/postgresql/adminpack.so -lib/postgresql/amcheck.so -lib/postgresql/auth_delay.so -lib/postgresql/auto_explain.so -lib/postgresql/autoinc.so -lib/postgresql/bloom.so -lib/postgresql/btree_gin.so -lib/postgresql/btree_gist.so -lib/postgresql/citext.so -lib/postgresql/cube.so -lib/postgresql/dblink.so -lib/postgresql/earthdistance.so -lib/postgresql/file_fdw.so -lib/postgresql/fuzzystrmatch.so -lib/postgresql/hstore.so -lib/postgresql/hstore_plperl.so -lib/postgresql/insert_username.so -lib/postgresql/isn.so -lib/postgresql/lo.so -lib/postgresql/ltree.so -lib/postgresql/moddatetime.so -lib/postgresql/pageinspect.so -lib/postgresql/passwordcheck.so -lib/postgresql/pg_buffercache.so -lib/postgresql/pg_freespacemap.so -lib/postgresql/pg_prewarm.so -lib/postgresql/pg_stat_statements.so -lib/postgresql/pg_trgm.so -lib/postgresql/pg_visibility.so -lib/postgresql/pgcrypto.so -lib/postgresql/pgrowlocks.so -lib/postgresql/pgstattuple.so -lib/postgresql/pgxml.so -lib/postgresql/postgres_fdw.so -lib/postgresql/refint.so -lib/postgresql/seg.so -lib/postgresql/sslinfo.so -lib/postgresql/tablefunc.so -lib/postgresql/tcn.so -lib/postgresql/timetravel.so -lib/postgresql/tsm_system_rows.so -lib/postgresql/tsm_system_time.so -lib/postgresql/unaccent.so -lib/postgresql/uuid-ossp.so +@so lib/postgresql/_int.so +@so lib/postgresql/adminpack.so +@so lib/postgresql/amcheck.so +@so lib/postgresql/auth_delay.so +@so lib/postgresql/auto_explain.so +@so lib/postgresql/autoinc.so +@so lib/postgresql/bloom.so +@so lib/postgresql/btree_gin.so +@so lib/postgresql/btree_gist.so +@so lib/postgresql/citext.so +@so lib/postgresql/cube.so +@so lib/postgresql/dblink.so +@so lib/postgresql/earthdistance.so +@so lib/postgresql/file_fdw.so +@so lib/postgresql/fuzzystrmatch.so +@so lib/postgresql/hstore.so +@so lib/postgresql/hstore_plperl.so +@so lib/postgresql/insert_username.so +@so lib/postgresql/isn.so +@so lib/postgresql/lo.so +@so lib/postgresql/ltree.so +@so lib/postgresql/moddatetime.so +@so lib/postgresql/pageinspect.so +@so lib/postgresql/passwordcheck.so +@so lib/postgresql/pg_buffercache.so +@so lib/postgresql/pg_freespacemap.so +@so lib/postgresql/pg_prewarm.so +@so lib/postgresql/pg_stat_statements.so +@so lib/postgresql/pg_trgm.so +@so lib/postgresql/pg_visibility.so +@so lib/postgresql/pgcrypto.so +@so lib/postgresql/pgrowlocks.so +@so lib/postgresql/pgstattuple.so +@so lib/postgresql/pgxml.so +@so lib/postgresql/postgres_fdw.so +@so lib/postgresql/refint.so +@so lib/postgresql/seg.so +@so lib/postgresql/sslinfo.so +@so lib/postgresql/tablefunc.so +@so lib/postgresql/tcn.so +@so lib/postgresql/timetravel.so +@so lib/postgresql/tsm_system_rows.so +@so lib/postgresql/tsm_system_time.so +@so lib/postgresql/unaccent.so +@so lib/postgresql/uuid-ossp.so @man man/man1/oid2name.1 @man man/man1/pg_archivecleanup.1 @man man/man1/pg_standby.1 Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-main,v retrieving revision 1.30 diff -u -p -r1.30 PLIST-main --- pkg/PLIST-main 19 Feb 2019 05:09:18 -0000 1.30 +++ pkg/PLIST-main 12 Dec 2019 00:40:41 -0000 @@ -55,22 +55,22 @@ include/postgresql/sqlca.h include/postgresql/sqlda-compat.h include/postgresql/sqlda-native.h include/postgresql/sqlda.h -lib/libecpg.a +@static-lib lib/libecpg.a @comment lib/libecpg.so @comment lib/libecpg.so.7 @lib lib/libecpg.so.${LIBecpg_VERSION} -lib/libecpg_compat.a +@static-lib lib/libecpg_compat.a @comment lib/libecpg_compat.so @comment lib/libecpg_compat.so.4 @lib lib/libecpg_compat.so.${LIBecpg_compat_VERSION} -lib/libpgcommon.a -lib/libpgfeutils.a -lib/libpgport.a -lib/libpgtypes.a +@static-lib lib/libpgcommon.a +@static-lib lib/libpgfeutils.a +@static-lib lib/libpgport.a +@static-lib lib/libpgtypes.a @comment lib/libpgtypes.so @comment lib/libpgtypes.so.4 @lib lib/libpgtypes.so.${LIBpgtypes_VERSION} -lib/libpq.a +@static-lib lib/libpq.a @comment lib/libpq.so @comment lib/libpq.so.6 @lib lib/libpq.so.${LIBpq_VERSION} Index: pkg/PLIST-plpython =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-plpython,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-plpython --- pkg/PLIST-plpython 19 Feb 2019 05:09:18 -0000 1.8 +++ pkg/PLIST-plpython 12 Dec 2019 00:40:41 -0000 @@ -1,10 +1,10 @@ @comment $OpenBSD: PLIST-plpython,v 1.8 2019/02/19 05:09:18 jeremy Exp $ include/postgresql/server/plpy_util.h include/postgresql/server/plpython.h -lib/postgresql/hstore_plpython2.so -lib/postgresql/jsonb_plpython2.so -lib/postgresql/ltree_plpython2.so -lib/postgresql/plpython2.so +@so lib/postgresql/hstore_plpython2.so +@so lib/postgresql/jsonb_plpython2.so +@so lib/postgresql/ltree_plpython2.so +@so lib/postgresql/plpython2.so share/postgresql/extension/hstore_plpython2u--1.0.sql share/postgresql/extension/hstore_plpython2u.control share/postgresql/extension/hstore_plpython3u--1.0.sql Index: pkg/PLIST-server =================================================================== RCS file: /cvs/ports/databases/postgresql/pkg/PLIST-server,v retrieving revision 1.38 diff -u -p -r1.38 PLIST-server --- pkg/PLIST-server 19 Feb 2019 16:45:46 -0000 1.38 +++ pkg/PLIST-server 12 Dec 2019 00:40:41 -0000 @@ -7,6 +7,14 @@ @ask-update postgresql-server-<${V_MAJOR} Make sure your existing 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_controldata @@ -819,44 +827,44 @@ include/postgresql/server/utils/varbit.h include/postgresql/server/utils/varlena.h include/postgresql/server/utils/xml.h include/postgresql/server/windowapi.h -lib/postgresql/ascii_and_mic.so -lib/postgresql/cyrillic_and_mic.so -lib/postgresql/dict_int.so -lib/postgresql/dict_snowball.so -lib/postgresql/dict_xsyn.so -lib/postgresql/euc2004_sjis2004.so -lib/postgresql/euc_cn_and_mic.so -lib/postgresql/euc_jp_and_sjis.so -lib/postgresql/euc_kr_and_mic.so -lib/postgresql/euc_tw_and_big5.so -lib/postgresql/jsonb_plperl.so -lib/postgresql/latin2_and_win1250.so -lib/postgresql/latin_and_mic.so -lib/postgresql/libpqwalreceiver.so -lib/postgresql/pgoutput.so +@so lib/postgresql/ascii_and_mic.so +@so lib/postgresql/cyrillic_and_mic.so +@so lib/postgresql/dict_int.so +@so lib/postgresql/dict_snowball.so +@so lib/postgresql/dict_xsyn.so +@so lib/postgresql/euc2004_sjis2004.so +@so lib/postgresql/euc_cn_and_mic.so +@so lib/postgresql/euc_jp_and_sjis.so +@so lib/postgresql/euc_kr_and_mic.so +@so lib/postgresql/euc_tw_and_big5.so +@so lib/postgresql/jsonb_plperl.so +@so lib/postgresql/latin2_and_win1250.so +@so lib/postgresql/latin_and_mic.so +@so lib/postgresql/libpqwalreceiver.so +@so lib/postgresql/pgoutput.so lib/postgresql/pgxs/src/pl/ lib/postgresql/pgxs/src/pl/plpython/ lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk -lib/postgresql/plperl.so -lib/postgresql/plpgsql.so -lib/postgresql/test_decoding.so -lib/postgresql/utf8_and_ascii.so -lib/postgresql/utf8_and_big5.so -lib/postgresql/utf8_and_cyrillic.so -lib/postgresql/utf8_and_euc2004.so -lib/postgresql/utf8_and_euc_cn.so -lib/postgresql/utf8_and_euc_jp.so -lib/postgresql/utf8_and_euc_kr.so -lib/postgresql/utf8_and_euc_tw.so -lib/postgresql/utf8_and_gb18030.so -lib/postgresql/utf8_and_gbk.so -lib/postgresql/utf8_and_iso8859.so -lib/postgresql/utf8_and_iso8859_1.so -lib/postgresql/utf8_and_johab.so -lib/postgresql/utf8_and_sjis.so -lib/postgresql/utf8_and_sjis2004.so -lib/postgresql/utf8_and_uhc.so -lib/postgresql/utf8_and_win.so +@so lib/postgresql/plperl.so +@so lib/postgresql/plpgsql.so +@so lib/postgresql/test_decoding.so +@so lib/postgresql/utf8_and_ascii.so +@so lib/postgresql/utf8_and_big5.so +@so lib/postgresql/utf8_and_cyrillic.so +@so lib/postgresql/utf8_and_euc2004.so +@so lib/postgresql/utf8_and_euc_cn.so +@so lib/postgresql/utf8_and_euc_jp.so +@so lib/postgresql/utf8_and_euc_kr.so +@so lib/postgresql/utf8_and_euc_tw.so +@so lib/postgresql/utf8_and_gb18030.so +@so lib/postgresql/utf8_and_gbk.so +@so lib/postgresql/utf8_and_iso8859.so +@so lib/postgresql/utf8_and_iso8859_1.so +@so lib/postgresql/utf8_and_johab.so +@so lib/postgresql/utf8_and_sjis.so +@so lib/postgresql/utf8_and_sjis2004.so +@so lib/postgresql/utf8_and_uhc.so +@so lib/postgresql/utf8_and_win.so @man man/man1/initdb.1 @man man/man1/pg_basebackup.1 @man man/man1/pg_controldata.1 @@ -912,8 +920,3 @@ share/postgresql/tsearch_data/thesaurus_ 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/ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE