Fri Oct 25 08:00:47 2019 UTC ()
postgresql11: fix nls option support


(triaxx)
diff -r1.8 -r1.9 pkgsrc/databases/postgresql11/Makefile.common
diff -r1.4 -r1.5 pkgsrc/databases/postgresql11/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/databases/postgresql11/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/postgresql11/Makefile.common 2019/10/25 04:39:18 1.8
+++ pkgsrc/databases/postgresql11/Makefile.common 2019/10/25 08:00:46 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.8 2019/10/25 04:39:18 triaxx Exp $ 1# $NetBSD: Makefile.common,v 1.9 2019/10/25 08:00:46 triaxx Exp $
2# 2#
3# This Makefile fragment is included by all PostgreSQL packages built from 3# This Makefile fragment is included by all PostgreSQL packages built from
4# the main sources of the PostgreSQL distribution except jdbc-postgresql. 4# the main sources of the PostgreSQL distribution except jdbc-postgresql.
5# 5#
6# The PostgreSQL package naming scheme, aside from the obvious piecewise 6# The PostgreSQL package naming scheme, aside from the obvious piecewise
7# packages, is as follows: 7# packages, is as follows:
8# <lang>-postgresql client-side interface to PostgreSQL 8# <lang>-postgresql client-side interface to PostgreSQL
9# postgresql-<lang> server-side module for PostgreSQL backend 9# postgresql-<lang> server-side module for PostgreSQL backend
10# 10#
11# used by databases/postgresql11-client/Makefile 11# used by databases/postgresql11-client/Makefile
12# used by databases/postgresql11-contrib/Makefile 12# used by databases/postgresql11-contrib/Makefile
13# used by databases/postgresql11-docs/Makefile 13# used by databases/postgresql11-docs/Makefile
14# used by databases/postgresql11-plperl/Makefile 14# used by databases/postgresql11-plperl/Makefile
@@ -27,27 +27,26 @@ LICENSE= postgresql-license @@ -27,27 +27,26 @@ LICENSE= postgresql-license
27 27
28CONFLICTS+= postgresql-[0-9]* 28CONFLICTS+= postgresql-[0-9]*
29CONFLICTS+= postgresql[2-9][0-9]-[0-9]* 29CONFLICTS+= postgresql[2-9][0-9]-[0-9]*
30 30
31.if !empty(PKGNAME:M*-*-*) 31.if !empty(PKGNAME:M*-*-*)
32module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//} 32module= ${PKGNAME:C/-[0-9].*$//:C/^.*-//}
33CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]* 33CONFLICTS+= postgresql[2-9][0-9]-${module}-[0-9]*
34.endif 34.endif
35 35
36DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql11/distinfo 36DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql11/distinfo
37COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql11/files 37COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql11/files
38PATCHDIR?= ${.CURDIR}/../../databases/postgresql11/patches 38PATCHDIR?= ${.CURDIR}/../../databases/postgresql11/patches
39 39
40USE_PKGLOCALEDIR= yes 
41USE_TOOLS+= bison gmake lex 40USE_TOOLS+= bison gmake lex
42PKG_SYSCONFSUBDIR= postgresql 41PKG_SYSCONFSUBDIR= postgresql
43 42
44.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
45 44
46PG_TEMPLATE.SunOS= solaris 45PG_TEMPLATE.SunOS= solaris
47PG_TEMPLATE.IRIX= irix5 46PG_TEMPLATE.IRIX= irix5
48PG_TEMPLATE.MirBSD= openbsd 47PG_TEMPLATE.MirBSD= openbsd
49.if !defined(PG_TEMPLATE.${OPSYS}) 48.if !defined(PG_TEMPLATE.${OPSYS})
50PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS} 49PG_TEMPLATE.${OPSYS}= ${LOWER_OPSYS}
51.endif 50.endif
52 51
53PG_DATA_DIR= ${PREFIX}/share/postgresql 52PG_DATA_DIR= ${PREFIX}/share/postgresql
@@ -58,29 +57,26 @@ PG_ETC_DIR= ${PKG_SYSCONFDIR} @@ -58,29 +57,26 @@ PG_ETC_DIR= ${PKG_SYSCONFDIR}
58GNU_CONFIGURE= yes 57GNU_CONFIGURE= yes
59CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR} 58CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR}
60CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR} 59CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR}
61CONFIGURE_ARGS+= --docdir=${PG_DOC_DIR} 60CONFIGURE_ARGS+= --docdir=${PG_DOC_DIR}
62CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR} 61CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR}
63CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}} 62CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}}
64 63
65CONFIGURE_ARGS+= --with-libxml 64CONFIGURE_ARGS+= --with-libxml
66CONFIGURE_ARGS+= --with-readline 65CONFIGURE_ARGS+= --with-readline
67CONFIGURE_ARGS+= --without-perl 66CONFIGURE_ARGS+= --without-perl
68CONFIGURE_ARGS+= --without-python 67CONFIGURE_ARGS+= --without-python
69CONFIGURE_ARGS+= --without-tcl 68CONFIGURE_ARGS+= --without-tcl
70 69
71# avoid pointing to a wrapper 
72CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} 
73 
74# sys/ucred.h shouldn't be included on Solaris, causes conflicts between 70# sys/ucred.h shouldn't be included on Solaris, causes conflicts between
75# procfs and largefile. 71# procfs and largefile.
76CONFIGURE_ENV.SunOS+= ac_cv_header_sys_ucred_h=no 72CONFIGURE_ENV.SunOS+= ac_cv_header_sys_ucred_h=no
77 73
78# pkgsrc silently filters the --as-needed linker arg, but that makes 74# pkgsrc silently filters the --as-needed linker arg, but that makes
79# it leak into the pgxs Makefiles and compromises manual building 75# it leak into the pgxs Makefiles and compromises manual building
80# against PostgreSQL files installed. Disable it here to prevent 76# against PostgreSQL files installed. Disable it here to prevent
81# that from happening. 77# that from happening.
82.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" 78.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
83CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no 79CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no
84.endif 80.endif
85 81
86# configure fails on OpenBSD and MirBSD if thread safety is enabled. 82# configure fails on OpenBSD and MirBSD if thread safety is enabled.
cvs diff -r1.4 -r1.5 pkgsrc/databases/postgresql11/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/postgresql11/options.mk 2019/10/25 07:15:40 1.4
+++ pkgsrc/databases/postgresql11/options.mk 2019/10/25 08:00:46 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: options.mk,v 1.4 2019/10/25 07:15:40 triaxx Exp $ 1# $NetBSD: options.mk,v 1.5 2019/10/25 08:00:46 triaxx Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql11 3PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql11
4PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap pam 4PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
5PKG_SUGGESTED_OPTIONS= gssapi nls 5PKG_SUGGESTED_OPTIONS= gssapi nls
6 6
7PLIST_VARS+= llvm nls 7PLIST_VARS+= llvm nls
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11# Bonjour support 11# Bonjour support
12.if !empty(PKG_OPTIONS:Mbonjour) 12.if !empty(PKG_OPTIONS:Mbonjour)
13CONFIGURE_ARGS+= --with-bonjour 13CONFIGURE_ARGS+= --with-bonjour
14. if ${OPSYS} != "Darwin" 14. if ${OPSYS} != "Darwin"
15LIBS+= -ldns_sd 15LIBS+= -ldns_sd
16. endif 16. endif
17. include "../../net/mDNSResponder/buildlink3.mk" 17. include "../../net/mDNSResponder/buildlink3.mk"