CVS commit: pkgsrc/textproc/xapian

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Aug  7 22:24:05 UTC 2017

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

Log Message:
Link directly with libtclstub.a (there's no .so). Fixes build on NetBSD,
doesn't break build on OS X.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r1.1 -r1.2 \
    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.3 pkgsrc/textproc/xapian/distinfo-bindings:1.4
--- pkgsrc/textproc/xapian/distinfo-bindings:1.3        Mon Aug  7 20:01:39 2017
+++ pkgsrc/textproc/xapian/distinfo-bindings    Mon Aug  7 22:24:05 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo-bindings,v 1.3 2017/08/07 20:01:39 schmonz Exp $
+$NetBSD: distinfo-bindings,v 1.4 2017/08/07 22:24:05 schmonz Exp $
 
 SHA1 (xapian-bindings-1.4.4.tar.xz) = 1162e836f3caccee927997f0d262ef6dccd44d9f
 RMD160 (xapian-bindings-1.4.4.tar.xz) = 231d56d0989cf3a37a0b31d39680488fa1e80b39
 SHA512 (xapian-bindings-1.4.4.tar.xz) = 006e771b3ea654130b4f76f1a1caee576fd5a3fa6317ca44f1e5483671e8c83073ecbde4f3fc7f84c75590eec53acb59701af4cf9bcd72355ed9d53924492b53
 Size (xapian-bindings-1.4.4.tar.xz) = 1117140 bytes
-SHA1 (patch-configure) = df295c61cc955ba28c03fe0b328b4d6c216eafad
+SHA1 (patch-configure) = d1c3edf1efcd105aef23bf9245650971f8df6ced
 SHA1 (patch-lua_Makefile.in) = 7f1c5077f0d46dfdf33c2b65f144bb08d5031330
 SHA1 (patch-ruby_Makefile.in) = ddbf3ca92b11ff6955d80f6a5609e3ce36798b0b

Index: pkgsrc/textproc/xapian/patches-bindings/patch-configure
diff -u pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.1 pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.2
--- pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.1 Fri Jul 14 12:55:45 2017
+++ pkgsrc/textproc/xapian/patches-bindings/patch-configure     Mon Aug  7 22:24:05 2017
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2017/07/14 12:55:45 joerg Exp $
+$NetBSD: patch-configure,v 1.2 2017/08/07 22:24:05 schmonz Exp $
 
-Remove hackaround for old OpenBSD bugs that break builds with other STL
-implementations.
+- Remove hackaround for old OpenBSD bugs that break builds with other
+  STL implementations.
+- Link directly with static-only libtclstub.a (fixes build on NetBSD).
 
---- configure.orig     2017-07-13 11:13:06.550332512 +0000
+--- configure.orig     2017-04-24 02:19:58.000000000 +0000
 +++ configure
+@@ -18051,7 +18051,7 @@ fi
+           for x in "/tcl$tcl_version" "" ; do
+             TCLCONFIG_SH=$tcl_libdir_runtime$x/tclConfig.sh
+             if test -r "$TCLCONFIG_SH" ; then
+-              eval "`sed 's/^TCL_STUB_LIB_SPEC=/TCL_LIBS=/p;d' $TCLCONFIG_SH`"
++              eval "`sed 's/^TCL_BUILD_STUB_LIB_PATH=/TCL_LIBS=/p;d' $TCLCONFIG_SH`"
+               break
+             fi
+           done
 @@ -19581,9 +19581,6 @@ SWIG_CXXFLAGS=
  if test yes = "$GXX" ; then
                      SWIG_CXXFLAGS="-fno-strict-aliasing"