Fri May 3 01:37:03 2013 UTC ()
PR pkg/47792
Let me revert to as of 30mins before.
/usr/local may be left as it is for the case to compile
stuff outside of pkgsrc with this cmake.


(mef)
diff -r1.71 -r1.72 pkgsrc/devel/cmake/Makefile
diff -r1.44 -r1.45 pkgsrc/devel/cmake/distinfo
diff -r1.1 -r0 pkgsrc/devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake
cvs diff -r1.71 -r1.72 pkgsrc/devel/cmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2013/05/03 00:58:05 1.71
+++ pkgsrc/devel/cmake/Makefile 2013/05/03 01:37:02 1.72
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.71 2013/05/03 00:58:05 mef Exp $ 1# $NetBSD: Makefile,v 1.72 2013/05/03 01:37:02 mef Exp $
2 2
3DISTNAME= cmake-${CMAKE_API}.10 3DISTNAME= cmake-${CMAKE_API}.10
4PKGREVISION= 5 4PKGREVISION= 4
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/ 6MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
7 7
8CMAKE_API= 2.8 8CMAKE_API= 2.8
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.cmake.org/ 11HOMEPAGE= http://www.cmake.org/
12COMMENT= Cross platform make 12COMMENT= Cross platform make
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_NCURSES= wsyncup 17USE_NCURSES= wsyncup
@@ -37,32 +37,26 @@ PLIST_SUBST+= CMAKE_API=${CMAKE_API} @@ -37,32 +37,26 @@ PLIST_SUBST+= CMAKE_API=${CMAKE_API}
37# for Source/cmDependsJavaParser.cxx 37# for Source/cmDependsJavaParser.cxx
38UNLIMIT_RESOURCES= datasize 38UNLIMIT_RESOURCES= datasize
39 39
40# as of 2.4.6, x11 and fortran tests fail in pkgsrc 40# as of 2.4.6, x11 and fortran tests fail in pkgsrc
41TEST_TARGET= test 41TEST_TARGET= test
42 42
43SUBST_CLASSES+= cmake 43SUBST_CLASSES+= cmake
44SUBST_STAGE.cmake= pre-configure 44SUBST_STAGE.cmake= pre-configure
45SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths. 45SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths.
46SUBST_FILES.cmake+= Modules/FindX11.cmake 46SUBST_FILES.cmake+= Modules/FindX11.cmake
47SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake 47SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
48SUBST_VARS.cmake= LOCALBASE X11BASE 48SUBST_VARS.cmake= LOCALBASE X11BASE
49 49
50SUBST_CLASSES+= prefix 
51SUBST_STAGE.prefix= pre-configure 
52SUBST_MESSAGE.prefix= Fixing PREFIX path. 
53SUBST_FILES.prefix+= Modules/CMakeGenericSystem.prefix 
54SUBST_VARS.prefix= PREFIX 
55 
56SUBST_CLASSES+= flags 50SUBST_CLASSES+= flags
57SUBST_STAGE.flags= pre-configure 51SUBST_STAGE.flags= pre-configure
58SUBST_MESSAGE.flags= Fixing compiler flags. 52SUBST_MESSAGE.flags= Fixing compiler flags.
59SUBST_FILES.flags= Modules/Compiler/*.cmake 53SUBST_FILES.flags= Modules/Compiler/*.cmake
60SUBST_SED.flags= -e 's,-O.,,' 54SUBST_SED.flags= -e 's,-O.,,'
61 55
62pre-configure: 56pre-configure:
63 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig 57 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig
64 58
65BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4 59BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4
66.include "../../archivers/libarchive/buildlink3.mk" 60.include "../../archivers/libarchive/buildlink3.mk"
67.include "../../devel/ncurses/buildlink3.mk" 61.include "../../devel/ncurses/buildlink3.mk"
68.include "../../devel/zlib/buildlink3.mk" 62.include "../../devel/zlib/buildlink3.mk"
cvs diff -r1.44 -r1.45 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2013/05/03 00:58:06 1.44
+++ pkgsrc/devel/cmake/distinfo 2013/05/03 01:37:02 1.45
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1$NetBSD: distinfo,v 1.44 2013/05/03 00:58:06 mef Exp $ 1$NetBSD: distinfo,v 1.45 2013/05/03 01:37:02 mef Exp $
2 2
3SHA1 (cmake-2.8.10.tar.gz) = 6384f2295d01f04d017e2701447378598b4c7223 3SHA1 (cmake-2.8.10.tar.gz) = 6384f2295d01f04d017e2701447378598b4c7223
4RMD160 (cmake-2.8.10.tar.gz) = 9af9e3f26f0f3d827ef566f99050fe6a2721dd25 4RMD160 (cmake-2.8.10.tar.gz) = 9af9e3f26f0f3d827ef566f99050fe6a2721dd25
5Size (cmake-2.8.10.tar.gz) = 5766728 bytes 5Size (cmake-2.8.10.tar.gz) = 5766728 bytes
6SHA1 (patch-Modules_CMakeGenericSystem.cmake) = 86fd39261d6788787a44515094e6c38451699e64 
7SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564 6SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564
8SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a 7SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
9SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 8SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
10SHA1 (patch-Utilities_KWIML_ABI.h.in) = 4642d13c6bdfce92c452a4cf3876a9dd244da891 9SHA1 (patch-Utilities_KWIML_ABI.h.in) = 4642d13c6bdfce92c452a4cf3876a9dd244da891
11SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c 10SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
12SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b 11SHA1 (patch-aa) = 97bfad3d2c357e9af01677ba86057b78f0661b9b
13SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502 12SHA1 (patch-ab) = aee3fb2f908aed1ce6e92b7c7ccf5b06f0596502
14SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508 13SHA1 (patch-ac) = fe679b28793d6a7b9fd41cbcb7288295a4c4a508
File Deleted: pkgsrc/devel/cmake/patches/Attic/patch-Modules_CMakeGenericSystem.cmake