Re: pkg/47792: [PATCH] (devel/cmake) Fix wrong install PATH as /usr/local

[Makoto Fujiwara <makoto%ki.nu@localhost>]

The following reply was made to PR pkg/47792; it has been noted by GNATS.

From: Makoto Fujiwara <makoto%ki.nu@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: David Holland <dholland-pbugs%NetBSD.org@localhost>
Subject: Re: pkg/47792: [PATCH] (devel/cmake) Fix wrong install PATH as 
/usr/local
Date: Fri, 03 May 2013 08:03:08 +0900

 Thank you, I will commit later with a little bit :-) improved version,
 + ---------------
 | (PR pkg/47792)
 | Correct install PREFIX found on 
 |    Modules/CMakeGenericSystem.cmake
 | The example of problem was found on wip/trustedQSL (1.14)
 +---------------
 Index: devel/cmake/Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/cmake/Makefile,v
 retrieving revision 1.70
 diff -u -r1.70 Makefile
 --- devel/cmake/Makefile       4 Mar 2013 10:01:13 -0000       1.70
 +++ devel/cmake/Makefile       2 May 2013 22:59:40 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.70 2013/03/04 10:01:13 roy Exp $
  
  DISTNAME=     cmake-${CMAKE_API}.10
 -PKGREVISION=  4
 +PKGREVISION=  5
  CATEGORIES=   devel
  MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/
  
 @@ -47,6 +47,12 @@
  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 paths.
 +SUBST_FILES.prefix+=  Modules/CMakeGenericSystem.prefix
 +SUBST_VARS.prefix=    PREFIX
 +
  SUBST_CLASSES+=               flags
  SUBST_STAGE.flags=    pre-configure
  SUBST_MESSAGE.flags=  Fixing compiler flags.
 Index: devel/cmake/distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/cmake/distinfo,v
 retrieving revision 1.43
 diff -u -r1.43 distinfo
 --- devel/cmake/distinfo       16 Feb 2013 11:40:37 -0000      1.43
 +++ devel/cmake/distinfo       2 May 2013 22:59:40 -0000
 @@ -3,6 +3,7 @@
  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) = 
9830da28a3bda4e809e3bbb87057cb23e433a8ce
  SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564
  SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
  SHA1 (patch-Modules_Platform_SunOS.cmake) = 
7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
 Index: devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake
 ===================================================================
 RCS file: devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake
 diff -N devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ devel/cmake/patches/patch-Modules_CMakeGenericSystem.cmake 2 May 2013 
22:59:40 -0000
 @@ -0,0 +1,15 @@
 +$NetBSD$
 +
 +Correct Install PREFIX, see SUBST 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)