From nobody Tue Mar 21 19:25:24 2023 X-Original-To: dev-commits-ports-main@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 4Ph1ln2bkJz40gv9; Tue, 21 Mar 2023 19:25:25 +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 4Ph1ln0drtz4HPN; Tue, 21 Mar 2023 19:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426725; 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=+AMOf0sKNt2kW9MCp33cFG0i77hAzfMBkyobKxl7jPY=; b=LgP8cLCoScwAumfCy3GhaPMRPVkYG2Klr0gVpuNZ4bdga+mwR3cOp170NSMhAQRo/JAHEM I/7IUawi6ygjaEHDd7ka8Rjkwq7bmeysFnLkUdL4nBEqFhRQuazfxlmUVtNPRmaOygZ3Ap JwIYyLMWliD8JXHoEf20/RwQ7dQgjVcdQCmrwJg8peOQOn9ewxIqoEhteXif2U+RSkvxs2 XJcLPjy+dXsvkpBTXxWoFYBKWnx83zX64IJKbbBM9tig/ZUSJO8A6sk6VEdNzq8ClLqTWe iVPOLiF5Rj9nPM4+FujgZC7z/tIrJ6vkEBnTeFNR2wwCGic0pk3Wb3kpmsUrVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426725; 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=+AMOf0sKNt2kW9MCp33cFG0i77hAzfMBkyobKxl7jPY=; b=bhx5ybAbrqwlBnIhVLW+Vhw75JDkmNRvK7A/EuRjFU9iwm7+q8nPr/I6pOZrgvjLv1Ukmt r+nxmWdqnkBf8xUTUOc46qbveQFQEIOBZb9fJH8f5e99xCwoQgxHoVSmSyGQyeKpPBM3dT 0qTuKwugugOL0yCPsjH4nhqZBtLZIUk986V2tY1ljzeUVDdxOCmyM9KgYz8t2LFi0zJ++J lqTOb5ecDJHvDI6ZwIDILOE2zBnFRBHEys10a7R2KR1tKlaixTrklu/VOSjCBXnvlZRlBT pUlGyjXs066YVF3joeaFWQqHnCxbW7R2tUvkB3+XZBDtSE4vF2e4wxRSf26MUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679426725; a=rsa-sha256; cv=none; b=MjLDvjOOwZ/DQI9pQcQNwxw43gFrfrEMvbATu+7wJiYK4svrJnEsctr7L5LENMfTsadX2t tdryVEx+e8A7lPUBcT+K7HbnPo5O7W0eGSNvtX8rr5NLoPtBIavNi8gifp2MGeixdJ2seE hOPyC/3up9xxYgL5OZ3S1XJzVfcVfMY21AUfacvldewaWnl+eTcfI3KO82MiTicj//tDn/ E0cNo53o5PY3oy++kFx1aTAxXdTesgYpo9XMqzO+lXviYKMwZkavpHZ6MQ2gC0RZyGbXKp 3aJEwGLniic1CAgHob8+n659KHqqHTQ9oRb0YALUpegMtpfSoaMC4a5tJM8a2Q== 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 4Ph1lm5xlzzPMP; Tue, 21 Mar 2023 19:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LJPOiZ028715; Tue, 21 Mar 2023 19:25:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJPOoq028714; Tue, 21 Mar 2023 19:25:24 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:25:24 GMT Message-Id: <202303211925.32LJPOoq028714@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: b9d1a3fe43a2 - main - databases/php-xapian: Update to 1.4.22 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7 commit b9d1a3fe43a22f01f36ecba2e99c0befa3b5dbc7 Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:41:02 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:20:13 +0000 databases/php-xapian: Update to 1.4.22 - Unmark DEPRECATED and remove EXPIRATION_DATE - Remove IGNORE_WITH_PHP - Convert REINPLACE_CMD to patch file Changes: https://trac.xapian.org/wiki/ReleaseOverview --- databases/php-xapian/Makefile | 13 ++----------- databases/php-xapian/distinfo | 6 +++--- databases/php-xapian/files/patch-configure | 11 +++++++++++ databases/php-xapian/pkg-plist | 9 ++++----- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/databases/php-xapian/Makefile b/databases/php-xapian/Makefile index 23b33fa291cb..408f118e25b6 100644 --- a/databases/php-xapian/Makefile +++ b/databases/php-xapian/Makefile @@ -1,5 +1,5 @@ PORTNAME= xapian -PORTVERSION= 1.4.21 +PORTVERSION= 1.4.22 DISTVERSIONPREFIX= bindings- CATEGORIES= databases MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \ @@ -13,10 +13,6 @@ WWW= https://xapian.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Requires php 7 -EXPIRATION_DATE=2023-03-31 -BROKEN= Requires php 7 which has expired but php 8 support is WIP - BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/xapian-core LIB_DEPENDS= libxapian.so:databases/xapian-core @@ -26,19 +22,17 @@ CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --docdir=${DOCSDIR} \ --enable-shared \ --enable-static \ - --with-php7 \ + --with-php \ --without-csharp \ --without-java \ --without-lua \ --without-perl \ - --without-php \ --without-python \ --without-python3 \ --without-ruby \ --without-tcl CONFIGURE_ENV= PHP_CONFIG=${LOCALBASE}/bin/php-config GNU_CONFIGURE= yes -IGNORE_WITH_PHP=81 82 # https://trac.xapian.org/ticket/817 INSTALL_TARGET= install-strip USE_CXXSTD= c++11 @@ -50,7 +44,4 @@ PORTSCOUT= limitw:1,even OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure - .include diff --git a/databases/php-xapian/distinfo b/databases/php-xapian/distinfo index 8427779ddbc7..7dcbd14c467f 100644 --- a/databases/php-xapian/distinfo +++ b/databases/php-xapian/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767852 -SHA256 (xapian-bindings-1.4.21.tar.xz) = e7bf1e4982b91f841289d19214021d88371ca2a6c7304df59049d7da78b83ced -SIZE (xapian-bindings-1.4.21.tar.xz) = 1151620 +TIMESTAMP = 1677771073 +SHA256 (xapian-bindings-1.4.22.tar.xz) = 6b5454833ac52a3e32c0bb3a7290a5a2b50488d8918f2a45269557e4de9a31e5 +SIZE (xapian-bindings-1.4.22.tar.xz) = 1074840 diff --git a/databases/php-xapian/files/patch-configure b/databases/php-xapian/files/patch-configure new file mode 100644 index 000000000000..6b9dce2bb21b --- /dev/null +++ b/databases/php-xapian/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2023-02-02 01:01:44 UTC ++++ configure +@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS= + if test yes = "$GXX" ; then + SWIG_CXXFLAGS="-fno-strict-aliasing" + +- XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++" ++ XAPIAN_LIBS="$XAPIAN_LIBS " + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/databases/php-xapian/pkg-plist b/databases/php-xapian/pkg-plist index eddd492272ee..5a843ffc5d35 100644 --- a/databases/php-xapian/pkg-plist +++ b/databases/php-xapian/pkg-plist @@ -1,8 +1,7 @@ lib/php/%%PHP_EXT_DIR%%/xapian.a lib/php/%%PHP_EXT_DIR%%/xapian.so -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php7 -%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php7 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php8 +%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php8 %%PORTDOCS%%%%DOCSDIR%%/php/index.html -%%DATADIR%%/php/xapian.php