CVS commit: pkgsrc/databases/postgresql16

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Sep 20 11:39:40 UTC 2023

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

Log Message:
postgresql16: require ICU


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 pkgsrc/databases/postgresql16/Makefile.common:1.2
--- pkgsrc/databases/postgresql16/Makefile.common:1.1   Sun Sep 17 08:53:21 2023
+++ pkgsrc/databases/postgresql16/Makefile.common       Wed Sep 20 11:39:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2023/09/17 08:53:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2023/09/20 11:39:40 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -130,6 +130,7 @@ 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.1 pkgsrc/databases/postgresql16/options.mk:1.2
--- pkgsrc/databases/postgresql16/options.mk:1.1        Sun Sep 17 08:53:21 2023
+++ pkgsrc/databases/postgresql16/options.mk    Wed Sep 20 11:39:40 2023
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2023/09/17 08:53:21 adam Exp $
+# $NetBSD: options.mk,v 1.2 2023/09/20 11:39:40 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql16
-PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
+PKG_SUPPORTED_OPTIONS= bonjour dtrace llvm gssapi ldap nls pam lz4
 PKG_SUGGESTED_OPTIONS= gssapi nls lz4
 
 PLIST_VARS+=           gssapi llvm nls
@@ -22,13 +22,6 @@ LIBS+=                       -ldns_sd
 CONFIGURE_ARGS+=       --enable-dtrace
 .endif
 
-# ICU collatium support
-.if !empty(PKG_OPTIONS:Micu)
-USE_TOOLS+=            pkg-config
-CONFIGURE_ARGS+=       --with-icu
-.  include "../../textproc/icu/buildlink3.mk"
-.endif
-
 # GSSAPI (Kerberos5) authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mgssapi)
 .  include "../../mk/krb5.buildlink3.mk"