CVS commit: pkgsrc/textproc/icu

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Aug  5 13:29:17 UTC 2022

Modified Files:
        pkgsrc/textproc/icu: distinfo
        pkgsrc/textproc/icu/patches: patch-icudefs.mk.in

Log Message:
icu: install shared libraries correctly


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/textproc/icu/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/icu/patches/patch-icudefs.mk.in

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

Modified files:

Index: pkgsrc/textproc/icu/distinfo
diff -u pkgsrc/textproc/icu/distinfo:1.97 pkgsrc/textproc/icu/distinfo:1.98
--- pkgsrc/textproc/icu/distinfo:1.97   Mon Apr 18 11:03:24 2022
+++ pkgsrc/textproc/icu/distinfo        Fri Aug  5 13:29:17 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2022/04/18 11:03:24 adam Exp $
+$NetBSD: distinfo,v 1.98 2022/08/05 13:29:17 adam Exp $
 
 BLAKE2s (icu4c-71_1-src.tgz) = a18db0c84e7fedafd38029e41910110ec9a9f3b060e569862723c9264c42e99c
 SHA512 (icu4c-71_1-src.tgz) = 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
@@ -18,6 +18,6 @@ SHA1 (patch-config_mh-scoosr5) = 47703dc
 SHA1 (patch-configure) = 0043c23cffaab9851b6121e9f46eb474175dbc26
 SHA1 (patch-configure.ac) = 2cb4601e20ee6b93e08e8790df3f8212510aeb1b
 SHA1 (patch-i18n_double-conversion-utils.h) = 9bee115bb9ddc597607e30f95050de7b21751fca
-SHA1 (patch-icudefs.mk.in) = c2a9469bf896b5f0702d5795c3b1c2b394893663
+SHA1 (patch-icudefs.mk.in) = 15be482cf7541c9b518b8bfb05865ac994313cb7
 SHA1 (patch-runConfigureICU) = 3cd60613104fa4f1b81529795e75d5cf7f477b64
 SHA1 (patch-tools-toolutil-pkg_genc.cpp) = 3cbcf3387d6a39315b26a3e2a2ffb715507e9110

Index: pkgsrc/textproc/icu/patches/patch-icudefs.mk.in
diff -u pkgsrc/textproc/icu/patches/patch-icudefs.mk.in:1.1 pkgsrc/textproc/icu/patches/patch-icudefs.mk.in:1.2
--- pkgsrc/textproc/icu/patches/patch-icudefs.mk.in:1.1 Sat Apr 22 20:11:45 2017
+++ pkgsrc/textproc/icu/patches/patch-icudefs.mk.in     Fri Aug  5 13:29:17 2022
@@ -1,8 +1,10 @@
-$NetBSD: patch-icudefs.mk.in,v 1.1 2017/04/22 20:11:45 adam Exp $
+$NetBSD: patch-icudefs.mk.in,v 1.2 2022/08/05 13:29:17 adam Exp $
 
---- icudefs.mk.in.orig 2013-10-04 20:54:58.000000000 +0000
+Install shared libraries correctly.
+
+--- icudefs.mk.in.orig 2022-04-07 22:41:55.000000000 +0000
 +++ icudefs.mk.in
-@@ -207,13 +207,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
+@@ -213,13 +213,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX)
  
  ## If we can't use the shared libraries, use the static libraries
  ifneq ($(ENABLE_SHARED),YES)
@@ -18,3 +20,12 @@ $NetBSD: patch-icudefs.mk.in,v 1.1 2017/
  LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
  A = a
  SOBJ = $(SO)
+@@ -231,7 +231,7 @@ RMV = rm -rf
+ # INSTALL-L installs libraries. Override in mh-* file to INSTALL_PROGRAM
+ #           when the library needs to have executable permissions
+ INSTALL-S = $(INSTALL_PROGRAM)
+-INSTALL-L = $(INSTALL_PROGRAM)
++INSTALL-L = ${BSD_INSTALL_LIB}
+ #INSTALL-L = $(INSTALL_DATA)
+ 
+ # Location of the libraries before "make install" is used