CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan 17 21:29:39 UTC 2019

Modified Files:
        pkgsrc/databases/tdb: distinfo
        pkgsrc/devel/talloc: distinfo
        pkgsrc/devel/talloc/patches:
            patch-buildtools_wafsamba_samba__install.py
        pkgsrc/devel/tevent: distinfo
        pkgsrc/devel/tevent/patches:
            patch-buildtools_wafsamba_samba__install.py

Log Message:
Update patch for install_name on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/tdb/distinfo
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/talloc/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/tevent/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py

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

Modified files:

Index: pkgsrc/databases/tdb/distinfo
diff -u pkgsrc/databases/tdb/distinfo:1.14 pkgsrc/databases/tdb/distinfo:1.15
--- pkgsrc/databases/tdb/distinfo:1.14  Tue Jan 15 21:04:02 2019
+++ pkgsrc/databases/tdb/distinfo       Thu Jan 17 21:29:39 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2019/01/15 21:04:02 adam Exp $
+$NetBSD: distinfo,v 1.15 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (tdb-1.3.17.tar.gz) = 4cff48170f2ad3bfc85364f6f245d0b785260dba
 RMD160 (tdb-1.3.17.tar.gz) = e1a39c84812e5f95bfdce8ae8cdf90c81f383c88
 SHA512 (tdb-1.3.17.tar.gz) = ef25dad520a12d75e541802a46e418fe61ac691126600f24158cd5b95091b4c536ffc4d4aff6608cca087291fde0b86b44ff7b1a7837d816cd534e9688c39eff
 Size (tdb-1.3.17.tar.gz) = 697224 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d

Index: pkgsrc/devel/talloc/distinfo
diff -u pkgsrc/devel/talloc/distinfo:1.20 pkgsrc/devel/talloc/distinfo:1.21
--- pkgsrc/devel/talloc/distinfo:1.20   Tue Jan 15 21:03:10 2019
+++ pkgsrc/devel/talloc/distinfo        Thu Jan 17 21:29:39 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.20 2019/01/15 21:03:10 adam Exp $
+$NetBSD: distinfo,v 1.21 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (talloc-2.1.15.tar.gz) = 17c74ab8612f17ae1ed65751da1335a5a2d93704
 RMD160 (talloc-2.1.15.tar.gz) = 805fea7f529c8fb1f0488b54c28e6d4b50c7c182
 SHA512 (talloc-2.1.15.tar.gz) = 41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
 Size (talloc-2.1.15.tar.gz) = 634092 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d

Index: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
diff -u pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py:1.1 pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py:1.2
--- pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py:1.1 Sat Dec 22 08:55:30 2018
+++ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py     Thu Jan 17 21:29:39 2019
@@ -1,16 +1,15 @@
-$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2018/12/22 08:55:30 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.2 2019/01/17 21:29:39 adam Exp $
 
 Apply correct install_name on Darwin.
 
---- buildtools/wafsamba/samba_install.py.orig  2018-07-12 08:23:36.000000000 +0000
+--- buildtools/wafsamba/samba_install.py.orig  2019-01-14 22:24:44.000000000 +0000
 +++ buildtools/wafsamba/samba_install.py
-@@ -150,6 +150,9 @@ def install_library(self):
+@@ -151,6 +151,8 @@ def install_library(self):
              bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
          if dev_link:
              bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
-+        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
-+            self.env.append_value('LINKFLAGS', '-install_name')
-+            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and self.env.MACOSX_DEPLOYMENT_TARGET:
++            self.env.append_value('LINKFLAGS', ['-install_name', os.path.join(install_path, install_name)])
      finally:
          bld.all_envs['default'] = default_env
  

Index: pkgsrc/devel/tevent/distinfo
diff -u pkgsrc/devel/tevent/distinfo:1.2 pkgsrc/devel/tevent/distinfo:1.3
--- pkgsrc/devel/tevent/distinfo:1.2    Tue Jan 15 21:03:37 2019
+++ pkgsrc/devel/tevent/distinfo        Thu Jan 17 21:29:39 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/01/15 21:03:37 adam Exp $
+$NetBSD: distinfo,v 1.3 2019/01/17 21:29:39 adam Exp $
 
 SHA1 (tevent-0.9.38.tar.gz) = 89d3948532121ac656485dd81953581647dc6a56
 RMD160 (tevent-0.9.38.tar.gz) = a0f2d418461ae08c9ebf80e56eaa7aecd8a438b9
 SHA512 (tevent-0.9.38.tar.gz) = f475a7b7c261368bd641992c8f657c081bbbe783535ff435a7b68f7749d0e5873d57d05cf6ce80a28ccc9f11033022d28e9ae357b03854109c2c279a003d2035
 Size (tevent-0.9.38.tar.gz) = 794856 bytes
-SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
+SHA1 (patch-buildtools_wafsamba_samba__install.py) = d801340617da325e3bb70a90350e45cc8e383c2d

Index: pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py
diff -u pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py:1.1 pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py:1.2
--- pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py:1.1 Thu Jan  3 19:30:47 2019
+++ pkgsrc/devel/tevent/patches/patch-buildtools_wafsamba_samba__install.py     Thu Jan 17 21:29:39 2019
@@ -1,16 +1,15 @@
-$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2019/01/03 19:30:47 adam Exp $
+$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.2 2019/01/17 21:29:39 adam Exp $
 
 Apply correct install_name on Darwin.
 
---- buildtools/wafsamba/samba_install.py.orig  2018-07-12 08:23:36.000000000 +0000
+--- buildtools/wafsamba/samba_install.py.orig  2019-01-14 22:24:44.000000000 +0000
 +++ buildtools/wafsamba/samba_install.py
-@@ -150,6 +150,9 @@ def install_library(self):
+@@ -151,6 +151,8 @@ def install_library(self):
              bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
          if dev_link:
              bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
-+        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
-+            self.env.append_value('LINKFLAGS', '-install_name')
-+            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
++        if getattr(self, 'samba_type', None) != 'PYTHON' and self.env.MACOSX_DEPLOYMENT_TARGET:
++            self.env.append_value('LINKFLAGS', ['-install_name', os.path.join(install_path, install_name)])
      finally:
          bld.all_envs['default'] = default_env