pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/cmake cmake: don't install the emacs mode



details:   https://anonhg.NetBSD.org/pkgsrc/rev/346f49b116dc
branches:  trunk
changeset: 383298:346f49b116dc
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Aug 17 13:38:30 2022 +0000

description:
cmake: don't install the emacs mode

devel/cmake-mode provides the emacs mode, with the emacs pkgsrc integration

diffstat:

 devel/cmake/Makefile                               |   3 ++-
 devel/cmake/Makefile.common                        |   3 ++-
 devel/cmake/PLIST                                  |   3 +--
 devel/cmake/distinfo                               |   3 ++-
 devel/cmake/patches/patch-Auxiliary_CMakeLists.txt |  15 +++++++++++++++
 5 files changed, 22 insertions(+), 5 deletions(-)

diffs (72 lines):

diff -r b3d0c39d6d35 -r 346f49b116dc devel/cmake/Makefile
--- a/devel/cmake/Makefile      Wed Aug 17 13:28:10 2022 +0000
+++ b/devel/cmake/Makefile      Wed Aug 17 13:38:30 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.196 2022/08/04 09:22:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.197 2022/08/17 13:38:30 tnn Exp $
 
 .include "Makefile.common"
+PKGREVISION=   1
 
 COMMENT=       Cross platform make
 
diff -r b3d0c39d6d35 -r 346f49b116dc devel/cmake/Makefile.common
--- a/devel/cmake/Makefile.common       Wed Aug 17 13:28:10 2022 +0000
+++ b/devel/cmake/Makefile.common       Wed Aug 17 13:38:30 2022 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2020/07/31 12:35:27 maya Exp $
+# $NetBSD: Makefile.common,v 1.4 2022/08/17 13:38:30 tnn Exp $
 # used by devel/cmake-gui/Makefile
+# used by devel/cmake-mode/Makefile
 
 .include "version.mk"
 
diff -r b3d0c39d6d35 -r 346f49b116dc devel/cmake/PLIST
--- a/devel/cmake/PLIST Wed Aug 17 13:28:10 2022 +0000
+++ b/devel/cmake/PLIST Wed Aug 17 13:38:30 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.69 2022/04/18 11:01:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.70 2022/08/17 13:38:30 tnn Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -3031,6 +3031,5 @@
 share/cmake-${CMAKE_API}/include/cmCPluginAPI.h
 share/doc/cmake-${CMAKE_API}/Copyright.txt
 share/doc/cmake-${CMAKE_API}/cmsys/Copyright.txt
-share/emacs/site-lisp/cmake-mode.el
 share/vim/vimfiles/indent/cmake.vim
 share/vim/vimfiles/syntax/cmake.vim
diff -r b3d0c39d6d35 -r 346f49b116dc devel/cmake/distinfo
--- a/devel/cmake/distinfo      Wed Aug 17 13:28:10 2022 +0000
+++ b/devel/cmake/distinfo      Wed Aug 17 13:38:30 2022 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.197 2022/07/29 10:40:21 adam Exp $
+$NetBSD: distinfo,v 1.198 2022/08/17 13:38:30 tnn Exp $
 
 BLAKE2s (cmake-3.23.3.tar.gz) = d4a7bab86632620ccb10614e38225fe784bbcba0f0b5ecd39f7389b65a5b7acb
 SHA512 (cmake-3.23.3.tar.gz) = 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
 Size (cmake-3.23.3.tar.gz) = 9988050 bytes
+SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
 SHA1 (patch-CMakeLists.txt) = 500b8645e7fbfa54dd97555432c453a1b0a57ff3
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindBLAS.cmake) = ee73b652fdea0c6c4a5cec37f01b65358c73a1fb
diff -r b3d0c39d6d35 -r 346f49b116dc devel/cmake/patches/patch-Auxiliary_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-Auxiliary_CMakeLists.txt        Wed Aug 17 13:38:30 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Auxiliary_CMakeLists.txt,v 1.1 2022/08/17 13:38:30 tnn Exp $
+
+Don't install the emacs mode here, it is provided by devel/cmake-mode.
+devel/cmake doesn't supply the pkgsrc emacs integration nor .elc files.
+
+--- Auxiliary/CMakeLists.txt.orig      2022-07-28 15:46:12.000000000 +0000
++++ Auxiliary/CMakeLists.txt
+@@ -10,7 +10,6 @@ install(DIRECTORY vim/indent vim/syntax 
+ if(NOT CMake_INSTALL_EMACS_DIR)
+   set(CMake_INSTALL_EMACS_DIR ${CMAKE_XDGDATA_DIR}/emacs/site-lisp)
+ endif()
+-install(FILES cmake-mode.el DESTINATION ${CMake_INSTALL_EMACS_DIR})
+ 
+ install(FILES cmake.m4 DESTINATION ${CMAKE_XDGDATA_DIR}/aclocal)
+ add_subdirectory (bash-completion)



Home | Main Index | Thread Index | Old Index