[pkgsrc/trunk]: pkgsrc/textproc Collect patches for xapian in a common subdir...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a8ff8d4c9b3
branches:  trunk
changeset: 365355:4a8ff8d4c9b3
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jul 14 12:55:45 2017 +0000

description:
Collect patches for xapian in a common subdirectory. Put distinfo for
modules into a separate file as well. Don't hard-code -lstdc++ for
broken ancient OpenBSD versions of GCC. Sync p5-Xapian PLIST with
reality.

diffstat:

 textproc/p5-Xapian/PLIST                         |   4 ++--
 textproc/py-xapian/Makefile                      |   8 ++++++--
 textproc/xapian/distinfo                         |   6 +-----
 textproc/xapian/distinfo-bindings                |   7 +++++++
 textproc/xapian/module.mk                        |   5 +++--
 textproc/xapian/patches-bindings/patch-configure |  17 +++++++++++++++++
 6 files changed, 36 insertions(+), 11 deletions(-)

diffs (111 lines):

diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/p5-Xapian/PLIST
--- a/textproc/p5-Xapian/PLIST  Fri Jul 14 12:52:49 2017 +0000
+++ b/textproc/p5-Xapian/PLIST  Fri Jul 14 12:55:45 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/10 17:34:04 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/14 12:55:45 joerg Exp $
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/AssertionError.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/BM25Weight.pm
@@ -47,7 +47,7 @@
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/Weight.pm
 ${PERL5_SUB_INSTALLVENDORLIB}/Xapian/WritableDatabase.pm
 ${PERL5_SUB_INSTALLVENDORARCH}/auto/Xapian/Xapian.a
-${PERL5_SUB_INSTALLVENDORARCH}/auto/Xapian/Xapian.bundle
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Xapian/Xapian.so
 share/doc/xapian-bindings/perl/examples/full-indexer.pl
 share/doc/xapian-bindings/perl/examples/full-searcher.pl
 share/doc/xapian-bindings/perl/examples/simpleexpand.pl
diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/py-xapian/Makefile
--- a/textproc/py-xapian/Makefile       Fri Jul 14 12:52:49 2017 +0000
+++ b/textproc/py-xapian/Makefile       Fri Jul 14 12:55:45 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/07/10 17:34:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2017/07/14 12:55:45 joerg Exp $
 
 PKGNAME=               ${PYPKGPREFIX}-${PKGNAME_MODULE}
 COMMENT=               Python bindings for Xapian search engine
@@ -12,7 +12,7 @@
 CONFIGURE_ARGS+=       --with-python
 PYTHON_3_OR_EMPTY=     # empty
 .else
-CONFIGURE_ARGS+=       --with-python3
+CONFIGURE_ARGS+=       --with-python3 PYTHON3=${PYTHONBIN}
 PYTHON_3_OR_EMPTY=     3
 .endif
 
@@ -23,6 +23,10 @@
 
 post-install:
        ${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/python${PYTHON_3_OR_EMPTY}/examples/*.py
+.if (${PYPKGPREFIX} != py27)
+       ${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__
+       ${MV} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/*.cpython* ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__/
+.endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/xapian/distinfo
--- a/textproc/xapian/distinfo  Fri Jul 14 12:52:49 2017 +0000
+++ b/textproc/xapian/distinfo  Fri Jul 14 12:55:45 2017 +0000
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.27 2017/07/11 14:56:37 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2017/07/14 12:55:45 joerg 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 (xapian-core-1.4.4.tar.xz) = 6b8bf7eea3059dab8d5dd254c3ae0cf895bc4910
 RMD160 (xapian-core-1.4.4.tar.xz) = 19535bc7ca5c175b7ee1c4898e9e9e796e45dcb0
 SHA512 (xapian-core-1.4.4.tar.xz) = dc88bab1d82c68b29d51c2113319ddb5d16840f3544b9d5fcc7a3671f97d58f16ddff58b865ad3521ea778cbaacf73fe7346bb514a1275f1f739283a4128d001
diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/xapian/distinfo-bindings
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian/distinfo-bindings Fri Jul 14 12:55:45 2017 +0000
@@ -0,0 +1,7 @@
+$NetBSD: distinfo-bindings,v 1.1 2017/07/14 12:55:45 joerg 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
diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/xapian/module.mk
--- a/textproc/xapian/module.mk Fri Jul 14 12:52:49 2017 +0000
+++ b/textproc/xapian/module.mk Fri Jul 14 12:55:45 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.1 2017/07/10 17:29:58 schmonz Exp $
+# $NetBSD: module.mk,v 1.2 2017/07/14 12:55:45 joerg Exp $
 
 .include "../../textproc/xapian/Makefile.common"
 
@@ -6,6 +6,7 @@
 PKGNAME_MODULE=                ${DISTNAME:S/-bindings-/-/}
 
 DESCR_SRC=             ${PKGDIR}/../../textproc/xapian/DESCR
-DISTINFO_FILE=         ${PKGDIR}/../../textproc/xapian/distinfo
+DISTINFO_FILE=         ${PKGDIR}/../../textproc/xapian/distinfo-bindings
+PATCHDIR=              ${PKGDIR}/../../textproc/xapian/patches-bindings
 
 .include "../../textproc/xapian/buildlink3.mk"
diff -r f5ff86a5dab1 -r 4a8ff8d4c9b3 textproc/xapian/patches-bindings/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/xapian/patches-bindings/patch-configure  Fri Jul 14 12:55:45 2017 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-configure,v 1.1 2017/07/14 12:55:45 joerg Exp $
+
+Remove hackaround for old OpenBSD bugs that break builds with other STL
+implementations.
+
+--- configure.orig     2017-07-13 11:13:06.550332512 +0000
++++ configure
+@@ -19581,9 +19581,6 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
+-
+-
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __INTEL_COMPILER