CVS commit: pkgsrc/devel/cmake

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Aug 17 13:38:30 UTC 2022

Modified Files:
        pkgsrc/devel/cmake: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Auxiliary_CMakeLists.txt

Log Message:
cmake: don't install the emacs mode

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


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/cmake/Makefile.common
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.197 -r1.198 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Auxiliary_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.196 pkgsrc/devel/cmake/Makefile:1.197
--- pkgsrc/devel/cmake/Makefile:1.196   Thu Aug  4 09:22:33 2022
+++ pkgsrc/devel/cmake/Makefile Wed Aug 17 13:38:30 2022
@@ -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
 

Index: pkgsrc/devel/cmake/Makefile.common
diff -u pkgsrc/devel/cmake/Makefile.common:1.3 pkgsrc/devel/cmake/Makefile.common:1.4
--- pkgsrc/devel/cmake/Makefile.common:1.3      Fri Jul 31 12:35:27 2020
+++ pkgsrc/devel/cmake/Makefile.common  Wed Aug 17 13:38:30 2022
@@ -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"
 

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.69 pkgsrc/devel/cmake/PLIST:1.70
--- pkgsrc/devel/cmake/PLIST:1.69       Mon Apr 18 11:01:33 2022
+++ pkgsrc/devel/cmake/PLIST    Wed Aug 17 13:38:30 2022
@@ -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}/Templates/Windo
 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

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.197 pkgsrc/devel/cmake/distinfo:1.198
--- pkgsrc/devel/cmake/distinfo:1.197   Fri Jul 29 10:40:21 2022
+++ pkgsrc/devel/cmake/distinfo Wed Aug 17 13:38:30 2022
@@ -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

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Auxiliary_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Auxiliary_CMakeLists.txt:1.1
--- /dev/null   Wed Aug 17 13:38:30 2022
+++ pkgsrc/devel/cmake/patches/patch-Auxiliary_CMakeLists.txt   Wed Aug 17 13:38:30 2022
@@ -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)