diff options
| author | mef <mef> | 2013-05-03 01:37:02 +0000 |
|---|---|---|
| committer | mef <mef> | 2013-05-03 01:37:02 +0000 |
| commit | 223ba00a9cfc1fd1ed7a1c2fc449f661696286ad (patch) | |
| tree | 6bdd3c083cc67c7732626bcc8cd8585e911f2a23 /devel/cmake | |
| parent | 91c644b4cb2a02775de7b6b3b9263f992e096f82 (diff) | |
| download | pkgsrc-223ba00a9cfc1fd1ed7a1c2fc449f661696286ad.tar.gz | |
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.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 10 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 3 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake | 15 |
3 files changed, 3 insertions, 25 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 5aceca276ca..7afc2aef127 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2013/05/03 00:58:05 mef Exp $ +# $NetBSD: Makefile,v 1.72 2013/05/03 01:37:02 mef Exp $ DISTNAME= cmake-${CMAKE_API}.10 -PKGREVISION= 5 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/ @@ -47,12 +47,6 @@ SUBST_FILES.cmake+= Modules/FindX11.cmake SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake SUBST_VARS.cmake= LOCALBASE X11BASE -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= pre-configure -SUBST_MESSAGE.prefix= Fixing PREFIX path. -SUBST_FILES.prefix+= Modules/CMakeGenericSystem.prefix -SUBST_VARS.prefix= PREFIX - SUBST_CLASSES+= flags SUBST_STAGE.flags= pre-configure SUBST_MESSAGE.flags= Fixing compiler flags. diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 5a5b4d4b9f0..4d313781e63 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.44 2013/05/03 00:58:06 mef Exp $ +$NetBSD: distinfo,v 1.45 2013/05/03 01:37:02 mef Exp $ SHA1 (cmake-2.8.10.tar.gz) = 6384f2295d01f04d017e2701447378598b4c7223 RMD160 (cmake-2.8.10.tar.gz) = 9af9e3f26f0f3d827ef566f99050fe6a2721dd25 Size (cmake-2.8.10.tar.gz) = 5766728 bytes -SHA1 (patch-Modules_CMakeGenericSystem.cmake) = 86fd39261d6788787a44515094e6c38451699e64 SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564 SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16 diff --git a/devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake b/devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake deleted file mode 100644 index dad1b821050..00000000000 --- a/devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Modules_CMakeGenericSystem.cmake,v 1.1 2013/05/03 00:58:07 mef Exp $ - -Correct Install PREFIX, see SUBST_CLASSES+= prefix in Makefile - ---- Modules/CMakeGenericSystem.cmake.orig 2012-11-01 00:32:05.000000000 +0900 -+++ Modules/CMakeGenericSystem.cmake 2013-05-01 23:45:47.000000000 +0900 -@@ -166,7 +166,7 @@ endif() - - # Choose a default install prefix for this platform. - if(CMAKE_HOST_UNIX) -- set(CMAKE_INSTALL_PREFIX "/usr/local" -+ set(CMAKE_INSTALL_PREFIX "@PREFIX@" - CACHE PATH "Install path prefix, prepended onto install directories.") - else() - GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) |