databases/py-xapian: Fix build with DOCS disabled

- Convert REINPLACE_CMD to patch file
- Clean up PLIST

4 files changed, 46 insertions, 10 deletions

diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index f1a8eebd717c..fb6f12cfd26d 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -46,8 +46,6 @@ PORTSCOUT=	limitw:1,even
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
-
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e 's| all-local||; s| install-data-local install-dist_exampledataDATA||' ${WRKSRC}/python/Makefile.in ${WRKSRC}/python3/Makefile.in
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-python3-Makefile.in
 
 .include <bsd.port.mk>
diff --git a/databases/py-xapian/files/extra-patch-python3-Makefile.in b/databases/py-xapian/files/extra-patch-python3-Makefile.in
new file mode 100644
index 000000000000..f00876e074d6
--- /dev/null
+++ b/databases/py-xapian/files/extra-patch-python3-Makefile.in
@@ -0,0 +1,20 @@
+--- python3/Makefile.in.orig	2024-03-07 22:58:53 UTC
++++ python3/Makefile.in
+@@ -1094,7 +1094,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
++all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(pkgpylibdir)" "$(DESTDIR)$(exampledatadir)" "$(DESTDIR)$(pkgpylibdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -1160,7 +1160,7 @@ info-am:
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_exampledataDATA \
++install-data-am: \
+ 	install-pkgpylibDATA install-pkgpylibLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/databases/py-xapian/files/patch-configure b/databases/py-xapian/files/patch-configure
index 6b9dce2bb21b..d6b74ea6ebdc 100644
--- a/databases/py-xapian/files/patch-configure
+++ b/databases/py-xapian/files/patch-configure
@@ -1,11 +1,31 @@
---- configure.orig	2023-02-02 01:01:44 UTC
+--- configure.orig	2024-03-07 22:58:52 UTC
 +++ configure
-@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+@@ -18948,19 +18948,6 @@ printf "%s\n" "$version (too old)" >&6; }
+       PYTHON3_INC=`$PYTHON3 -c 'import os,sysconfig;print(sysconfig.get_path("include").replace(os.sep,"/"))' 2>/dev/null`
+ 
+     fi
+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python3 sphinx module" >&5
+-printf %s "checking for python3 sphinx module... " >&6; }
+-    if $PYTHON3 -c 'import sphinx' >&5 2>&5 ; then
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
+-    else
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
+-      if test yes = "$with_python3" ; then
+-	as_fn_error $? "Couldn't import sphinx module for Python3 - try package python3-sphinx" "$LINENO" 5
+-      fi
+-      PYTHON3=
+-    fi
+     if test -n "$PYTHON3" ; then
+                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5
+ printf %s "checking for $PYTHON3_INC/Python.h... " >&6; }
+@@ -21080,7 +21067,7 @@ if test yes = "$GXX" ; then
  if test yes = "$GXX" ; then
                      SWIG_CXXFLAGS="-fno-strict-aliasing"
  
 -              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
-+              XAPIAN_LIBS="$XAPIAN_LIBS "
++              XAPIAN_LIBS="$XAPIAN_LIBS"
  
  
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/py-xapian/pkg-plist b/databases/py-xapian/pkg-plist
index 69d8e0d410ba..6e8db2c212b9 100644
--- a/databases/py-xapian/pkg-plist
+++ b/databases/py-xapian/pkg-plist
@@ -1,7 +1,5 @@
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xapian/__init__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xapian/_xapian.a
 %%PYTHON_SITELIBDIR%%/xapian/_xapian%%PYTHON_EXT_SUFFIX%%.so