Attachment 248165 Details for Bug 276792 – Patch for CMake* v3

[patch] Patch for CMake* v3

cmake-unify-v2.patch (text/plain), 4.50 KB, created by Daniel Engberg on 2024-02-03 21:50:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-02-03 21:50:30 UTC

Size: 4.50 KB

patch

obsolete

>diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile
>index 127a5da4982c..9edafbbaecd6 100644
>--- a/devel/cmake-core/Makefile
>+++ b/devel/cmake-core/Makefile
>@@ -17,9 +17,15 @@ LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		librhash.so:security/rhash
> 
> USES=		cmake:_internal compiler:c++11-lang cpe localbase ncurses ssl
>-
> CPE_VENDOR=	cmake_project
>+
>+# Quick fix to enable build with non-base SSL (PR: 274512)
>+CFLAGS+=	-I${OPENSSLINC}
>+LDFLAGS+=	-L${OPENSSLLIB}
>+CXXFLAGS+=	-D__BSD_VISIBLE
>+
> HAS_CONFIGURE=	yes
>+
> CONFIGURE_ENV=	MAKE=make
> CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--datadir="/${DATADIR_REL}" \
>@@ -39,10 +45,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
> 		--parallel=${MAKE_JOBS_NUMBER} \
> 		--init="${WRKSRC}/InitialCache.cmake"
> 
>-# Quick fix to enable build with non-base SSL (PR: 274512)
>-CFLAGS+=	-I${OPENSSLINC}
>-LDFLAGS+=	-L${OPENSSLLIB}
>-
> OPTIONS_DEFINE=		DOCS CPACK
> OPTIONS_DEFAULT=	CPACK
> OPTIONS_SUB=		yes
>@@ -50,8 +52,6 @@ OPTIONS_SUB=		yes
> CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
> CPACK_LIB_DEPENDS=	libpkg.so:${PKG_ORIGIN}
> 
>-CXXFLAGS+=	-D__BSD_VISIBLE
>-
> .include <bsd.port.pre.mk>
> 
> .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG)
>diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile
>index 4da5ba04af7d..b4adfbbc681b 100644
>--- a/devel/cmake-doc/Makefile
>+++ b/devel/cmake-doc/Makefile
>@@ -12,17 +12,13 @@ LICENSE_FILE=	${WRKSRC}/Copyright.txt
> 
> BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
> 
>-DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>-
>-NO_ARCH=	yes
> USES=		cmake qt:5
> USE_QT=		help:build
> USE_LOCALE=	en_US.UTF-8
> 
>-CMAKE_OFF=	SPHINX_MAN
>-CMAKE_ON=	SPHINX_HTML SPHINX_QTHELP
>-CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
>-		-DQHELPGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator
>+DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>+NO_ARCH=	yes
>+
> CMAKE_SOURCE_PATH=	${WRKSRC}/Utilities/Sphinx
> 
> ALL_TARGET=	documentation
>@@ -30,4 +26,9 @@ INSTALL_TARGET=	install
> 
> PLIST_SUB=	CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}"
> 
>+CMAKE_ON=	SPHINX_HTML SPHINX_QTHELP
>+CMAKE_OFF=	SPHINX_MAN
>+CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
>+		-DQHELPGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator
>+
> .include <bsd.port.mk>
>diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile
>index 891d82a48971..f292a91a66f1 100644
>--- a/devel/cmake-gui/Makefile
>+++ b/devel/cmake-gui/Makefile
>@@ -27,9 +27,14 @@ USES=		cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \
> _USE_QT_qt5=	core gui widgets buildtools:build qmake:build
> _USE_QT_qt6=	base
> USE_QT=		${_USE_QT_${FLAVOR}}
>-CMAKE_ARGS=	-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
>-		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
>-		-DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//}
>+
>+DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>+CXXFLAGS+=	-D__BSD_VISIBLE
>+
>+ALL_TARGET=	cmake-gui documentation
>+
>+INSTALL_WRKSRC=	${WRKSRC}/Source/QtDialog
>+
> CMAKE_ON=	BUILD_QtDialog \
> 		CMAKE_USE_SYSTEM_CURL \
> 		CMAKE_USE_SYSTEM_EXPAT \
>@@ -42,14 +47,9 @@ CMAKE_ON=	BUILD_QtDialog \
> CMAKE_OFF=	BUILD_CursesDialog \
> 		CMake_SPHINX_DEPEND_ON_EXECUTABLES \
> 		CMAKE_USE_SYSTEM_CPPDAP
>-
>-ALL_TARGET=	cmake-gui documentation
>-
>-CXXFLAGS+=	-D__BSD_VISIBLE
>-
>-INSTALL_WRKSRC=	${WRKSRC}/Source/QtDialog
>-
>-DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>+CMAKE_ARGS=	-DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \
>+		-DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \
>+		-DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//}
> 
> post-patch:
> 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
>diff --git a/devel/cmake-man/Makefile b/devel/cmake-man/Makefile
>index 1be3e0ec0420..06e3d6514167 100644
>--- a/devel/cmake-man/Makefile
>+++ b/devel/cmake-man/Makefile
>@@ -9,20 +9,14 @@ WWW=		https://www.cmake.org/
> 
> LICENSE=	BSD3CLAUSE
> 
>-DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>-
> BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
> 
> USES=		cmake
> USE_LOCALE=	en_US.UTF-8
> 
>-NO_ARCH=	yes
> DISTINFO_FILE=	${.CURDIR}/../cmake-core/distinfo
>+NO_ARCH=	yes
> 
>-CMAKE_OFF=	SPHINX_HTML SPHINX_QTHELP
>-CMAKE_ON=	SPHINX_MAN
>-CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
>-		-DCMAKE_MAN_DIR:STRING="share/man"
> CMAKE_SOURCE_PATH=	${WRKSRC}/Utilities/Sphinx
> 
> ALL_TARGET=	documentation
>@@ -30,6 +24,11 @@ INSTALL_TARGET=	install
> 
> PLIST_SUB=	CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}"
> 
>+CMAKE_ON=	SPHINX_MAN
>+CMAKE_OFF=	SPHINX_HTML SPHINX_QTHELP
>+CMAKE_ARGS=	-DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \
>+		-DCMAKE_MAN_DIR:STRING="share/man"
>+
> post-install:
> # Installed by devel/cmake-gui
> 	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/cmake-gui.1

Actions: View | Diff

Attachments on bug 276792: 248149 | 248164 | 248165