[144418] trunk/dports/devel/LucenePlusPlus

[raimue at macports.org]

Revision: 144418
          https://trac.macports.org/changeset/144418
Author:   raimue at macports.org
Date:     2016-01-08 06:02:16 -0800 (Fri, 08 Jan 2016)
Log Message:
-----------
devel/LucenePlusPlus:
Backport upstream patch to fix libdir in pkg-config

Modified Paths:
--------------
    trunk/dports/devel/LucenePlusPlus/Portfile

Added Paths:
-----------
    trunk/dports/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff

Modified: trunk/dports/devel/LucenePlusPlus/Portfile
===================================================================
--- trunk/dports/devel/LucenePlusPlus/Portfile	2016-01-08 13:10:06 UTC (rev 144417)
+++ trunk/dports/devel/LucenePlusPlus/Portfile	2016-01-08 14:02:16 UTC (rev 144418)
@@ -6,6 +6,7 @@
 PortGroup           cmake 1.0
 
 github.setup        luceneplusplus LucenePlusPlus 3.0.7 rel_
+revision            1
 categories          devel
 platforms           darwin
 maintainers         nomaintainer
@@ -19,7 +20,8 @@
 checksums           rmd160  5e8f7df944d84bb88f06af4ad4a4ef9cd051c0ca \
                     sha256  48ff3b7c2a3dff5941144f04cb011b95dbcf164302139c38e05b087f321ea908
 
-patchfiles          patch-boost-1.58.diff
+patchfiles          patch-boost-1.58.diff \
+                    patch-pkgconfig-libdir.diff 
 patch.pre_args      -p1
 
 depends_lib-append  port:boost

Added: trunk/dports/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff
===================================================================
--- trunk/dports/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff	                        (rev 0)
+++ trunk/dports/devel/LucenePlusPlus/files/patch-pkgconfig-libdir.diff	2016-01-08 14:02:16 UTC (rev 144418)
@@ -0,0 +1,51 @@
+From dd6ba769ea8b411d6e09720dfe7f38d027d8f8fc Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Tue, 28 Apr 2015 09:31:35 +0200
+Subject: [PATCH] Fix packageconfig path. Rationale: LIB_DESTINATION is set as
+ CMAKE_INSTALL_FULL_LIBDIR. So repeating "{prefix}" results in a double
+ usr/usr inclusion
+
+---
+ liblucene++-contrib.pc.cmake | 4 ++--
+ liblucene++.pc.cmake         | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/liblucene++-contrib.pc.cmake b/liblucene++-contrib.pc.cmake
+index 98b6381..21026e0 100644
+--- a/liblucene++-contrib.pc.cmake
++++ b/liblucene++-contrib.pc.cmake
+@@ -1,13 +1,13 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/bin
+-libdir=${prefix}/@LIB_DESTINATION@
++libdir=@LIB_DESTINATION@
+ 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${prefix}/@LIB_DESTINATION@ -l${lib}
++Libs: -L at LIB_DESTINATION@ -l${lib}
+ Cflags: -I${includedir}
+ Requires: liblucene++ = @lucene++_VERSION@
+ 
+diff --git a/liblucene++.pc.cmake b/liblucene++.pc.cmake
+index c526d4a..32d16ad 100644
+--- a/liblucene++.pc.cmake
++++ b/liblucene++.pc.cmake
+@@ -1,12 +1,12 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/bin
+-libdir=${prefix}/@LIB_DESTINATION@
++libdir=@LIB_DESTINATION@
+ 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${prefix}/@LIB_DESTINATION@ -l${lib}
++Libs: -L at LIB_DESTINATION@ -l${lib}
+ Cflags: -I${includedir}
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160108/50f78a79/attachment.html>