CVS commit: pkgsrc/textproc

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Jul 14 12:55:45 UTC 2017

Modified Files:
        pkgsrc/textproc/p5-Xapian: PLIST
        pkgsrc/textproc/py-xapian: Makefile
        pkgsrc/textproc/xapian: distinfo module.mk
Added Files:
        pkgsrc/textproc/xapian: distinfo-bindings
        pkgsrc/textproc/xapian/patches-bindings: patch-configure

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/p5-Xapian/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/py-xapian/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/xapian/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/xapian/distinfo-bindings
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/xapian/module.mk
cvs rdiff -u -r0 -r1.1 \
    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/p5-Xapian/PLIST
diff -u pkgsrc/textproc/p5-Xapian/PLIST:1.1 pkgsrc/textproc/p5-Xapian/PLIST:1.2
--- pkgsrc/textproc/p5-Xapian/PLIST:1.1 Mon Jul 10 17:34:04 2017
+++ pkgsrc/textproc/p5-Xapian/PLIST     Fri Jul 14 12:55:45 2017
@@ -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/Val
 ${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

Index: pkgsrc/textproc/py-xapian/Makefile
diff -u pkgsrc/textproc/py-xapian/Makefile:1.1 pkgsrc/textproc/py-xapian/Makefile:1.2
--- pkgsrc/textproc/py-xapian/Makefile:1.1      Mon Jul 10 17:34:04 2017
+++ pkgsrc/textproc/py-xapian/Makefile  Fri Jul 14 12:55:45 2017
@@ -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 @@ DEPENDS+=             ${PYPKGPREFIX}-sphinx-[0-9]*:
 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 @@ REPLACE_PYTHON=              python/docs/examples/*.
 
 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"

Index: pkgsrc/textproc/xapian/distinfo
diff -u pkgsrc/textproc/xapian/distinfo:1.27 pkgsrc/textproc/xapian/distinfo:1.28
--- pkgsrc/textproc/xapian/distinfo:1.27        Tue Jul 11 14:56:37 2017
+++ pkgsrc/textproc/xapian/distinfo     Fri Jul 14 12:55:45 2017
@@ -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

Index: pkgsrc/textproc/xapian/module.mk
diff -u pkgsrc/textproc/xapian/module.mk:1.1 pkgsrc/textproc/xapian/module.mk:1.2
--- pkgsrc/textproc/xapian/module.mk:1.1        Mon Jul 10 17:29:58 2017
+++ pkgsrc/textproc/xapian/module.mk    Fri Jul 14 12:55:45 2017
@@ -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 @@ DISTNAME=               xapian-bindings-${VERSION}
 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"

Added files:

Index: pkgsrc/textproc/xapian/distinfo-bindings
diff -u /dev/null pkgsrc/textproc/xapian/distinfo-bindings:1.1
--- /dev/null   Fri Jul 14 12:55:45 2017
+++ pkgsrc/textproc/xapian/distinfo-bindings    Fri Jul 14 12:55:45 2017
@@ -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

Index: pkgsrc/textproc/xapian/patches-bindings/patch-configure
diff -u /dev/null pkgsrc/textproc/xapian/patches-bindings/patch-configure:1.1
--- /dev/null   Fri Jul 14 12:55:45 2017
+++ pkgsrc/textproc/xapian/patches-bindings/patch-configure     Fri Jul 14 12:55:45 2017
@@ -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