CVS commit: pkgsrc/databases/postgresql16

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar 16 23:42:39 UTC 2024

Modified Files:
        pkgsrc/databases/postgresql16: Makefile.common options.mk

Log Message:
postgresql16: icu should be optional, for it is both heavy & unstable.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql16/Makefile.common \
    pkgsrc/databases/postgresql16/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql16/Makefile.common
diff -u pkgsrc/databases/postgresql16/Makefile.common:1.4 pkgsrc/databases/postgresql16/Makefile.common:1.5
--- pkgsrc/databases/postgresql16/Makefile.common:1.4   Fri Feb  9 08:33:15 2024
+++ pkgsrc/databases/postgresql16/Makefile.common       Sat Mar 16 23:42:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2024/02/09 08:33:15 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2024/03/16 23:42:39 nia Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -130,7 +130,6 @@ CONFIGURE_ARGS+=    --with-uuid=ossp
 BUILDLINK_TRANSFORM+=  rm:-ffast-math
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
 .include "../../mk/readline.buildlink3.mk"
Index: pkgsrc/databases/postgresql16/options.mk
diff -u pkgsrc/databases/postgresql16/options.mk:1.4 pkgsrc/databases/postgresql16/options.mk:1.5
--- pkgsrc/databases/postgresql16/options.mk:1.4        Thu Nov 30 10:35:44 2023
+++ pkgsrc/databases/postgresql16/options.mk    Sat Mar 16 23:42:39 2024
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2023/11/30 10:35:44 jperkin Exp $
+# $NetBSD: options.mk,v 1.5 2024/03/16 23:42:39 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql16
-PKG_SUPPORTED_OPTIONS= bonjour dtrace llvm gssapi ldap nls pam lz4
-PKG_SUGGESTED_OPTIONS= gssapi nls lz4
+PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
+PKG_SUGGESTED_OPTIONS= gssapi icu nls lz4
 
 PLIST_VARS+=           gssapi llvm nls
 
@@ -72,3 +72,9 @@ CONFIGURE_ARGS+=      --disable-nls
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pam
 .endif
+
+.if !empty(PKG_OPTIONS:Micu)
+.  include "../../textproc/icu/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-icu
+.endif