move the python subpackage to python 3 as this is only used
by kopano which is using python 3 already update plist of the ruby subpackage while here
This commit is contained in:
robert
parent
81fe1e16b4
commit
afdc7f1771
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2018/12/08 22:48:39 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2018/12/20 09:59:26 robert Exp $
|
||||
|
||||
COMMENT-main= perl bindings for Xapian
|
||||
COMMENT-python= python bindings for Xapian
|
||||
@ -11,13 +11,15 @@ PKGNAME-main= xapian-bindings-perl-${V}
|
||||
PKGNAME-python= xapian-bindings-python-${V}
|
||||
PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
|
||||
|
||||
REVISION-python= 3
|
||||
REVISION-python= 4
|
||||
REVISION-ruby= 3
|
||||
REVISION-main= 2
|
||||
|
||||
MODULES= lang/python \
|
||||
lang/ruby
|
||||
|
||||
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
|
||||
|
||||
MULTI_PACKAGES= -main -python -ruby
|
||||
|
||||
CATEGORIES= databases textproc
|
||||
@ -50,9 +52,8 @@ SUBST_VARS+= MODRUBY_BINREV
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ENV= RUBY="${RUBY}" RDOC="${RUBY:S/ruby/rdoc/}"
|
||||
CONFIGURE_ARGS= --with-perl \
|
||||
--with-python \
|
||||
--with-python3 \
|
||||
--with-ruby \
|
||||
--without-python3 \
|
||||
--without-php \
|
||||
--without-tcl \
|
||||
--without-csharp \
|
||||
|
||||
14
databases/xapian-bindings/patches/patch-python3_Makefile_in
Normal file
14
databases/xapian-bindings/patches/patch-python3_Makefile_in
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-python3_Makefile_in,v 1.1 2018/12/20 09:59:26 robert Exp $
|
||||
|
||||
Index: python3/Makefile.in
|
||||
--- python3/Makefile.in.orig
|
||||
+++ python3/Makefile.in
|
||||
@@ -1295,7 +1295,7 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@:
|
||||
|
||||
xapian/_xapian$(PYTHON3_SO): _xapian.la
|
||||
$(MKDIR_P) xapian
|
||||
- $(LIBTOOL) --config > libtoolconfig.tmp
|
||||
+ $(LIBTOOL) --config | grep -v pic > libtoolconfig.tmp
|
||||
. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON3_SO) xapian
|
||||
rm -f libtoolconfig.tmp
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-python_Makefile_in,v 1.2 2017/11/13 23:36:05 jeremy Exp $
|
||||
Index: python/Makefile.in
|
||||
--- python/Makefile.in.orig
|
||||
+++ python/Makefile.in
|
||||
@@ -1295,7 +1295,7 @@ xapian/__init__.pyo: xapian/__init__.py xapian/_xapian
|
||||
|
||||
xapian/_xapian$(PYTHON2_SO): _xapian.la
|
||||
$(MKDIR_P) xapian
|
||||
- $(LIBTOOL) --config > libtoolconfig.tmp
|
||||
+ $(LIBTOOL) --config | grep -v pic > libtoolconfig.tmp
|
||||
. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON2_SO) xapian
|
||||
rm -f libtoolconfig.tmp
|
||||
|
||||
@ -1,56 +1,57 @@
|
||||
@comment $OpenBSD: PLIST-python,v 1.2 2017/11/13 23:36:05 jeremy Exp $
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/xapian/_xapian.a
|
||||
@comment $OpenBSD: PLIST-python,v 1.3 2018/12/20 09:59:26 robert Exp $
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/__init__.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/__init__.py
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/__init__.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/__init__.${MODPY_PYOEXTENSION}
|
||||
@comment lib/python${MODPY_VERSION}/site-packages/xapian/_xapian.a
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/_xapian.a
|
||||
lib/python${MODPY_VERSION}/site-packages/xapian/_xapian.so
|
||||
share/doc/xapian-bindings/
|
||||
share/doc/xapian-bindings/python/
|
||||
share/doc/xapian-bindings/python/examples/
|
||||
share/doc/xapian-bindings/python/examples/simpleexpand.py
|
||||
share/doc/xapian-bindings/python/examples/simpleindex.py
|
||||
share/doc/xapian-bindings/python/examples/simplematchdecider.py
|
||||
share/doc/xapian-bindings/python/examples/simplesearch.py
|
||||
share/doc/xapian-bindings/python/html/
|
||||
share/doc/xapian-bindings/python/html/.buildinfo
|
||||
share/doc/xapian-bindings/python/html/_modules/
|
||||
share/doc/xapian-bindings/python/html/_modules/index.html
|
||||
share/doc/xapian-bindings/python/html/_modules/xapian.html
|
||||
share/doc/xapian-bindings/python/html/_sources/
|
||||
share/doc/xapian-bindings/python/html/_sources/examples.txt
|
||||
share/doc/xapian-bindings/python/html/_sources/index.txt
|
||||
share/doc/xapian-bindings/python/html/_sources/introduction.txt
|
||||
share/doc/xapian-bindings/python/html/_sources/xapian.txt
|
||||
share/doc/xapian-bindings/python/html/_static/
|
||||
share/doc/xapian-bindings/python/html/_static/ajax-loader.gif
|
||||
share/doc/xapian-bindings/python/html/_static/basic.css
|
||||
share/doc/xapian-bindings/python/html/_static/classic.css
|
||||
share/doc/xapian-bindings/python/html/_static/comment-bright.png
|
||||
share/doc/xapian-bindings/python/html/_static/comment-close.png
|
||||
share/doc/xapian-bindings/python/html/_static/comment.png
|
||||
share/doc/xapian-bindings/python/html/_static/default.css
|
||||
share/doc/xapian-bindings/python/html/_static/doctools.js
|
||||
share/doc/xapian-bindings/python/html/_static/down-pressed.png
|
||||
share/doc/xapian-bindings/python/html/_static/down.png
|
||||
share/doc/xapian-bindings/python/html/_static/file.png
|
||||
share/doc/xapian-bindings/python/html/_static/jquery.js
|
||||
share/doc/xapian-bindings/python/html/_static/minus.png
|
||||
share/doc/xapian-bindings/python/html/_static/plus.png
|
||||
share/doc/xapian-bindings/python/html/_static/pygments.css
|
||||
share/doc/xapian-bindings/python/html/_static/searchtools.js
|
||||
share/doc/xapian-bindings/python/html/_static/sidebar.js
|
||||
share/doc/xapian-bindings/python/html/_static/underscore.js
|
||||
share/doc/xapian-bindings/python/html/_static/up-pressed.png
|
||||
share/doc/xapian-bindings/python/html/_static/up.png
|
||||
share/doc/xapian-bindings/python/html/_static/websupport.js
|
||||
share/doc/xapian-bindings/python/html/examples.html
|
||||
share/doc/xapian-bindings/python/html/genindex.html
|
||||
share/doc/xapian-bindings/python/html/index.html
|
||||
share/doc/xapian-bindings/python/html/introduction.html
|
||||
share/doc/xapian-bindings/python/html/objects.inv
|
||||
share/doc/xapian-bindings/python/html/${MODPY_PY_PREFIX}modindex.html
|
||||
share/doc/xapian-bindings/python/html/search.html
|
||||
share/doc/xapian-bindings/python/html/searchindex.js
|
||||
share/doc/xapian-bindings/python/html/xapian.html
|
||||
share/doc/xapian-bindings/python3/
|
||||
share/doc/xapian-bindings/python3/examples/
|
||||
share/doc/xapian-bindings/python3/examples/simpleexpand.py
|
||||
share/doc/xapian-bindings/python3/examples/simpleindex.py
|
||||
share/doc/xapian-bindings/python3/examples/simplematchdecider.py
|
||||
share/doc/xapian-bindings/python3/examples/simplesearch.py
|
||||
share/doc/xapian-bindings/python3/html/
|
||||
share/doc/xapian-bindings/python3/html/.buildinfo
|
||||
share/doc/xapian-bindings/python3/html/_modules/
|
||||
share/doc/xapian-bindings/python3/html/_modules/_weakref.html
|
||||
share/doc/xapian-bindings/python3/html/_modules/index.html
|
||||
share/doc/xapian-bindings/python3/html/_modules/xapian.html
|
||||
share/doc/xapian-bindings/python3/html/_sources/
|
||||
share/doc/xapian-bindings/python3/html/_sources/examples.txt
|
||||
share/doc/xapian-bindings/python3/html/_sources/index.txt
|
||||
share/doc/xapian-bindings/python3/html/_sources/introduction.txt
|
||||
share/doc/xapian-bindings/python3/html/_sources/xapian.txt
|
||||
share/doc/xapian-bindings/python3/html/_static/
|
||||
share/doc/xapian-bindings/python3/html/_static/ajax-loader.gif
|
||||
share/doc/xapian-bindings/python3/html/_static/basic.css
|
||||
share/doc/xapian-bindings/python3/html/_static/classic.css
|
||||
share/doc/xapian-bindings/python3/html/_static/comment-bright.png
|
||||
share/doc/xapian-bindings/python3/html/_static/comment-close.png
|
||||
share/doc/xapian-bindings/python3/html/_static/comment.png
|
||||
share/doc/xapian-bindings/python3/html/_static/default.css
|
||||
share/doc/xapian-bindings/python3/html/_static/doctools.js
|
||||
share/doc/xapian-bindings/python3/html/_static/down-pressed.png
|
||||
share/doc/xapian-bindings/python3/html/_static/down.png
|
||||
share/doc/xapian-bindings/python3/html/_static/file.png
|
||||
share/doc/xapian-bindings/python3/html/_static/jquery.js
|
||||
share/doc/xapian-bindings/python3/html/_static/minus.png
|
||||
share/doc/xapian-bindings/python3/html/_static/plus.png
|
||||
share/doc/xapian-bindings/python3/html/_static/pygments.css
|
||||
share/doc/xapian-bindings/python3/html/_static/searchtools.js
|
||||
share/doc/xapian-bindings/python3/html/_static/sidebar.js
|
||||
share/doc/xapian-bindings/python3/html/_static/underscore.js
|
||||
share/doc/xapian-bindings/python3/html/_static/up-pressed.png
|
||||
share/doc/xapian-bindings/python3/html/_static/up.png
|
||||
share/doc/xapian-bindings/python3/html/_static/websupport.js
|
||||
share/doc/xapian-bindings/python3/html/examples.html
|
||||
share/doc/xapian-bindings/python3/html/genindex.html
|
||||
share/doc/xapian-bindings/python3/html/index.html
|
||||
share/doc/xapian-bindings/python3/html/introduction.html
|
||||
share/doc/xapian-bindings/python3/html/objects.inv
|
||||
share/doc/xapian-bindings/python3/html/py-modindex.html
|
||||
share/doc/xapian-bindings/python3/html/search.html
|
||||
share/doc/xapian-bindings/python3/html/searchindex.js
|
||||
share/doc/xapian-bindings/python3/html/xapian.html
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST-ruby,v 1.2 2018/07/18 22:01:13 jeremy Exp ${MODRUBY_BINREV},v 1.1.1.1 2015/04/05 21:41:02 robert Exp $
|
||||
${MODRUBY_SITEARCHDIR}/_xapian.so
|
||||
@comment $OpenBSD: PLIST-ruby,v 1.3 2018/12/20 09:59:26 robert Exp $
|
||||
@comment ${MODRUBY_SITEARCHDIR}/_xapian.a
|
||||
${MODRUBY_SITEARCHDIR}/_xapian.so
|
||||
${MODRUBY_SITEDIR}/xapian.rb
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/
|
||||
@ -8,3 +8,73 @@ share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simpleexpand.rb
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simpleindex.rb
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simplematchdecider.rb
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/examples/simplesearch.rb
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/index.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Database.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Document.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ESet.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Enquire.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ExpandTerm.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/LatLongCoord.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/LatLongCoords.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MSet.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Match.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Posting.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Query.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Term.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/Value.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/Xapian/ValueCountMatchSpy.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/created.rid
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/fonts.css
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/css/rdoc.css
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-Light.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-LightItalic.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-Regular.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/Lato-RegularItalic.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/SourceCodePro-Bold.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/fonts/SourceCodePro-Regular.ttf
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/add.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/arrow_up.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/brick.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/brick_link.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bug.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_black.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_toggle_minus.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/bullet_toggle_plus.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/date.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/delete.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/find.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/loadingAnimation.gif
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/macFFBgHack.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/package.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_green.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_white_text.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/page_white_width.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/plugin.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/ruby.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/tag_blue.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/tag_green.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/transparent.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/wrench.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/wrench_orange.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/images/zoom.png
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/index.html
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/darkfish.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/jquery.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/navigation.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/navigation.js.gz
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_index.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/search_index.js.gz
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/searcher.js
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/js/searcher.js.gz
|
||||
share/doc/xapian-bindings/ruby${MODRUBY_BINREV}/rdocs/table_of_contents.html
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user