CVS commit: pkgsrc/textproc/xapian

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov  5 10:59:44 UTC 2020

Modified Files:
        pkgsrc/textproc/xapian: distinfo-bindings
        pkgsrc/textproc/xapian/patches-bindings: patch-configure

Log Message:
Remove MACOSX_DEPLOYMENT_TARGET workaround for old macOS to fix xapian
bindings building on Big Sur.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/xapian/patches-bindings/patch-configure

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

Modified files:

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u pkgsrc/textproc/xapian/distinfo-bindings:1.19 pkgsrc/textproc/xapian/distinfo-bindings:1.20
--- pkgsrc/textproc/xapian/distinfo-bindings:1.19       Fri Aug 21 20:43:06 2020
+++ pkgsrc/textproc/xapian/distinfo-bindings    Thu Nov  5 10:59:43 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo-bindings,v 1.19 2020/08/21 20:43:06 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.20 2020/11/05 10:59:43 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.17.tar.xz) = 366dd7bbbbd9a4cb0253de974cb19f52e0877ca5
 RMD160 (xapian-bindings-1.4.17.tar.xz) = b9efdfd51eb2836fd942c10396f3afafe820e336
 SHA512 (xapian-bindings-1.4.17.tar.xz) = 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
 Size (xapian-bindings-1.4.17.tar.xz) = 1135100 bytes
-SHA1 (patch-configure) = d1c3edf1efcd105aef23bf9245650971f8df6ced
+SHA1 (patch-configure) = 852d74a5c506387cdbf02329dc87ceab2597c59b
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-perl_Makefile.in) = 993b137b319d7d28c2b3a70d2e46e1a38d380578
 SHA1 (patch-php7_php7_xapian__wrap.cc) = aa5ca15ef04bbd5038e23f4d1d01d1029243c68e

Index: pkgsrc/textproc/xapian/patches-bindings/patch-configure
diff -u pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.2 pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.3
--- pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.2 Mon Aug  7 22:24:05 2017
+++ pkgsrc/textproc/xapian/patches-bindings/patch-configure     Thu Nov  5 10:59:44 2020
@@ -1,12 +1,28 @@
-$NetBSD: patch-configure,v 1.2 2017/08/07 22:24:05 schmonz Exp $
+$NetBSD: patch-configure,v 1.3 2020/11/05 10:59:44 schmonz Exp $
 
 - Remove hackaround for old OpenBSD bugs that break builds with other
   STL implementations.
 - Link directly with static-only libtclstub.a (fixes build on NetBSD).
+- Remove workaround for old macOS to fix Big Sur build.
 
---- configure.orig     2017-04-24 02:19:58.000000000 +0000
+--- configure.orig     2020-08-21 03:38:47.000000000 +0000
 +++ configure
-@@ -18051,7 +18051,7 @@ fi
+@@ -3309,14 +3309,6 @@ case $host in
+ *86*-darwin8*|*-darwin[91]*)
+       ;;
+ *-darwin*)
+-  case $MACOSX_DEPLOYMENT_TARGET in
+-  "")
+-    OVERRIDE_MACOSX_DEPLOYMENT_TARGET=10.3 ;;
+-  10.[012])
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Overriding MACOSX_DEPLOYMENT_TARGET from $MACOSX_DEPLOYMENT_TARGET to 10.3" >&5
+-$as_echo "$as_me: WARNING: Overriding MACOSX_DEPLOYMENT_TARGET from $MACOSX_DEPLOYMENT_TARGET to 10.3" >&2;}
+-    OVERRIDE_MACOSX_DEPLOYMENT_TARGET=10.3 ;;
+-  esac
+   ;;
+ esac
+  if test -n "$OVERRIDE_MACOSX_DEPLOYMENT_TARGET"; then
+@@ -18048,7 +18040,7 @@ fi
            for x in "/tcl$tcl_version" "" ; do
              TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh
              if test -r "$TCLCONFIG_SH" ; then
@@ -15,7 +31,7 @@ $NetBSD: patch-configure,v 1.2 2017/08/0
                break
              fi
            done
-@@ -19581,9 +19581,6 @@ SWIG_CXXFLAGS=
+@@ -19524,9 +19516,6 @@ SWIG_CXXFLAGS=
  if test yes = "$GXX" ; then
                      SWIG_CXXFLAGS="-fno-strict-aliasing"