Attachment #223948 for bug #254315

Lines 1-5 Link Here

(-)b/textproc/luceneplusplus/Makefile (+1 lines)
1	PORTNAME= lucene++	1	PORTNAME= lucene++
2	PORTVERSION= 3.0.8	2	PORTVERSION= 3.0.8
		3	PORTREVISION= 1
3	DISTVERSIONPREFIX= rel_	4	DISTVERSIONPREFIX= rel_
4	CATEGORIES= textproc	5	CATEGORIES= textproc
5		6




--- 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@
-




--- 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}
-

Return to bug 254315

Added Link Here

(-)b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in (+18 lines)
1	--- src/config/contrib/liblucene++-contrib.pc.in.orig
2	+++ src/config/contrib/liblucene++-contrib.pc.in
3	@@ -1,13 +1,12 @@
4	prefix=@CMAKE_INSTALL_PREFIX@
5	exec_prefix=${prefix}/bin
6	-libdir=@LIB_DESTINATION@
7	+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
8	includedir=${prefix}/include/lucene++
9	lib=lucene++-contrib
10
11	Name: liblucene++-contrib
12	Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene
13	Version: @lucene++_VERSION@
14	-Libs: -L@LIB_DESTINATION@ -l${lib}
15	+Libs: -L${libdir} -l${lib}
16	Cflags: -I${includedir}
17	Requires: liblucene++ = @lucene++_VERSION@
18	-

Added Link Here

(-)b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in (+17 lines)
1	--- src/config/core/liblucene++.pc.in.orig
2	+++ src/config/core/liblucene++.pc.in
3	@@ -1,12 +1,11 @@
4	prefix=@CMAKE_INSTALL_PREFIX@
5	exec_prefix=${prefix}/bin
6	-libdir=@LIB_DESTINATION@
7	+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
8	includedir=${prefix}/include/lucene++
9	lib=lucene++
10
11	Name: liblucene++
12	Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene
13	Version: @lucene++_VERSION@
14	-Libs: -L@LIB_DESTINATION@ -l${lib}
15	+Libs: -L${libdir} -l${lib}
16	Cflags: -I${includedir}
17	-