Came to devel/cmake/patches/ to investigate behaviour I saw and was
surprised (again) by the amount of local changes we carry.
We no longer package/support the old frameworks, so can these patches
go?
I did not run into a problem with those patches, just wondering if we
can lower the maintainence burden.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.212
diff -u -p -r1.212 Makefile
--- Makefile 7 Jul 2022 16:23:17 -0000 1.212
+++ Makefile 14 Jul 2022 18:58:30 -0000
@@ -6,7 +6,7 @@ VER = 3.23.2
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://www.cmake.org/
Index: patches/patch-Modules_FindQt3_cmake
===================================================================
RCS file: patches/patch-Modules_FindQt3_cmake
diff -N patches/patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 11 Mar 2022 18:49:50 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-Index: Modules/FindQt3.cmake
---- Modules/FindQt3.cmake.orig
-+++ Modules/FindQt3.cmake
-@@ -142,7 +142,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_MOC_EXECUTABLE
-- NAMES moc-qt3 moc3 moc3-mt moc
-+ NAMES moc3 moc-qt3 moc3-mt moc
- HINTS
- ENV QTDIR
- PATHS
-@@ -162,7 +162,7 @@ endif()
-
- # Qt 3 should prefer QTDIR over the PATH
- find_program(QT_UIC_EXECUTABLE
-- NAMES uic-qt3 uic3 uic3-mt uic
-+ NAMES uic3 uic-qt3 uic3-mt uic
- HINTS
- ENV QTDIR
- PATHS
Index: patches/patch-Modules_FindQt4_cmake
===================================================================
RCS file: patches/patch-Modules_FindQt4_cmake
diff -N patches/patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 11 Mar 2022 18:49:50 -0000 1.32
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-Index: Modules/FindQt4.cmake
---- Modules/FindQt4.cmake.orig
-+++ Modules/FindQt4.cmake
-@@ -518,7 +518,12 @@ endfunction()
-
- set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
-
--set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
-+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+ set(_QT4_QMAKE_NAMES qmake4)
-+else()
-+ set(_QT4_QMAKE_NAMES qmake4 qmake-qt4 qmake qmake-mac)
-+endif()
-+
- _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
-
- 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})
-+ # Help QtOpenGL find GL/gl.h
-+ list(APPEND QT_INCLUDES "${X11BASE}/include")
-
-
- # ask qmake for the documentation directory
-@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
- endif()
- endmacro()
-
-- _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
-- _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
-+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc4 moc-qt4 moc)
-+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic4 uic-qt4 uic)
- _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
-- _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4
lupdate)
-- _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4
lrelease4 lrelease)
-+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate4 lupdate-qt4
lupdate)
-+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease4
lrelease-qt4 lrelease)
- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
-- _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4
designer4 designer)
-- _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4
linguist4 linguist)
-+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer4
designer-qt4 designer)
-+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist4
linguist-qt4 linguist)
-
- if (NOT TARGET Qt4::qmake)
- add_executable(Qt4::qmake IMPORTED)
Index: patches/patch-Modules_FindQt_cmake
===================================================================
RCS file: patches/patch-Modules_FindQt_cmake
diff -N patches/patch-Modules_FindQt_cmake
--- patches/patch-Modules_FindQt_cmake 11 Mar 2022 18:49:50 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-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)
-+if(GLOB_TEMP_VAR)
-+ set(QT3_INSTALLED TRUE)
-+endif()
-+set(GLOB_TEMP_VAR)
-+
- file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake)
- if(GLOB_TEMP_VAR)
- set(QT3_INSTALLED TRUE)
-@@ -62,6 +68,12 @@ endif()
- set(GLOB_TEMP_VAR)
-
- # look for qt4 installations
-+file(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt4/bin/qmake)
-+if(GLOB_TEMP_VAR)
-+ set(QT4_INSTALLED TRUE)
-+endif()
-+set(GLOB_TEMP_VAR)
-+
- file(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/qmake)
- if(GLOB_TEMP_VAR)
- set(QT4_INSTALLED TRUE)
Index: patches/patch-Modules_Qt4ConfigDependentSettings_cmake
===================================================================
RCS file: patches/patch-Modules_Qt4ConfigDependentSettings_cmake
diff -N patches/patch-Modules_Qt4ConfigDependentSettings_cmake
--- patches/patch-Modules_Qt4ConfigDependentSettings_cmake 11 Mar 2022
18:49:50 -0000 1.15
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-x11/kde4 and maybe some other spooky Qt4 ports need the magic behind
-Qt4ConfigDependentSettings also for none static libraries.
-
-Index: Modules/Qt4ConfigDependentSettings.cmake
---- Modules/Qt4ConfigDependentSettings.cmake.orig
-+++ Modules/Qt4ConfigDependentSettings.cmake
-@@ -56,10 +56,6 @@ if(Q_WS_WIN AND NOT QT_IS_STATIC)
- set(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
- endif()
-
--if(NOT QT_IS_STATIC)
-- return()
--endif()
--
- # QtOpenGL dependencies
- find_package(OpenGL)
- set (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
