From nobody Sat Apr 13 09:32:14 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VGp9q2kynz5H6YP; Sat, 13 Apr 2024 09:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VGp9p5MDTz4cnN; Sat, 13 Apr 2024 09:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713000734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmE6Zvxh9C4ON8lt8wmhQtZayd4yFJV5UufoiHarH4I=; b=fc9so5dn76oCMIMohTA13rUJod3yE5PU4UzOk8lLtzl//PFWE9hWNPgh4TsIs3thgbJm2k MATdtq8drevxPpkCeW5Q2GCsxYQtRZjXlT1RfGy3Rvj3ur6KLmTxs7yOOAVNGU1O2drl5E bVMhS2lZbnkcGfu6h5C2ZXNagE1WxqfQbJKKmP/nPnr+Gb+AJkZ+CGJ/ODtDm4HDwVsg57 qiANHn16jKagfOhB00daVdlM34vSUA1MwxcaBTLIFoBAQaMSKPIgrogBHQPbMqpJudTKNG 6KHKa2UsJQO9O3RxDu+nr9lBSguuTnM3D/IIhBgJYZcTOUsialPiJ/rHq+B7JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713000734; a=rsa-sha256; cv=none; b=Vyxmt3hrI2OyqPe+XMc8FXDgh8RuqS243CMiqkQ50HJ1r6h1b+IbEuXk6BaQZ2MP531vJw u5LDQiKi2XNy6whzOaefqgddn9bejsXrU1GPXCUrAc0aD5MPRSnDJu2WCV0k89wS3Isw/y 0lbjtcK8c0qEcIpU990pMbrIjdMxUQdge5Pi6hROrt3WzRePPvo9tnAYnrOLa+jMIblprb n6mVtpG2Kj7jgI/3+W7ZuSf9G1EAkPzBgwI064PO7vUeiC9jIbIVZxZr4P57plW26e4Reg i/quXTrLPMWYYCmdUPdw/VSBNw7J/wQJpk4usvOBLpqfa1xxSkCj0qN4xD9O9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713000734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fmE6Zvxh9C4ON8lt8wmhQtZayd4yFJV5UufoiHarH4I=; b=TCM4UYXQFlIrKSxR1YT4tpi2kb7hAjYPV5jr08C/DmJYnyoLHiJE+VC94DI3OHGwSh77cc LjCuG277eOsbb9PX7xO72PYVT3ig1AM/FO3udOTeeGW20YupG3QuWXa8qGKSKtlhxz0c+h iRKN3q67k9ewxehd2X2NR8gmtNV7yYbbOWCENrrkS20mmE0XBFE/Ul93hR1IRGutqpoVsP hCGoGchWrxn8X0+Gjw14Y7943CJXzY3VBouvQlAbQ2oNdo7Pa0Y5sVam6VN4auGKiLmxM4 ejhK+wpXTgWtgc5+gRljyyj3FjpqAiD4gRAyOe+UNxSMJ4LkyN/cQS9dYvmqiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VGp9p4zBczRLY; Sat, 13 Apr 2024 09:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43D9WE71034168; Sat, 13 Apr 2024 09:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43D9WEoq034165; Sat, 13 Apr 2024 09:32:14 GMT (envelope-from git) Date: Sat, 13 Apr 2024 09:32:14 GMT Message-Id: <202404130932.43D9WEoq034165@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1bce707d105f - main - databases/py-xapian: Fix build with DOCS disabled List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bce707d105f2102f409108a72db5ea76795447a Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1bce707d105f2102f409108a72db5ea76795447a commit 1bce707d105f2102f409108a72db5ea76795447a Author: Po-Chuan Hsieh AuthorDate: 2024-04-13 09:28:59 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-04-13 09:31:36 +0000 databases/py-xapian: Fix build with DOCS disabled - Convert REINPLACE_CMD to patch file - Clean up PLIST --- databases/py-xapian/Makefile | 4 +--- .../files/extra-patch-python3-Makefile.in | 20 +++++++++++++++++ databases/py-xapian/files/patch-configure | 26 +++++++++++++++++++--- databases/py-xapian/pkg-plist | 6 ++--- 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 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