From nobody Tue Mar 21 19:25:28 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 4Ph1ls1n4Qz40h50; Tue, 21 Mar 2023 19:25:29 +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 4Ph1lr5PZgz4HXT; Tue, 21 Mar 2023 19:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426729; 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=on1iSpUOqOWzo7ueaJj4nmFAWOz2CXfGArOG7rQkkBE=; b=e6X8KS3bf+b69+K34VtZDmCAAAodysorGCZYq9AIuZd2FCIUcUO1jbZIRn8i+pxSQ1y3PP CwLygpPz0Nqt5UnRQ9wu2BZLRziXW7tWm5+7uyiTo4p0y6ffMWXLqYVRExCcNA0J4V1Ddc m/9lV1SFU+9IV8bIeR33XWgOgb4Eq+6xeQ7T+cgBWBOOl32k91mMO4NBwpKF7lPcFfHeS2 VsxRG7Ky7Ks4/3AQKxI6kHNlv1kEffUx1WC5gPYCylYaQTsyWA+KjZsQAxXOD85Ngjfp6f 6LRtKdBxeNRHucaiD7CrNN+o1xAO7zLy3Q/M0LNL5ECDjiolmr1rNC3s1BVz+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426729; 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=on1iSpUOqOWzo7ueaJj4nmFAWOz2CXfGArOG7rQkkBE=; b=CmIfwYaA+5JGe0pJWNhRSupWPNlV4IPZ5plVY1hNtK2J2UaAsvFaFBqeITgxX0xsj0FKJZ K1dxogwQvNp1i1ulCesS/DpbUXf8FJXghYxxw4RvvC9BU0QJZygtRgK3LVQWE5F4DhnbPi +zuz0e0PdbZnJVKQcDqpenJsvqR/Y/Gdb58a9pJaXLSi08CWkDioAWT7EQC2IQYc5PrP/V NOWU6taeZcPqoKzHHv4I0KdChYtasLF5stRnGR+5tVRfYjkSDVRHBMeGrm1v6c0T67NfcF pw/0UmusMCNEPcJQfqkujOKjfIaJ14MzcrtMyEgNKryZqlOck0U2HYo+i6dZ/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679426729; a=rsa-sha256; cv=none; b=K7xpam7qyd5fjx10GrmOqyh4bQDQAyIR+5YACtd+Hg5aiZ3TgwtJPb0PpnwaaEO6rpMQLV maCpI4+Y7cxJXNpl1+s6ofDHAj8eoNYzYEz9EEjIuAkJzEW2lnpqr1CZ0MYPCCHD5Bd6/H YirfUr5vhJZyD9KNPJFjaOn++pLBmIzxyNnoz0qsCzveXMlbfZX1xco8PS8viO0xbsB1a7 d7GxKLQpnhObtEBuToEZrTnwUxt2OfewgJp7uSyHDYKslVnYARpRfI5XhdoLEFodR6sVK8 iJNyjn1iC9gKa7NR8Bebr3blMBQaT8W2ZL4k9gXnqgcy8Id7Na2v4aYa3OwUfQ== 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 4Ph1lr1Pz3zNtd; Tue, 21 Mar 2023 19:25:28 +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 32LJPS9R028772; Tue, 21 Mar 2023 19:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJPSqt028771; Tue, 21 Mar 2023 19:25:28 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:25:28 GMT Message-Id: <202303211925.32LJPSqt028771@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: b43221135f1d - main - www/xapian-omega: 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: b43221135f1d732ecfb5ffeea70567119cb422a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b43221135f1d732ecfb5ffeea70567119cb422a7 commit b43221135f1d732ecfb5ffeea70567119cb422a7 Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:41:06 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:20:14 +0000 www/xapian-omega: Update to 1.4.22 - Convert REINPLACE_CMD to patch file Changes: https://trac.xapian.org/wiki/ReleaseOverview --- www/xapian-omega/Makefile | 10 +--------- www/xapian-omega/distinfo | 6 +++--- www/xapian-omega/files/patch-Makefile.in | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile index 2b4cb7762d59..0cb4f26c808f 100644 --- a/www/xapian-omega/Makefile +++ b/www/xapian-omega/Makefile @@ -1,5 +1,5 @@ PORTNAME= xapian-omega -PORTVERSION= 1.4.21 +PORTVERSION= 1.4.22 CATEGORIES= www MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \ LOCAL/sunpoet @@ -19,8 +19,6 @@ USES= compiler:c++11-lang libtool localbase perl5 shebangfix tar:xz CONFIGURE_ARGS= --datarootdir=${DATADIR} --docdir=${DOCSDIR} \ ac_cv_func_snprintf=snprintf -#xCONFIGURE_ENV= PCRE2_CONFIG=${LOCALBASE}/bin/pcre2-config -#xCONFIGURE_ENV= PCRE2_CONFIG=${LOCALBASE}/bin/pcre2-config CONFIGURE_ENV= XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config GNU_CONFIGURE= yes USE_CXXSTD= c++11 @@ -40,12 +38,6 @@ ICONV_CONFIGURE_ON= ac_cv_search_iconv=${ICONV_LIB} ICONV_CONFIGURE_WITH= iconv ICONV_USES= iconv -post-patch: - @${REINPLACE_CMD} \ - -e '/^dist_sysconf_DATA = /d' \ - -e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \ - ${WRKSRC}/Makefile.in - post-install-DOCS-on: cd ${WRKSRC}/ && ${INSTALL_DATA} AUTHORS ChangeLog NEWS README TODO ${STAGEDIR}${DOCSDIR}/ diff --git a/www/xapian-omega/distinfo b/www/xapian-omega/distinfo index 8c8c502518ff..94a8105cb8cd 100644 --- a/www/xapian-omega/distinfo +++ b/www/xapian-omega/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767860 -SHA256 (xapian-omega-1.4.21.tar.xz) = 88a113c5598fc95833e1212c70be463abb9d5601564d21b861636f737955aad5 -SIZE (xapian-omega-1.4.21.tar.xz) = 568440 +TIMESTAMP = 1677771079 +SHA256 (xapian-omega-1.4.22.tar.xz) = 674c979fb90f1f4990eb8a909edab88ca4a009417dfd5ab0cba19e02c7a95528 +SIZE (xapian-omega-1.4.22.tar.xz) = 570476 diff --git a/www/xapian-omega/files/patch-Makefile.in b/www/xapian-omega/files/patch-Makefile.in new file mode 100644 index 000000000000..7c15c553211b --- /dev/null +++ b/www/xapian-omega/files/patch-Makefile.in @@ -0,0 +1,19 @@ +--- Makefile.in.orig 2023-02-02 01:01:36 UTC ++++ Makefile.in +@@ -841,7 +841,7 @@ AM_CPPFLAGS = \ + -DCONFIGFILE_SYSTEM=\"$(sysconfdir)/omega.conf\" \ + -DPKGLIBBINDIR=\"$(pkglibbindir)\" + +-pkglibbindir = $(pkglibdir)/bin ++pkglibbindir = $(prefix)/www/xapian-omega/cgi-bin + dist_pkglibbin_SCRIPTS = mhtml2html outlookmsg2html rfc822tohtml vcard2text + dist_bin_SCRIPTS = dbi2omega htdig2omega mbox2omega + dist_check_SCRIPTS = omegatest sourcetest +@@ -857,7 +857,6 @@ TESTS = atomparsetest$(EXEEXT)\ + + omegadatadir = $(datadir)/omega + dist_omegadata_DATA = htdig2omega.script mbox2omega.script +-dist_sysconf_DATA = omega.conf + + # headers maintained in xapian-core + noinst_HEADERS = omega.h query.h cgiparam.h index_file.h mime.h \