From owner-dev-commits-ports-all@freebsd.org Mon Apr 19 16:56:56 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F37945F8A7A; Mon, 19 Apr 2021 16:56:56 +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 4FPCf06fX4z4d3X; Mon, 19 Apr 2021 16:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D78AC2284B; Mon, 19 Apr 2021 16:56:56 +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 13JGuucW012428; Mon, 19 Apr 2021 16:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13JGuuGH012427; Mon, 19 Apr 2021 16:56:56 GMT (envelope-from git) Date: Mon, 19 Apr 2021 16:56:56 GMT Message-Id: <202104191656.13JGuuGH012427@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rodrigo Osorio Subject: git: 05109f51920e - 2021Q2 - Fix pkgconfig files. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 05109f51920eb6951b5204708c8f3f0f1bad29d8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Apr 2021 16:56:57 -0000 The branch 2021Q2 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=05109f51920eb6951b5204708c8f3f0f1bad29d8 commit 05109f51920eb6951b5204708c8f3f0f1bad29d8 Author: Tilman Keskinoz AuthorDate: 2021-04-12 07:51:30 +0000 Commit: Rodrigo Osorio CommitDate: 2021-04-19 18:56:13 +0000 Fix pkgconfig files. PR: 254315 Reported by: Olga Smirnova Submitted by: rodrigo (cherry picked from commit efaa198b606e6f38c34d5b3f2acd12686f6ad455) --- textproc/luceneplusplus/Makefile | 1 + .../patch-src_config_contrib_liblucene++-contrib.pc.in | 18 ++++++++++++++++++ .../files/patch-src_config_core_liblucene++.pc.in | 17 +++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile index 0fada9ff9aa0..107a01e0ddf7 100644 --- a/textproc/luceneplusplus/Makefile +++ b/textproc/luceneplusplus/Makefile @@ -1,6 +1,7 @@ PORTNAME= lucene++ PORTVERSION= 3.0.8 +PORTREVISION= 1 DISTVERSIONPREFIX= rel_ CATEGORIES= textproc diff --git a/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in new file mode 100644 index 000000000000..8d1620d8c5d6 --- /dev/null +++ b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in @@ -0,0 +1,18 @@ +--- src/config/contrib/liblucene++-contrib.pc.in.orig ++++ src/config/contrib/liblucene++-contrib.pc.in +@@ -1,13 +1,12 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++-contrib + + Name: liblucene++-contrib + Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} + Requires: liblucene++ = @lucene++_VERSION@ +- diff --git a/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in new file mode 100644 index 000000000000..2bfc591d47c3 --- /dev/null +++ b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in @@ -0,0 +1,17 @@ +--- src/config/core/liblucene++.pc.in.orig ++++ src/config/core/liblucene++.pc.in +@@ -1,12 +1,11 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix}/bin +-libdir=@LIB_DESTINATION@ ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/include/lucene++ + lib=lucene++ + + Name: liblucene++ + Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene + Version: @lucene++_VERSION@ +-Libs: -L@LIB_DESTINATION@ -l${lib} ++Libs: -L${libdir} -l${lib} + Cflags: -I${includedir} +-