Attachment #207222 for bug #240361

Lines 1-7 Link Here

(-)b/devel/cmake-doc/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.15.2	4	DISTVERSION= 3.15.3
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -doc	7	PKGNAMESUFFIX= -doc

Lines 1-7 Link Here

(-)b/devel/cmake-gui/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	DISTVERSION= 3.15.2	4	DISTVERSION= 3.15.3
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	6	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
7	PKGNAMESUFFIX= -gui	7	PKGNAMESUFFIX= -gui

Lines 3-9 Link Here

(-)b/devel/cmake/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.	5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.
6	DISTVERSION= 3.15.2	6	DISTVERSION= 3.15.3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \	8	MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \
9	https://www.cmake.org/files/v${PORTVERSION}/	9	https://www.cmake.org/files/v${PORTVERSION}/

Lines 1-3 Link Here

(-)b/devel/cmake/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1565240207	1	TIMESTAMP = 1567705700
2	SHA256 (cmake-3.15.2.tar.gz) = 539088cb29a68e6d6a8fba5c00951e5e5b1a92c68fa38a83e1ed2f355933f768	2	SHA256 (cmake-3.15.3.tar.gz) = 13958243a01365b05652fa01b21d40fa834f70a9e30efa69c02604e64f58b8f5
3	SIZE (cmake-3.15.2.tar.gz) = 9269449	3	SIZE (cmake-3.15.3.tar.gz) = 9270184

Lines 1064-1070 share/aclocal/cmake.m4 Link Here

(-)b/devel/cmake/pkg-plist (-1 / +1 lines)
1064	%%DATADIR%%/Help/release/3.3.rst	1064	%%DATADIR%%/Help/release/3.3.rst
1065	%%DATADIR%%/Help/release/3.4.rst	1065	%%DATADIR%%/Help/release/3.4.rst
1066	%%DATADIR%%/Help/release/3.5.rst	1066	%%DATADIR%%/Help/release/3.5.rst
1067	%%DATADIR%%/Help/release/3.6.rst	1067	%%DATADIR%%/Help/release/%%PYTHON_VER%%.rst
1068	%%DATADIR%%/Help/release/3.7.rst	1068	%%DATADIR%%/Help/release/3.7.rst
1069	%%DATADIR%%/Help/release/3.8.rst	1069	%%DATADIR%%/Help/release/3.8.rst
1070	%%DATADIR%%/Help/release/3.9.rst	1070	%%DATADIR%%/Help/release/3.9.rst




<<<<<<< HEAD
--- libemos-dp/CMakeLists.txt.orig	2019-08-10 23:48:55 UTC
+++ libemos-dp/CMakeLists.txt
@@ -42,6 +42,6 @@ ecbuild_add_library(
 #               libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
 #else()
   install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-               libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
+               libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
 #endif()
 
||||||| merged common ancestors
=======
Fix build: the symlink to libemosR64.a was not created
in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.


+               libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
 #endif()
 
>>>>>>> master




<<<<<<< HEAD
--- libemos-sp/CMakeLists.txt.orig	2019-08-10 23:49:07 UTC
+++ libemos-sp/CMakeLists.txt
@@ -45,6 +45,6 @@ ecbuild_add_library(
 #               libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
 #else()
   install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
-               libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
+               libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
 #endif()
 
||||||| merged common ancestors
=======
Fix build: the symlink to libemosR64.a was not created
in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.


+               libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
 #endif()
 
>>>>>>> master

Return to bug 240361

Lines 1-3 Link Here

(-)b/misc/libemos/files/patch-libemos-dp_CMakeLists.txt (+14 lines)
		1	<<<<<<< HEAD
		2	--- libemos-dp/CMakeLists.txt.orig 2019-08-10 23:48:55 UTC
		3	+++ libemos-dp/CMakeLists.txt
		4	@@ -42,6 +42,6 @@ ecbuild_add_library(
		5	# libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
		6	#else()
		7	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
		8	- libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
		9	+ libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
		10	#endif()
		11
		12	\|\|\|\|\|\|\| merged common ancestors
		13	=======
1	Fix build: the symlink to libemosR64.a was not created	14	Fix build: the symlink to libemosR64.a was not created
2	in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.	15	in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.
3		16
Lines 11-13 in ${STAGEDIR}, leading to fs_violations during poudriere test-builds. Link Here
11	+ libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )	24	+ libemosR64.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
12	#endif()	25	#endif()
13		26
		27	>>>>>>> master

Lines 1-3 Link Here

(-)b/misc/libemos/files/patch-libemos-sp_CMakeLists.txt (+14 lines)
		1	<<<<<<< HEAD
		2	--- libemos-sp/CMakeLists.txt.orig 2019-08-10 23:49:07 UTC
		3	+++ libemos-sp/CMakeLists.txt
		4	@@ -45,6 +45,6 @@ ecbuild_add_library(
		5	# libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
		6	#else()
		7	install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
		8	- libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
		9	+ libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
		10	#endif()
		11
		12	\|\|\|\|\|\|\| merged common ancestors
		13	=======
1	Fix build: the symlink to libemosR64.a was not created	14	Fix build: the symlink to libemosR64.a was not created
2	in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.	15	in ${STAGEDIR}, leading to fs_violations during poudriere test-builds.
3		16
Lines 11-13 in ${STAGEDIR}, leading to fs_violations during poudriere test-builds. Link Here
11	+ libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )	24	+ libemos.a \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
12	#endif()	25	#endif()
13		26
		27	>>>>>>> master