Date: Mon, 19 Apr 2021 16:56:56 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 05109f51920e - 2021Q2 - Fix pkgconfig files. Message-ID: <202104191656.13JGuuGH012427@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=05109f51920eb6951b5204708c8f3f0f1bad29d8 commit 05109f51920eb6951b5204708c8f3f0f1bad29d8 Author: Tilman Keskinoz <arved@FreeBSD.org> AuthorDate: 2021-04-12 07:51:30 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> 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} +-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104191656.13JGuuGH012427>