? devel/cmake/work
Index: devel/cmake/Makefile
===================================================================
RCS file: /cvs/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	1 May 2013 15:20:43 -0000
@@ -45,6 +45,7 @@
 SUBST_MESSAGE.cmake=	Fixing LOCALBASE and X11 paths.
 SUBST_FILES.cmake+=	Modules/FindX11.cmake
 SUBST_FILES.cmake+=	Modules/Platform/UnixPaths.cmake
+SUBST_FILES.cmake+=	Modules/CMakeGenericSystem.cmake
 SUBST_VARS.cmake=	LOCALBASE X11BASE
 
 SUBST_CLASSES+=		flags
Index: devel/cmake/distinfo
===================================================================
RCS file: /cvs/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	1 May 2013 15:20:43 -0000
@@ -3,8 +3,9 @@
 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) = c7eee31d22ba87b0a869def972b9c273f0ccb601
 SHA1 (patch-Modules_FindPNG.cmake) = 55de08bb7882bc98c78dcad0d1aa7016b4b03564
-SHA1 (patch-Modules_FindX11.cmake) = e5c9f5fd382effb85ae75fe603de00e5e58d788a
+SHA1 (patch-Modules_FindX11.cmake) = 0d285be9837b1209de626603bb051d752ae00a20
 SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
 SHA1 (patch-Utilities_KWIML_ABI.h.in) = 4642d13c6bdfce92c452a4cf3876a9dd244da891
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
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	1 May 2013 15:20:43 -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 "@LOCALBASE@"
+     CACHE PATH "Install path prefix, prepended onto install directories.")
+ else()
+   GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES)
Index: devel/cmake/patches/patch-Modules_FindX11.cmake
===================================================================
RCS file: /cvs/cvsroot/pkgsrc/devel/cmake/patches/patch-Modules_FindX11.cmake,v
retrieving revision 1.5
diff -u -r1.5 patch-Modules_FindX11.cmake
--- devel/cmake/patches/patch-Modules_FindX11.cmake	15 Nov 2012 19:31:55 -0000	1.5
+++ devel/cmake/patches/patch-Modules_FindX11.cmake	1 May 2013 15:20:43 -0000
@@ -2,25 +2,29 @@
 
 Patch in pkgsrc paths for finding X.
 
---- Modules/FindX11.cmake.orig	2012-10-31 15:32:05.000000000 +0000
-+++ Modules/FindX11.cmake
-@@ -61,7 +61,8 @@ if (UNIX)
+--- Modules/FindX11.cmake.orig	2012-11-01 00:32:05.000000000 +0900
++++ Modules/FindX11.cmake	2013-05-02 00:03:20.000000000 +0900
+@@ -61,9 +61,8 @@ if (UNIX)
    set(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
    set(CMAKE_FIND_FRAMEWORK NEVER)
    set(X11_INC_SEARCH_PATH
 -    /usr/pkg/xorg/include
-+    @LOCALBASE@/xorg/include
-+    @X11BASE@/xorg/include
-     /usr/X11R6/include
-     /usr/X11R7/include
+-    /usr/X11R6/include
+-    /usr/X11R7/include
++    @LOCALBASE@/include
++    @X11BASE@/include
      /usr/include/X11
-@@ -71,7 +72,8 @@ if (UNIX)
+     /usr/openwin/include
+     /usr/openwin/share/include
+@@ -71,9 +70,8 @@ if (UNIX)
    )
  
    set(X11_LIB_SEARCH_PATH
 -    /usr/pkg/xorg/lib
-+    @LOCALBASE@/xorg/lib
-+    @X11BASE@/xorg/lib
-     /usr/X11R6/lib
-     /usr/X11R7/lib
+-    /usr/X11R6/lib
+-    /usr/X11R7/lib
++    @LOCALBASE@/lib
++    @X11BASE@/lib
      /usr/openwin/lib
+   )
+