Hi all porters,
please find below an update diff to the newest cmake version. Several
weeks of work have gone into this and I hope this version will work on
all supported arches.
Notable port changes:
- Fix COMPILER, it's not possible to build the old and the new cmake
version with base-gcc, isn't.
- It doesn't make any sense to keep the m88k XXX tags. CMake don't build
under m88k, correct?
- CMake lie to use because they don't use jasoncpp from system. I force
the bootstrap to use our system jsoncpp header and lib. (Patch/note
sent updtream)
- Tech cmake to detect/provide system JDK11, lua and new ruby versions
(of course upcoming ruby 2.7)
- I took some pre-configure commands from FreeBSDs port.
- Make bootstrap more clear and portable.
- Add --docdir to avoid warnings and sort CONFIGURE_ARGS
I hope there will be some helping hands with bulk builds on different
arches.
Hint: If you want test with ports-gcc on clang arches, you have to
rebuild devel/jsoncpp with the same compiler to avoid linking issues.
This took me a while to understand this issue. Safe your time.
Tested only on amd64 with base-clang and ports-gcc.
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.172
diff -u -p -u -p -r1.172 Makefile
--- Makefile 24 Oct 2018 14:27:59 -0000 1.172
+++ Makefile 2 Jun 2019 10:09:17 -0000
@@ -4,9 +4,8 @@ DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.10.2
+VER = 3.14.5
EPOCH = 0
-REVISION = 1
DISTNAME = cmake-${VER}
CATEGORIES = devel
@@ -22,14 +21,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
WANTLIB += jsoncpp m rhash uv z
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
-BUILD_DEPENDS = devel/ninja>=1.5.1
-.endif
-
-BUILD_DEPENDS += textproc/py-sphinx>=1.4
+BUILD_DEPENDS += devel/ninja>=1.5.1 \
+ textproc/py-sphinx>=1.4 \
LIB_DEPENDS = archivers/libarchive \
devel/libuv \
@@ -38,12 +33,13 @@ LIB_DEPENDS = archivers/libarchive \
security/rhash
CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = --prefix=${PREFIX} \
- --datadir=share/cmake \
+
+CONFIGURE_ARGS = --datadir=share/cmake \
--docdir=share/doc/cmake \
--mandir=man \
--no-qt-gui \
--parallel=${MAKE_JOBS} \
+ --prefix=${PREFIX} \
--sphinx-build=${LOCALBASE}/bin/sphinx-build \
--sphinx-html \
--sphinx-man \
@@ -52,28 +48,43 @@ CONFIGURE_ARGS = --prefix=${PREFIX} \
CONFIGURE_ENV += MAKE=${MAKE_PROGRAM}
+MAKE_FLAGS += VERBOSE=1
+
PORTHOME = ${WRKDIR}
SEPARATE_BUILD = Yes
TEST_TARGET = test
-MAKE_FLAGS += VERBOSE=1
+TEST_DEPENDS += devel/git
+
+SUBST_FILES = ${WRKSRC}/Source/cmLocalGenerator.cxx \
+ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
+ ${WRKSRC}/bootstrap
+
+post-patch:
+ (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+ xargs -0 perl -e 's,/usr/local,${LOCALBASE},g; \
+ s,/usr/X11R6,${LOCALBASE},g'
+ perl -e 's,/usr/local,${LOCALBASE},g' \
+ ${SUBST_FILES}
+ perl -e 's,/usr/include,${LOCALBASE}/include,' \
+ ${WRKSRC}/Modules/FindDCMTK.cmake \
+ # Use system jsoncpp
+ rm -rf ${WRKSRC}/Utilities/cmjsoncpp
+ find ${WRKSRC}/Source -type f -name '*.cxx' -or -name '*.h' \
+ -exec sed -i 's,cm_jsoncpp_,jsoncpp/json/,g' {} +; \
+ find ${WRKSRC}/Utilities -type f -name '*.h' \
+ -exec sed -i 's,cmjsoncpp/include/json/,jsoncpp/json/,g' {} +;
pre-configure:
cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
- ${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
- ${WRKSRC}/Modules/FindJNI.cmake \
- ${WRKSRC}/Modules/FindJava.cmake \
- ${WRKSRC}/Modules/FindMPEG.cmake \
- ${WRKSRC}/Modules/FindMPEG2.cmake \
- ${WRKSRC}/Modules/FindQt.cmake \
- ${WRKSRC}/Modules/FindQt4.cmake \
- ${WRKSRC}/Modules/FindSDL.cmake \
- ${WRKSRC}/Modules/FindTCL.cmake
+ (find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+ find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+ xargs -0 ${SUBST_CMD}
+ ${SUBST_CMD} ${SUBST_FILES}
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
do-build:
cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ninja -v -j \
${MAKE_JOBS} ${ALL_TARGET}
@@ -85,11 +96,8 @@ do-install:
do-test:
cd ${WRKBUILD} && exec ${SETENV} ${ALL_TEST_ENV} ninja -v -j \
${MAKE_JOBS} ${TEST_FLAGS} ${TEST_TARGET}
-.endif
post-install:
- rm ${WRKINST}${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} \
- ${WRKINST}${LOCALBASE}/share/cmake/Modules/Compiler/*.orig \
- ${WRKINST}${LOCALBASE}/share/cmake/Modules/Platform/*.orig
+ @find ${WRKINST}${LOCALBASE} \( -name "*.bak" -o -name "*.orig" -o -name "*.beforesubst" \) -exec rm {} \;
.include <bsd.port.mk>
Index: cmake.port.mk
===================================================================
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 cmake.port.mk
--- cmake.port.mk 11 Sep 2018 12:12:31 -0000 1.64
+++ cmake.port.mk 2 Jun 2019 10:09:17 -0000
@@ -9,11 +9,6 @@ MAKE_ENV+=LIB${_n}_VERSION=${_v}
USE_NINJA ?= Yes
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} == "m88k"
-USE_NINJA = No
-.endif
-
.if ${USE_NINJA:L} == "yes"
BUILD_DEPENDS += devel/ninja>=1.5.1
NINJA ?= ninja
@@ -82,15 +77,15 @@ MODCMAKE_configure= cd ${WRKBUILD} && ${
CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
- -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True \
+ -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
.if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
. if ${MODCMAKE_DEBUG:L} == "yes"
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Debug
MODCMAKE_BUILD_SUFFIX = -debug.cmake
. else
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release
MODCMAKE_BUILD_SUFFIX = -release.cmake
. endif
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 distinfo
--- distinfo 14 Jun 2018 17:04:45 -0000 1.53
+++ distinfo 2 Jun 2019 10:09:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+SHA256 (cmake-3.14.5.tar.gz) = UFrknr48Y8WV+l+BSXXYtyhIRH7hO2YTsPi5br2hjAY=
+SIZE (cmake-3.14.5.tar.gz) = 8854929
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 Jun 2018 17:04:45 -0000 1.26
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
- CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
- endif()
-
-+ if($ENV{LOCALBASE})
-+ set(OPENBSD_LOCALBASE $ENV{LOCALBASE})
-+ else()
-+ set(OPENBSD_LOCALBASE "/usr/local")
-+ endif()
-+
-+ # to find expat and curl
-+ link_directories("${OPENBSD_LOCALBASE}/lib")
-+
- #---------------------------------------------------------------------
- # Setup third-party libraries.
- # Everything in the tree should be able to include files from the
-@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
- endif()
-- set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
-+ set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
-+ set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
- else()
- set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
- add_subdirectory(Utilities/cmlibrhash)
-@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
- endif()
-- set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp)
-+ set(CMAKE_JSONCPP_INCLUDES ${JsonCpp_INCLUDE_DIRS})
-+ set(CMAKE_JSONCPP_LIBRARIES ${JsonCpp_LIBRARIES})
- else()
- set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
- add_subdirectory(Utilities/cmjsoncpp)
-@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
- message(FATAL_ERROR
- "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
- endif()
-- set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
-+ set(CMAKE_LIBUV_INCLUDES ${LibUV_INCLUDE_DIRS})
-+ set(CMAKE_LIBUV_LIBRARIES ${LibUV_LIBRARIES})
- else()
- set(CMAKE_LIBUV_LIBRARIES cmlibuv)
- add_subdirectory(Utilities/cmlibuv)
Index: patches/patch-Modules_CMakeCInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 14 Jun 2018 17:04:45 -0000 1.8
+++ patches/patch-Modules_CMakeCInformation_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_CMakeCInformatio
Index: Modules/CMakeCInformation.cmake
--- Modules/CMakeCInformation.cmake.orig
+++ Modules/CMakeCInformation.cmake
-@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
+@@ -142,7 +142,7 @@ include(CMakeCommonLanguageInclude)
# create a C shared library
if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
set(CMAKE_C_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_CMakeCXXInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCXXInformation_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_CMakeCXXInformation_cmake
--- patches/patch-Modules_CMakeCXXInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ patches/patch-Modules_CMakeCXXInformation_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeCXXInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCXXInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
+Index: Modules/CMakeCXXInformation.cmake
+--- Modules/CMakeCXXInformation.cmake.orig
++++ Modules/CMakeCXXInformation.cmake
+@@ -140,10 +140,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeCXXInformat
if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
endif()
-@@ -253,7 +249,7 @@ include(CMakeCommonLanguageInclude)
+@@ -238,7 +234,7 @@ include(CMakeCommonLanguageInclude)
# create a shared C++ library
if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
set(CMAKE_CXX_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_CMakeFortranInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeFortranInformation_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_CMakeFortranInformation_cmake
--- patches/patch-Modules_CMakeFortranInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ patches/patch-Modules_CMakeFortranInformation_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeFortranInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeFortranInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -115,10 +115,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
+Index: Modules/CMakeFortranInformation.cmake
+--- Modules/CMakeFortranInformation.cmake.orig
++++ Modules/CMakeFortranInformation.cmake
+@@ -116,10 +116,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeFortranInfo
# for most systems a module is the same as a shared library
# so unless the variable CMAKE_MODULE_EXISTS is set just
# copy the values from the LIBRARY variables
-@@ -182,7 +178,7 @@ include(CMakeCommonLanguageInclude)
+@@ -174,7 +170,7 @@ include(CMakeCommonLanguageInclude)
# create a Fortran shared library
if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_Compiler_GNU-Fortran_cmake
--- patches/patch-Modules_Compiler_GNU-Fortran_cmake 14 Mar 2018 12:24:54 -0000 1.7
+++ patches/patch-Modules_Compiler_GNU-Fortran_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU-For
Index: Modules/Compiler/GNU-Fortran.cmake
--- Modules/Compiler/GNU-Fortran.cmake.orig
+++ Modules/Compiler/GNU-Fortran.cmake
-@@ -9,10 +9,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
+@@ -12,10 +12,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed")
Index: patches/patch-Modules_Compiler_GNU_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake 26 Aug 2017 17:53:35 -0000 1.12
+++ patches/patch-Modules_Compiler_GNU_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU_cma
Index: Modules/Compiler/GNU.cmake
--- Modules/Compiler/GNU.cmake.orig
+++ Modules/Compiler/GNU.cmake
-@@ -39,9 +39,9 @@ macro(__compiler_gnu lang)
+@@ -49,9 +49,9 @@ macro(__compiler_gnu lang)
# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 14 Jun 2018 17:04:45 -0000 1.23
+++ patches/patch-Modules_FindJNI_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,16 +2,16 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
Index: Modules/FindJNI.cmake
--- Modules/FindJNI.cmake.orig
+++ Modules/FindJNI.cmake
-@@ -25,6 +25,8 @@
- # JAVA_INCLUDE_PATH2 = the include path to jni_md.h
- # JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+@@ -45,6 +45,8 @@ The following cache variables are also available to se
+ the include path to jawt.h
+ #]=======================================================================]
+set(MODJAVA_VER $ENV{MODJAVA_VER})
+
- # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+ # Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
macro(java_append_library_directories _var)
# Determine java arch-specific library subdir
-@@ -70,8 +72,10 @@ macro(java_append_library_directories _var)
+@@ -93,8 +95,10 @@ macro(java_append_library_directories _var)
# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
# system is non-Linux (where the code above has not been well tested)
@@ -24,7 +24,7 @@ Index: Modules/FindJNI.cmake
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -130,17 +134,71 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
@@ -40,10 +40,9 @@ Index: Modules/FindJNI.cmake
- ${_JAVA_HOME}
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++ ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++ ${LOCALBASE}/jre-11/lib/{libarch}
)
--endif()
--get_filename_component(java_install_version
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+else(MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
+ if(_JAVA_HOME)
@@ -54,178 +53,68 @@ Index: Modules/FindJNI.cmake
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ )
-+ endif()
-+ get_filename_component(java_install_version
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
-
--list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-- )
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-- /usr/lib
-- /usr/local/lib
-- /usr/lib/jvm/java/lib
-- /usr/lib/java/jre/lib/{libarch}
-- /usr/lib/jvm/jre/lib/{libarch}
-- /usr/local/lib/java/jre/lib/{libarch}
-- /usr/local/share/java/jre/lib/{libarch}
-- /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-- /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-- /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-- # Debian specific paths for default JVM
-- /usr/lib/jvm/default-java/jre/lib/{libarch}
-- /usr/lib/jvm/default-java/jre/lib
-- /usr/lib/jvm/default-java/lib
-- # Arch Linux specific paths for default JVM
-- /usr/lib/jvm/default/jre/lib/{libarch}
-- /usr/lib/jvm/default/lib/{libarch}
-- # Ubuntu specific paths for default JVM
-- /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- # OpenBSD specific paths for default JVM
-- /usr/local/jdk-1.7.0/jre/lib/{libarch}
-- /usr/local/jre-1.7.0/lib/{libarch}
-- /usr/local/jdk-1.6.0/jre/lib/{libarch}
-- /usr/local/jre-1.6.0/lib/{libarch}
-- # SuSE specific paths for default JVM
-- /usr/lib64/jvm/java/jre/lib/{libarch}
-- /usr/lib64/jvm/jre/lib/{libarch}
-- )
-+ list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-+ )
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+ /usr/lib
-+ /usr/local/lib
-+ /usr/lib/jvm/java/lib
-+ /usr/lib/java/jre/lib/{libarch}
-+ /usr/lib/jvm/jre/lib/{libarch}
-+ /usr/local/lib/java/jre/lib/{libarch}
-+ /usr/local/share/java/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-+ # Debian specific paths for default JVM
-+ /usr/lib/jvm/default-java/jre/lib/{libarch}
-+ /usr/lib/jvm/default-java/jre/lib
-+ /usr/lib/jvm/default-java/lib
-+ # Arch Linux specific paths for default JVM
-+ /usr/lib/jvm/default/jre/lib/{libarch}
-+ /usr/lib/jvm/default/lib/{libarch}
-+ # Ubuntu specific paths for default JVM
-+ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ # OpenBSD specific paths for default JVM
-+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+ # SuSE specific paths for default JVM
-+ /usr/lib64/jvm/java/jre/lib/{libarch}
-+ /usr/lib64/jvm/jre/lib/{libarch}
-+ )
+ endif()
++list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
++ )
++JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
++ /usr/lib
++ /usr/local/lib
++ /usr/lib/jvm/java/lib
++ /usr/lib/java/jre/lib/{libarch}
++ /usr/lib/jvm/jre/lib/{libarch}
++ /usr/local/lib/java/jre/lib/{libarch}
++ /usr/local/share/java/jre/lib/{libarch}
++ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
++ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
++ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed ac
++ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
++ # Debian specific paths for default JVM
++ /usr/lib/jvm/default-java/jre/lib/{libarch}
++ /usr/lib/jvm/default-java/jre/lib
++ /usr/lib/jvm/default-java/lib
++ # Arch Linux specific paths for default JVM
++ /usr/lib/jvm/default/jre/lib/{libarch}
++ /usr/lib/jvm/default/lib/{libarch}
++ # Ubuntu specific paths for default JVM
++ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ # OpenBSD specific paths for default JVM
++ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
++ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++ ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++ ${LOCALBASE}/jre-11/lib/{libarch}
++ # SuSE specific paths for default JVM
++ /usr/lib64/jvm/java/jre/lib/{libarch}
++ /usr/lib64/jvm/jre/lib/{libarch}
++ )
+endif(MODJAVA_VER)
- set(JAVA_JVM_LIBRARY_DIRECTORIES)
- foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
- )
- endforeach()
-
--set(JAVA_AWT_INCLUDE_DIRECTORIES)
--if(_JAVA_HOME)
-- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
--endif()
--list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
--)
--
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-- /usr/include
-- /usr/local/include
-- /usr/lib/java/include
-- /usr/local/lib/java/include
-- /usr/lib/jvm/java/include
-- /usr/lib/jvm/java-6-sun/include
-- /usr/lib/jvm/java-1.5.0-sun/include
-- /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
-- /usr/lib/jvm/java-6-openjdk/include
-- /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10
-- /usr/local/share/java/include
-- /usr/lib/j2sdk1.4-sun/include
-- /usr/lib/j2sdk1.5-sun/include
-- /opt/sun-jdk-1.5.0.04/include
-- # Debian specific path for default JVM
-- /usr/lib/jvm/default-java/include
-- # Arch specific path for default JVM
-- /usr/lib/jvm/default/include
-- # OpenBSD specific path for default JVM
-- /usr/local/jdk-1.7.0/include
-- /usr/local/jdk-1.6.0/include
-- # SuSE specific paths for default JVM
-- /usr/lib64/jvm/java/include
-+if(MODJAVA_VER)
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.8.0/include
-+ )
-+else(MODJAVA_VER)
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+ if(_JAVA_HOME)
-+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-+ endif()
-+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
- )
++get_filename_component(java_install_version
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+ /usr/include
-+ /usr/local/include
-+ /usr/lib/java/include
-+ /usr/local/lib/java/include
-+ /usr/lib/jvm/java/include
-+ /usr/lib/jvm/java-6-sun/include
-+ /usr/lib/jvm/java-1.5.0-sun/include
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
-+ /usr/lib/jvm/java-6-openjdk/include
-+ /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/lib/jvm/java-6-openjdk-{libarch}/include # ubuntu 15.10
-+ /usr/local/share/java/include
-+ /usr/lib/j2sdk1.4-sun/include
-+ /usr/lib/j2sdk1.5-sun/include
-+ /opt/sun-jdk-1.5.0.04/include
-+ # Debian specific path for default JVM
-+ /usr/lib/jvm/default-java/include
-+ # Arch specific path for default JVM
-+ /usr/lib/jvm/default/include
-+ # OpenBSD specific path for default JVM
-+ ${LOCALBASE}/jdk-1.8.0/include
-+ # SuSE specific paths for default JVM
-+ /usr/lib64/jvm/java/include
-+ )
-+endif(MODJAVA_VER)
-
- foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
- get_filename_component(jpath "${JAVA_PROG}" PATH)
+ if (WIN32)
+ set (_JNI_HINTS)
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+@@ -209,10 +267,10 @@ set(_JNI_JAVA_DIRECTORIES_BASE
+ /usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10
+ # OpenBSD specific paths for default JVM
+- /usr/local/jdk-1.7.0
+- /usr/local/jre-1.7.0
+- /usr/local/jdk-1.6.0
+- /usr/local/jre-1.6.0
++ ${LOCALBASE}/jdk-1.8.0
++ ${LOCALBASE}/jre-1.8.0
++ ${LOCALBASE}/jdk-11
++ ${LOCALBASE}/jre-11
+ # SuSE specific paths for default JVM
+ /usr/lib64/jvm/java
+ /usr/lib64/jvm/jre
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake 14 Jun 2018 17:04:45 -0000 1.24
+++ patches/patch-Modules_FindJava_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
Index: Modules/FindJava.cmake
--- Modules/FindJava.cmake.orig
+++ Modules/FindJava.cmake
-@@ -72,6 +72,8 @@
+@@ -78,6 +78,8 @@ Example Usages:
include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
@@ -11,8 +11,8 @@ Index: Modules/FindJava.cmake
# The HINTS option should only be used for values computed from the system.
set(_JAVA_HINTS)
if(_JAVA_HOME)
-@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
- )
+@@ -133,19 +135,22 @@ endif()
+
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
-set(_JAVA_PATHS
Index: patches/patch-Modules_FindLua_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLua_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindLua_cmake
--- patches/patch-Modules_FindLua_cmake 26 Aug 2017 17:53:35 -0000 1.6
+++ patches/patch-Modules_FindLua_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindLua_cmake,v
Index: Modules/FindLua.cmake
--- Modules/FindLua.cmake.orig
+++ Modules/FindLua.cmake
-@@ -40,9 +40,16 @@ unset(_lua_include_subdirs)
+@@ -44,9 +44,16 @@ unset(_lua_include_subdirs)
unset(_lua_library_names)
unset(_lua_append_versions)
@@ -10,24 +10,23 @@ Index: Modules/FindLua.cmake
+set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
+
# this is a function only to have all the variables inside go away automatically
- function(_lua_set_version_vars)
+ function(_lua_get_versions)
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ if(MODLUA_VERSION)
-+ set(LUA_VERSIONS5 ${MODLUA_VERSION})
++ set(LUA_VERSIONS5 ${MODLUA_VERSION})
+ else()
-+ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
++ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ endif()
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
-@@ -114,6 +121,10 @@ function(_lua_check_header_version _hdr_file)
- endfunction(_lua_check_header_version)
+@@ -143,6 +150,9 @@ endfunction(_lua_get_header_version)
- _lua_set_version_vars()
-+
-+if(MODLUA_INCL_DIR)
-+ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+endif()
+ function(_lua_find_header)
+ _lua_set_version_vars()
++ if(MODLUA_INCL_DIR)
++ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
++ endif()
- if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
- _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
+ # Initialize as local variable
+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
Index: patches/patch-Modules_FindMPEG2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_FindMPEG2_cmake
--- patches/patch-Modules_FindMPEG2_cmake 14 Jun 2018 17:04:45 -0000 1.10
+++ patches/patch-Modules_FindMPEG2_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,36 +2,7 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake,
Index: Modules/FindMPEG2.cmake
--- Modules/FindMPEG2.cmake.orig
+++ Modules/FindMPEG2.cmake
-@@ -23,24 +23,19 @@
- # MPEG2_vo_LIBRARY, where to find the vo library.
-
- find_path(MPEG2_INCLUDE_DIR
-- NAMES mpeg2.h mpeg2dec/mpeg2.h
-- PATHS /usr/local/livid
-+ NAMES mpeg2dec/mpeg2.h
-+ PATHS ${LOCALBASE}/include
- )
-
- find_library(MPEG2_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG2_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
--
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
-
- if(MPEG2_FOUND)
-- set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
-- ${MPEG2_vo_LIBRARY})
-+ set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
-
- #some native mpeg2 installations will depend
- #on libSDL, if found, add it in.
-@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
+@@ -47,4 +47,4 @@ if(MPEG2_FOUND)
endif()
endif()
Index: patches/patch-Modules_FindMPEG_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindMPEG_cmake
--- patches/patch-Modules_FindMPEG_cmake 14 Jun 2018 17:04:45 -0000 1.11
+++ patches/patch-Modules_FindMPEG_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,32 +2,17 @@ $OpenBSD: patch-Modules_FindMPEG_cmake,v
Index: Modules/FindMPEG.cmake
--- Modules/FindMPEG.cmake.orig
+++ Modules/FindMPEG.cmake
-@@ -22,23 +22,19 @@
- # MPEG_mpeg2_LIBRARY, where to find the MPEG library.
- # MPEG_vo_LIBRARY, where to find the vo library.
+@@ -28,8 +28,6 @@ find_path(MPEG_INCLUDE_DIR
--find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
-- /usr/local/livid
-+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
-+ ${LOCALBASE}/include
- )
+ find_library(MPEG_mpeg2_LIBRARY mpeg2)
- find_library(MPEG_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
+-find_library(MPEG_vo_LIBRARY vo)
-
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
- if(MPEG_FOUND)
-- set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
-+ set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
+@@ -40,4 +38,4 @@ if(MPEG_FOUND)
+ endif()
endif()
-mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
Index: patches/patch-Modules_FindPythonInterp_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindPythonInterp_cmake
--- patches/patch-Modules_FindPythonInterp_cmake 28 Nov 2016 09:15:13 -0000 1.11
+++ patches/patch-Modules_FindPythonInterp_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,16 +1,17 @@
$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindPythonInterp.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindPythonInterp.cmake Fri Nov 25 22:31:44 2016
-@@ -36,6 +36,8 @@
- # get the currently active Python version by default with a consistent version
- # of PYTHON_LIBRARIES.
+Index: Modules/FindPythonInterp.cmake
+--- Modules/FindPythonInterp.cmake.orig
++++ Modules/FindPythonInterp.cmake
+@@ -41,6 +41,8 @@ get the currently active Python version by default wit
+ of PYTHON_LIBRARIES.
+ #]=======================================================================]
+set(MODPY_VERSION $ENV{MODPY_VERSION})
+
unset(_Python_NAMES)
set(_PYTHON1_VERSIONS 1.6 1.5)
-@@ -68,19 +70,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+@@ -73,19 +75,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
# Set up the versions we know about, in the order we will search. Always add
# the user supplied additional versions to the front.
Index: patches/patch-Modules_FindPythonLibs_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake 14 Jun 2018 17:04:45 -0000 1.17
+++ patches/patch-Modules_FindPythonLibs_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c
Index: Modules/FindPythonLibs.cmake
--- Modules/FindPythonLibs.cmake.orig
+++ Modules/FindPythonLibs.cmake
-@@ -72,6 +72,9 @@ endif()
+@@ -77,6 +77,9 @@ endif()
# To avoid picking up the system Python.h pre-maturely.
set(CMAKE_FIND_FRAMEWORK LAST)
@@ -11,8 +11,8 @@ Index: Modules/FindPythonLibs.cmake
+
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- set(_PYTHON3_VERSIONS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-@@ -106,11 +109,15 @@ endif()
+ set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+@@ -111,11 +114,15 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
# version list.
@@ -33,10 +33,11 @@ Index: Modules/FindPythonLibs.cmake
unset(_PYTHON_FIND_OTHER_VERSIONS)
unset(_PYTHON1_VERSIONS)
-@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+@@ -234,25 +241,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+ ${dir}/Versions/${_CURRENT_VERSION}/include)
endforeach()
endif()
-
+-
- find_path(PYTHON_INCLUDE_DIR
- NAMES Python.h
- HINTS
@@ -44,7 +45,11 @@ Index: Modules/FindPythonLibs.cmake
- PATHS
- ${PYTHON_FRAMEWORK_INCLUDES}
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
+- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
+- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
- PATH_SUFFIXES
- python${_CURRENT_VERSION}mu
- python${_CURRENT_VERSION}m
Index: patches/patch-Modules_FindQt3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt3_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 14 Jun 2018 17:04:45 -0000 1.11
+++ patches/patch-Modules_FindQt3_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindQt3_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindQt3.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindQt3.cmake Fri Nov 25 22:31:45 2016
-@@ -151,7 +151,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
+Index: Modules/FindQt3.cmake
+--- Modules/FindQt3.cmake.orig
++++ Modules/FindQt3.cmake
+@@ -140,7 +140,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE
@@ -10,7 +11,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v
HINTS
ENV QTDIR
PATHS
-@@ -176,7 +176,7 @@ endif()
+@@ -160,7 +160,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE
Index: patches/patch-Modules_FindQt4_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 14 Jun 2018 17:04:45 -0000 1.30
+++ patches/patch-Modules_FindQt4_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v
Index: Modules/FindQt4.cmake
--- Modules/FindQt4.cmake.orig
+++ Modules/FindQt4.cmake
-@@ -516,7 +516,12 @@ endfunction()
+@@ -518,7 +518,12 @@ endfunction()
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
@@ -16,7 +16,7 @@ Index: Modules/FindQt4.cmake
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
if (QT_QMAKE_EXECUTABLE AND
-@@ -696,6 +701,8 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -694,6 +699,8 @@ if (QT_QMAKE_EXECUTABLE AND
# Set QT_INCLUDES
set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
@@ -25,7 +25,7 @@ Index: Modules/FindQt4.cmake
# ask qmake for the documentation directory
-@@ -1139,17 +1146,17 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
endif()
endmacro()
Index: patches/patch-Modules_FindQt_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_FindQt_cmake
--- patches/patch-Modules_FindQt_cmake 28 Nov 2016 09:15:13 -0000 1.7
+++ patches/patch-Modules_FindQt_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-Modules_FindQt_cmake,v 1.7 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindQt.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindQt.cmake Fri Nov 25 22:31:45 2016
-@@ -34,6 +34,12 @@
- # QT3_INSTALLED is set to TRUE if qt3 is found.
+Index: Modules/FindQt.cmake
+--- Modules/FindQt.cmake.orig
++++ Modules/FindQt.cmake
+@@ -43,6 +43,12 @@ if(_findqt_testing)
+ endif()
# look for signs of qt3 installations
+file(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt3/bin/qmake)
@@ -14,7 +15,7 @@ $OpenBSD: patch-Modules_FindQt_cmake,v 1
file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake)
if(GLOB_TEMP_VAR)
set(QT3_INSTALLED TRUE)
-@@ -53,6 +59,12 @@ endif()
+@@ -62,6 +68,12 @@ endif()
set(GLOB_TEMP_VAR)
# look for qt4 installations
Index: patches/patch-Modules_FindRuby_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindRuby_cmake,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-Modules_FindRuby_cmake
--- patches/patch-Modules_FindRuby_cmake 14 Jun 2018 17:04:45 -0000 1.16
+++ patches/patch-Modules_FindRuby_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindRuby.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindRuby.cmake Fri Nov 25 22:31:45 2016
-@@ -42,35 +42,53 @@
+Index: Modules/FindRuby.cmake
+--- Modules/FindRuby.cmake.orig
++++ Modules/FindRuby.cmake
+@@ -42,10 +42,18 @@ Also:
+
# uncomment the following line to get debug output for this file
# set(_RUBY_DEBUG_OUTPUT TRUE)
-
+set(MODRUBY_REV $ENV{MODRUBY_REV})
-+
+
+if(MODRUBY_REV AND MODRUBY_REV MATCHES "^[0-9]+\\.[0-9]$")
+ string(REPLACE "." "" MODRUBY_REV_NO_DOTS ${MODRUBY_REV})
+ string(REPLACE "." ";" MODRUBY_REV_LIST ${MODRUBY_REV})
@@ -21,41 +22,26 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
- set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
- # we can't construct that if only major version is given
- set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
-- ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
- ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+ ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
- ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
- else()
-- set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+ if(MODRUBY_REV_NO_DOTS)
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "${MODRUBY_REV_NO_DOTS}")
-+ else(MODRUBY_REV_NO_DOTS)
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+ endif(MODRUBY_REV_NO_DOTS)
+@@ -60,12 +68,11 @@ else()
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+ if(MODRUBY_REV AND MODRUBY_REV_NO_DOTS)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby${MODRUBY_REV_NO_DOTS} ruby${MODRUBY_REV})
-+ endif()
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby22 ruby2.2)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby19 ruby1.9)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby27 ruby2.7)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby26 ruby2.6)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.5)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
# if we want a version below 1.9, also look for ruby 1.8
if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby18 ruby1.8)
- endif()
--
-- list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
+@@ -75,6 +82,9 @@ if(NOT Ruby_FIND_VERSION_EXACT)
+ list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
endif()
+list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
@@ -64,35 +50,35 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-@@ -155,6 +173,10 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
- set(RUBY_VERSION_MAJOR 1)
- set(RUBY_VERSION_MINOR 8)
- set(RUBY_VERSION_PATCH 0)
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby${MODRUBY_REV_NO_DOTS}")
-+ set(RUBY_VERSION_MAJOR ${MODRUBY_REV_MAJOR})
-+ set(RUBY_VERSION_MINOR ${MODRUBY_REV_MINOR})
-+ endif()
- # check whether we found 1.9.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
- set(RUBY_VERSION_MAJOR 1)
-@@ -170,6 +192,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
+@@ -189,6 +199,21 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 2)
- set(RUBY_VERSION_MINOR 1)
+ set(RUBY_VERSION_MINOR 4)
endif()
-+ # check whether we found 2.2.x
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?2")
++ # check whether we found 2.5.x
++ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
+ set(RUBY_VERSION_MAJOR 2)
-+ set(RUBY_VERSION_MINOR 2)
++ set(RUBY_VERSION_MINOR 5)
++ endif()
++ # check whether we found 2.6.x
++ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?6")
++ set(RUBY_VERSION_MAJOR 2)
++ set(RUBY_VERSION_MINOR 6)
++ endif()
++ # check whether we found 2.7.x
++ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?7")
++ set(RUBY_VERSION_MAJOR 2)
++ set(RUBY_VERSION_MINOR 7)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
-@@ -203,7 +230,7 @@ endif()
+@@ -222,7 +247,8 @@ endif()
# Determine the list of possible names for the ruby library
-set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
+set(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT_NODOT} ruby${_RUBY_VERSION_SHORT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION} ruby ruby-static)
++
if(WIN32)
set( _RUBY_MSVC_RUNTIME "" )
Index: patches/patch-Modules_FindSDL_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindSDL_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_FindSDL_cmake
--- patches/patch-Modules_FindSDL_cmake 28 Nov 2016 09:15:13 -0000 1.10
+++ patches/patch-Modules_FindSDL_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.10 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindSDL.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindSDL.cmake Fri Nov 25 22:31:45 2016
-@@ -85,6 +85,11 @@ else()
+Index: Modules/FindSDL.cmake
+--- Modules/FindSDL.cmake.orig
++++ Modules/FindSDL.cmake
+@@ -86,6 +86,11 @@ else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()
Index: patches/patch-Modules_FindTCL_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTCL_cmake,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-Modules_FindTCL_cmake
--- patches/patch-Modules_FindTCL_cmake 14 Jun 2018 17:04:45 -0000 1.15
+++ patches/patch-Modules_FindTCL_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindTCL.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindTCL.cmake Fri Nov 25 22:31:45 2016
-@@ -48,19 +48,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
+Index: Modules/FindTCL.cmake
+--- Modules/FindTCL.cmake.orig
++++ Modules/FindTCL.cmake
+@@ -49,19 +49,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)
@@ -42,7 +43,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -75,19 +92,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -76,15 +93,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
string(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
@@ -53,11 +54,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
-- /usr/local/lib/tcl/tcl8.5
-- /usr/local/lib/tcl/tk8.5
-- /usr/local/lib/tcl/tcl8.4
-- /usr/local/lib/tcl/tk8.4
-- )
+-)
+set(TCLTK_OPENBSD_LIB_PATHS)
+if(MODTCL_LIBDIR)
@@ -89,82 +86,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
+ )
+endif()
+
- if(WIN32)
- get_filename_component(
- ActiveTcl_CurrentVersion
-@@ -107,31 +142,47 @@ if(WIN32)
- )
- endif()
-
--find_library(TCL_LIBRARY
-- NAMES
-- tcl
-- tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
-- tcl86 tcl8.6
-- tcl85 tcl8.5
-- tcl84 tcl8.4
-- tcl83 tcl8.3
-- tcl82 tcl8.2
-- tcl80 tcl8.0
-- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-- )
-+if(MODTCL_LIB)
-+ find_library(TCL_LIBRARY
-+ NAMES
-+ ${MODTCL_LIB}
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+else(MODTCL_LIB)
-+ find_library(TCL_LIBRARY
-+ NAMES
-+ tcl
-+ tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
-+ tcl86 tcl8.6
-+ tcl85 tcl8.5
-+ tcl84 tcl8.4
-+ tcl83 tcl8.3
-+ tcl82 tcl8.2
-+ tcl80 tcl8.0
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+endif(MODTCL_LIB)
-
--find_library(TK_LIBRARY
-- NAMES
-- tk
-- tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
-- tk86 tk8.6
-- tk85 tk8.5
-- tk84 tk8.4
-- tk83 tk8.3
-- tk82 tk8.2
-- tk80 tk8.0
-- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-- )
-+if(MODTK_LIB)
-+ find_library(TK_LIBRARY
-+ NAMES
-+ ${MODTK_LIB}
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+else(MODTK_LIB)
-+ find_library(TK_LIBRARY
-+ NAMES
-+ tk
-+ tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
-+ tk86 tk8.6
-+ tk85 tk8.5
-+ tk84 tk8.4
-+ tk83 tk8.3
-+ tk82 tk8.2
-+ tk80 tk8.0
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+endif(MODTK_LIB)
-
- CMAKE_FIND_FRAMEWORKS(Tcl)
- CMAKE_FIND_FRAMEWORKS(Tk)
-@@ -155,30 +206,46 @@ if(Tk_FRAMEWORKS)
+ set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
+ lib/tcl/tcl8.7
+ lib/tcl/tk8.7
+@@ -167,16 +206,6 @@ if(Tk_FRAMEWORKS)
endif()
endif()
@@ -177,21 +102,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
- ${TK_FRAMEWORK_INCLUDES}
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
-- /usr/include/tcl${TK_LIBRARY_VERSION}
-- /usr/include/tcl${TCL_LIBRARY_VERSION}
-- /usr/include/tcl8.6
-- /usr/include/tcl8.5
-- /usr/include/tcl8.4
-- /usr/include/tcl8.3
-- /usr/include/tcl8.2
-- /usr/include/tcl8.0
-- /usr/local/include/tcl8.6
-- /usr/local/include/tk8.6
-- /usr/local/include/tcl8.5
-- /usr/local/include/tk8.5
-- /usr/local/include/tcl8.4
-- /usr/local/include/tk8.4
- )
+
+ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+ include/tcl${TK_LIBRARY_VERSION}
+@@ -193,6 +222,46 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+ include/tcl8.2
+ include/tcl8.0
+ )
+set(TCLTK_OPENBSD_INCLUDE_PATHS)
+
+if(MODTCL_INCDIR)
Index: patches/patch-Modules_FindTclStub_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTclStub_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindTclStub_cmake
--- patches/patch-Modules_FindTclStub_cmake 28 Nov 2016 09:15:13 -0000 1.6
+++ patches/patch-Modules_FindTclStub_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.6 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindTclStub.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindTclStub.cmake Fri Nov 25 22:31:45 2016
-@@ -48,13 +48,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
+Index: Modules/FindTclStub.cmake
+--- Modules/FindTclStub.cmake.orig
++++ Modules/FindTclStub.cmake
+@@ -49,13 +49,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
@@ -27,7 +28,7 @@ $OpenBSD: patch-Modules_FindTclStub_cmak
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -69,14 +77,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -70,14 +78,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
string(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
Index: patches/patch-Modules_FindTclsh_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTclsh_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindTclsh_cmake
--- patches/patch-Modules_FindTclsh_cmake 28 Nov 2016 09:15:13 -0000 1.5
+++ patches/patch-Modules_FindTclsh_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-Modules_FindTclsh_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindTclsh.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindTclsh.cmake Fri Nov 25 22:31:45 2016
-@@ -19,14 +19,21 @@
- # In cygwin, look for the cygwin version first. Don't look for it later
- # to avoid finding the cygwin version on a Win32 build.
+Index: Modules/FindTclsh.cmake
+--- Modules/FindTclsh.cmake.orig
++++ Modules/FindTclsh.cmake
+@@ -20,14 +20,21 @@ In cygwin, look for the cygwin version first. Don't l
+ to avoid finding the cygwin version on a Win32 build.
+ #]=======================================================================]
+set(MODTCL_VERSION $ENV{MODTCL_VERSION})
+set(MODTK_VERSION $ENV{MODTK_VERSION})
@@ -25,36 +26,3 @@ $OpenBSD: patch-Modules_FindTclsh_cmake,
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -65,16 +72,22 @@ if(WIN32)
- )
- endif()
-
--set(TCL_TCLSH_NAMES
-- tclsh
-- tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
-- tclsh86 tclsh8.6
-- tclsh85 tclsh8.5
-- tclsh84 tclsh8.4
-- tclsh83 tclsh8.3
-- tclsh82 tclsh8.2
-- tclsh80 tclsh8.0
-- )
-+if(MODTCL_VERSION)
-+ set(TCL_TCLSH_NAMES
-+ tclsh${MODTCL_VERSION}
-+ )
-+else(MODTCL_VERSION)
-+ set(TCL_TCLSH_NAMES
-+ tclsh
-+ tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
-+ tclsh86 tclsh8.6
-+ tclsh85 tclsh8.5
-+ tclsh84 tclsh8.4
-+ tclsh83 tclsh8.3
-+ tclsh82 tclsh8.2
-+ tclsh80 tclsh8.0
-+ )
-+endif(MODTCL_VERSION)
-
- find_program(TCL_TCLSH
- NAMES ${TCL_TCLSH_NAMES}
Index: patches/patch-Modules_FindWish_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindWish_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindWish_cmake
--- patches/patch-Modules_FindWish_cmake 28 Nov 2016 09:15:13 -0000 1.5
+++ patches/patch-Modules_FindWish_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,9 +1,10 @@
$OpenBSD: patch-Modules_FindWish_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindWish.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindWish.cmake Fri Nov 25 22:31:45 2016
-@@ -19,14 +19,21 @@
- #
- # if UNIX is defined, then it will look for the cygwin version first
+Index: Modules/FindWish.cmake
+--- Modules/FindWish.cmake.orig
++++ Modules/FindWish.cmake
+@@ -20,14 +20,21 @@ library is. This code sets the following variables:
+ if UNIX is defined, then it will look for the cygwin version first
+ #]=======================================================================]
+set(MODTCL_VERSION $ENV{MODTCL_VERSION})
+set(MODTK_VERSION $ENV{MODTK_VERSION})
@@ -25,7 +26,7 @@ $OpenBSD: patch-Modules_FindWish_cmake,v
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -65,16 +72,22 @@ if(WIN32)
+@@ -66,16 +73,22 @@ if(WIN32)
)
endif()
Index: patches/patch-Modules_FindXMLRPC_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Modules_FindXMLRPC_cmake
--- patches/patch-Modules_FindXMLRPC_cmake 14 Mar 2018 12:24:54 -0000 1.8
+++ patches/patch-Modules_FindXMLRPC_cmake 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_FindXMLRPC_cmake
Index: Modules/FindXMLRPC.cmake
--- Modules/FindXMLRPC.cmake.orig
+++ Modules/FindXMLRPC.cmake
-@@ -97,6 +97,8 @@ if(XMLRPC_C_FOUND)
+@@ -98,6 +98,8 @@ if(XMLRPC_C_FOUND)
endif()
endforeach()
Index: patches/patch-Modules_Qt4ConfigDependentSettings_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_Qt4ConfigDependentSettings_cmake
--- patches/patch-Modules_Qt4ConfigDependentSettings_cmake 28 Nov 2016 09:15:13 -0000 1.11
+++ patches/patch-Modules_Qt4ConfigDependentSettings_cmake 2 Jun 2019 10:09:17 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/Qt4ConfigDependentSettings.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/Qt4ConfigDependentSettings.cmake Fri Nov 25 22:31:45 2016
-@@ -21,6 +21,10 @@
+Index: Modules/Qt4ConfigDependentSettings.cmake
+--- Modules/Qt4ConfigDependentSettings.cmake.orig
++++ Modules/Qt4ConfigDependentSettings.cmake
+@@ -22,6 +22,10 @@ This file is included by FindQt4.cmake, don't include
# if a user needs the dependencies, and they couldn't be found, they can set
# the variables themselves.
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDepende
set(QT_QTGUI_LIB_DEPENDENCIES "")
set(QT_QTCORE_LIB_DEPENDENCIES "")
set(QT_QTNETWORK_LIB_DEPENDENCIES "")
-@@ -55,10 +59,6 @@ if(Q_WS_WIN AND NOT QT_IS_STATIC)
+@@ -56,10 +60,6 @@ if(Q_WS_WIN AND NOT QT_IS_STATIC)
set(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
endif()
@@ -23,7 +24,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDepende
# QtOpenGL dependencies
find_package(OpenGL)
set (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
-@@ -88,6 +88,15 @@ if(QT_QCONFIG MATCHES "system-mng")
+@@ -89,6 +89,15 @@ if(QT_QCONFIG MATCHES "system-mng")
set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${MNG_LIBRARY})
endif()
@@ -39,7 +40,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDepende
# for X11, get X11 library directory
if(Q_WS_X11)
find_package(X11)
-@@ -175,6 +184,23 @@ if(QT_QCONFIG MATCHES "system-zlib")
+@@ -176,6 +185,23 @@ if(QT_QCONFIG MATCHES "system-zlib")
set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${ZLIB_LIBRARIES})
endif()
Index: patches/patch-Source_CMakeLists_txt
===================================================================
RCS file: patches/patch-Source_CMakeLists_txt
diff -N patches/patch-Source_CMakeLists_txt
--- patches/patch-Source_CMakeLists_txt 14 Jun 2018 17:04:45 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-Source_CMakeLists_txt,v 1.12 2018/06/14 17:04:45 sthen Exp $
-Index: Source/CMakeLists.txt
---- Source/CMakeLists.txt.orig
-+++ Source/CMakeLists.txt
-@@ -81,6 +81,9 @@ include_directories(
- "${CMake_SOURCE_DIR}/Source/LexerParser"
- ${CMAKE_ZLIB_INCLUDES}
- ${CMAKE_EXPAT_INCLUDES}
-+ ${CMAKE_LIBRHASH_INCLUDES}
-+ ${CMAKE_JSONCPP_INCLUDES}
-+ ${CMAKE_LIBUV_INCLUDES}
- ${CMAKE_TAR_INCLUDES}
- ${CMAKE_COMPRESS_INCLUDES}
- ${CMake_HAIKU_INCLUDE_DIRS}
-@@ -273,7 +276,6 @@ set(SRCS
- cmRulePlaceholderExpander.cxx
- cmRulePlaceholderExpander.h
- cmLocalUnixMakefileGenerator3.cxx
-- cmLocale.h
- ${MACH_SRCS}
- cmMakefile.cxx
- cmMakefile.h
Index: patches/patch-Source_Modules_FindLibUV_cmake
===================================================================
RCS file: patches/patch-Source_Modules_FindLibUV_cmake
diff -N patches/patch-Source_Modules_FindLibUV_cmake
--- patches/patch-Source_Modules_FindLibUV_cmake 4 Jan 2019 08:54:42 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Source_Modules_FindLibUV_cmake,v 1.1 2019/01/04 08:54:42 pascal Exp $
-
-Index: Source/Modules/FindLibUV.cmake
---- Source/Modules/FindLibUV.cmake.orig
-+++ Source/Modules/FindLibUV.cmake
-@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
- if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
- file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
-+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
- file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- else()
Index: patches/patch-Source_cmArchiveWrite_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmArchiveWrite_cxx,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Source_cmArchiveWrite_cxx
--- patches/patch-Source_cmArchiveWrite_cxx 8 Sep 2017 06:32:29 -0000 1.2
+++ patches/patch-Source_cmArchiveWrite_cxx 2 Jun 2019 10:09:17 -0000
@@ -37,7 +37,7 @@ Index: Source/cmArchiveWrite.cxx
#include "cmSystemTools.h"
#include "cm_get_date.h"
#include "cm_libarchive.h"
-@@ -211,9 +210,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t
+@@ -224,9 +223,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t
return true;
}
const char* out = file + skip;
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx 14 Jun 2018 17:04:45 -0000 1.22
+++ patches/patch-Source_cmComputeLinkInformation_cxx 2 Jun 2019 10:09:17 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
Index: Source/cmComputeLinkInformation.cxx
--- Source/cmComputeLinkInformation.cxx.orig
+++ Source/cmComputeLinkInformation.cxx
-@@ -366,8 +366,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
- this->Target->GetLinkDirectories());
+@@ -364,8 +364,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+ this->OrderRuntimeSearchPath->AddUserDirectories(directories);
// Set up the implicit link directories.
- this->LoadImplicitLinkInfo();
@@ -13,7 +13,7 @@ Index: Source/cmComputeLinkInformation.c
this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
if (this->OrderDependentRPath) {
this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
+@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
bool cmComputeLinkInformation::Compute()
{
@@ -40,7 +40,7 @@ Index: Source/cmComputeLinkInformation.c
// Restore the target link type so the correct system runtime
// libraries are found.
const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -637,10 +647,16 @@ void cmComputeLinkInformation::AddItem(std::string con
+@@ -640,10 +650,16 @@ void cmComputeLinkInformation::AddItem(std::string con
// This is a directory.
this->AddDirectoryItem(item);
} else {
@@ -60,7 +60,7 @@ Index: Source/cmComputeLinkInformation.c
}
} else {
// This is a library or option specified by the user.
-@@ -982,11 +998,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -983,11 +999,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
this->SharedLibrariesLinked.insert(target);
}
@@ -84,7 +84,7 @@ Index: Source/cmComputeLinkInformation.c
}
// If this platform wants a flag before the full path, add it.
-@@ -1539,6 +1562,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+@@ -1540,6 +1563,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
if (const char* implicitDirs =
this->Makefile->GetDefinition(implicitDirVar)) {
cmSystemTools::ExpandListArgument(implicitDirs, implicitDirVec);
Index: patches/patch-Source_cmComputeLinkInformation_h
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Source_cmComputeLinkInformation_h
--- patches/patch-Source_cmComputeLinkInformation_h 26 Aug 2017 17:53:35 -0000 1.3
+++ patches/patch-Source_cmComputeLinkInformation_h 2 Jun 2019 10:09:17 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
Index: Source/cmComputeLinkInformation.h
--- Source/cmComputeLinkInformation.h.orig
+++ Source/cmComputeLinkInformation.h
-@@ -162,6 +162,7 @@ class cmComputeLinkInformation (private)
+@@ -158,6 +158,7 @@ class cmComputeLinkInformation (private)
// Implicit link libraries and directories for linker language.
void LoadImplicitLinkInfo();
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 14 Jun 2018 17:04:45 -0000 1.10
+++ patches/patch-Source_cmGeneratorTarget_cxx 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -1195,11 +1195,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
+@@ -1303,11 +1303,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
bool cmGeneratorTarget::HasSOName(const std::string& config) const
{
@@ -18,7 +18,7 @@ Index: Source/cmGeneratorTarget.cxx
}
bool cmGeneratorTarget::NeedRelinkBeforeInstall(
-@@ -2974,9 +2978,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3545,9 +3549,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@@ -35,7 +35,7 @@ Index: Source/cmGeneratorTarget.cxx
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = nullptr;
-@@ -3002,6 +3012,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3573,6 +3583,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// The library name.
name = prefix + base + suffix;
@@ -59,7 +59,7 @@ Index: Source/cmGeneratorTarget.cxx
+ msg += env_name;
+ msg += " specification: ";
+ msg += env_vers;
-+ this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
++ this->LocalGenerator->IssueMessage(MessageType::INTERNAL_ERROR, msg);
+ } else {
+ version = env_vers_cstr;
+ }
@@ -69,8 +69,8 @@ Index: Source/cmGeneratorTarget.cxx
+
if (this->IsFrameworkOnApple()) {
realName = prefix;
- if (!this->Makefile->PlatformIsAppleIos()) {
-@@ -3013,7 +3051,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+ if (!this->Makefile->PlatformIsAppleEmbedded()) {
+@@ -3584,7 +3622,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
soName = realName;
} else {
// The library's soname.
@@ -82,7 +82,7 @@ Index: Source/cmGeneratorTarget.cxx
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
-@@ -4142,7 +4184,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
+@@ -4819,7 +4861,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name;
if (version) {
vName += ".";
Index: patches/patch-Source_cmGlobalGenerator_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx 14 Jun 2018 17:04:45 -0000 1.9
+++ patches/patch-Source_cmGlobalGenerator_cxx 2 Jun 2019 10:09:17 -0000
@@ -3,13 +3,13 @@ $OpenBSD: patch-Source_cmGlobalGenerator
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2227,6 +2227,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
- cmCustomCommandLine singleLine;
- singleLine.push_back(cmSystemTools::GetCTestCommand());
- singleLine.push_back("--force-new-ctest-process");
-+ // Skip tests requiring internet access
-+ singleLine.push_back("--exclude-regex");
-+ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
- if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
- singleLine.push_back("-C");
- singleLine.push_back(cmakeCfgIntDir);
+@@ -2373,6 +2373,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+ cmCustomCommandLine singleLine;
+ singleLine.push_back(cmSystemTools::GetCTestCommand());
+ singleLine.push_back("--force-new-ctest-process");
++ // Skip tests requiring internet access
++ singleLine.push_back("--exclude-regex");
++ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
+ if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
+ singleLine.push_back("-C");
+ singleLine.push_back(cmakeCfgIntDir);
Index: patches/patch-Source_cmInstallCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmInstallCommand_cxx,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-Source_cmInstallCommand_cxx
--- patches/patch-Source_cmInstallCommand_cxx 14 Jun 2018 17:04:45 -0000 1.14
+++ patches/patch-Source_cmInstallCommand_cxx 2 Jun 2019 10:09:17 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Source_cmInstallCommand_
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -373,6 +373,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
}
// Select the mode for installing symlinks to versioned shared libraries.
@@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -325,6 +328,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -380,6 +383,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
Index: patches/patch-Source_cmMessenger_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmMessenger_cxx,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Source_cmMessenger_cxx
--- patches/patch-Source_cmMessenger_cxx 28 Nov 2016 09:15:13 -0000 1.1
+++ patches/patch-Source_cmMessenger_cxx 2 Jun 2019 10:09:17 -0000
@@ -1,23 +1,24 @@
$OpenBSD: patch-Source_cmMessenger_cxx,v 1.1 2016/11/28 09:15:13 dcoppa Exp $
---- Source/cmMessenger.cxx.orig Fri Nov 25 23:06:59 2016
-+++ Source/cmMessenger.cxx Fri Nov 25 23:08:39 2016
-@@ -68,7 +68,7 @@ static bool printMessagePreamble(cmake::MessageType t,
- if (t == cmake::FATAL_ERROR) {
+Index: Source/cmMessenger.cxx
+--- Source/cmMessenger.cxx.orig
++++ Source/cmMessenger.cxx
+@@ -67,7 +67,7 @@ static bool printMessagePreamble(MessageType t, std::o
+ if (t == MessageType::FATAL_ERROR) {
msg << "CMake Error";
- } else if (t == cmake::INTERNAL_ERROR) {
+ } else if (t == MessageType::INTERNAL_ERROR) {
- msg << "CMake Internal Error (please report a bug)";
+ msg << "CMake Internal Error";
- } else if (t == cmake::LOG) {
+ } else if (t == MessageType::LOG) {
msg << "CMake Debug Log";
- } else if (t == cmake::DEPRECATION_ERROR) {
-@@ -107,19 +107,6 @@ void displayMessage(cmake::MessageType t, std::ostring
+ } else if (t == MessageType::DEPRECATION_ERROR) {
+@@ -106,19 +106,6 @@ void displayMessage(MessageType t, std::ostringstream&
// Add a terminating blank line.
msg << "\n";
-
-#if defined(CMAKE_BUILD_WITH_CMAKE)
- // Add a C++ stack trace to internal errors.
-- if (t == cmake::INTERNAL_ERROR) {
+- if (t == MessageType::INTERNAL_ERROR) {
- std::string stack = cmsys::SystemInformation::GetProgramStack(0, 0);
- if (!stack.empty()) {
- if (cmHasLiteralPrefix(stack, "WARNING:")) {
@@ -29,4 +30,4 @@ $OpenBSD: patch-Source_cmMessenger_cxx,v
-
No comments:
Post a Comment