Attachment #178886 for bug #216068

View | Details | Raw Unified | Return to bug 216068
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/devel/unittest-cpp/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= unittest-cpp	4	PORTNAME= unittest-cpp
5	PORTVERSION= 1.6.1	5	PORTVERSION= 2.0.0
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= devel	7	CATEGORIES= devel
8		8

Lines 1-3 Link Here

(-)b/devel/unittest-cpp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1483277010	1	TIMESTAMP = 1484404298
2	SHA256 (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 1cc9071be01db190f26868fefb6a7af49ee56a339fc3b08d1a1e9eeca5376c45	2	SHA256 (unittest-cpp-unittest-cpp-v2.0.0_GH0.tar.gz) = 74852198877dc2fdebdc4e5e9bd074018bf8ee03a13de139bfe41f4585b2f5b9
3	SIZE (unittest-cpp-unittest-cpp-v1.6.1_GH0.tar.gz) = 52536	3	SIZE (unittest-cpp-unittest-cpp-v2.0.0_GH0.tar.gz) = 54100




--- CMakeLists.txt.orig	2017-01-14 14:55:56 UTC
+++ CMakeLists.txt
@@ -106,5 +106,10 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/
 set(libdir      ${CMAKE_INSTALL_PREFIX}/lib)
 set(includedir  ${CMAKE_INSTALL_PREFIX}/include/UnitTest++)
 configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY)
+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
+else()
+    set(pkgconfdir  ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+endif()
 install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc"
-        DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+        DESTINATION "${pkgconfdir}")

Lines 37-39 lib/cmake/UnitTest++/UnitTest++Config.cmake Link Here

(-)b/devel/unittest-cpp/pkg-plist (+1 lines)
37	lib/cmake/UnitTest++/UnitTest++Targets-%%CMAKE_BUILD_TYPE%%.cmake	37	lib/cmake/UnitTest++/UnitTest++Targets-%%CMAKE_BUILD_TYPE%%.cmake
38	lib/cmake/UnitTest++/UnitTest++Targets.cmake	38	lib/cmake/UnitTest++/UnitTest++Targets.cmake
39	lib/libUnitTest++.a	39	lib/libUnitTest++.a
		40	libdata/pkgconfig/UnitTest++.pc

Return to bug 216068

Added Link Here

(-)b/devel/unittest-cpp/files/patch-CMakeLists.txt (+14 lines)
1	--- CMakeLists.txt.orig 2017-01-14 14:55:56 UTC
2	+++ CMakeLists.txt
3	@@ -106,5 +106,10 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/
4	set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
5	set(includedir ${CMAKE_INSTALL_PREFIX}/include/UnitTest++)
6	configure_file("UnitTest++.pc.in" "UnitTest++.pc" @ONLY)
7	+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
8	+ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig)
9	+else()
10	+ set(pkgconfdir ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
11	+endif()
12	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/UnitTest++.pc"
13	- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
14	+ DESTINATION "${pkgconfdir}")