* Unbreak searching software from /usr/local. There is no need to for all

  this sed magic, _CMAKE_INSTALL_DIR in UnixPaths.cmake does that for us
  already. Only X11BASE needs special attention.

* Remove patch-ae which never worked in fact.

* Bump PKGREVISION.

Discussed-with: Mark Davies

4 files changed, 29 insertions, 42 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 3dd32f74ee7..59021928bbb 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.42 2009/04/07 10:42:14 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2009/04/19 10:35:55 hasso Exp $
 
 DISTNAME=	cmake-${CMAKE_API}.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v2.6/
 
 CMAKE_API=	2.6
+PKGREVISION=	1
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.cmake.org/
@@ -34,27 +35,9 @@ TEST_TARGET=		test
 
 SUBST_CLASSES+=		cmake
 SUBST_STAGE.cmake=	pre-configure
-SUBST_MESSAGE.cmake=	Fixing hard-coded prefix.
-SUBST_FILES.cmake=	${REPLACE_CMAKE.Modules:@m@Modules/${m}.cmake@}
-SUBST_FILES.cmake+=	Modules/FindCURL.cmake
-SUBST_SED.cmake=	-e 's|/usr/X11R6|${X11BASE}|g'
-SUBST_SED.cmake+=	-e 's|/usr/local|${LOCALBASE}|g'
-SUBST_VARS.cmake=	PREFIX
-
-REPLACE_CMAKE.Modules=\
-	CMakeDetermineJavaCompiler CMakeDetermineSystem 		\
-	CMakeGenericSystem FindAVIFile FindBLAS FindFLTK FindFLTK2 	\
-	FindFreetype FindGDAL FindGIF FindGTK FindITK FindJNI 		\
-	FindJava FindKDE3 FindLAPACK FindLua50 FindLua51 FindMPEG 	\
-	FindMPEG2 FindMPI FindMatlab FindOpenAL FindOpenThreads		\
-	FindPHP4 FindPNG FindPhysFS FindPike FindProducer FindQt	\
-	FindQt3 FindSDL FindSDL_image FindSDL_mixer FindSDL_net 	\
-	FindSDL_sound FindSDL_ttf FindSelfPackers FindTCL FindTclStub	\
-	FindUnixCommands FindVTK FindX11 Findosg FindosgDB FindosgFX	\
-	FindosgGA FindosgIntrospection FindosgManipulator		\
-	FindosgParticle FindosgProducer FindosgShadow FindosgSim	\
-	FindosgTerrain FindosgText FindosgUtil FindosgViewer		\
-	GetPrerequisites Platform/UnixPaths UsePkgConfig
+SUBST_MESSAGE.cmake=	Fixing X11 prefix.
+SUBST_FILES.cmake+=	Modules/Platform/UnixPaths.cmake
+SUBST_VARS.cmake=	X11BASE
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index c5d5f42e0ed..bdcd8077ff0 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2009/04/07 10:42:14 drochner Exp $
+$NetBSD: distinfo,v 1.19 2009/04/19 10:35:55 hasso Exp $
 
 SHA1 (cmake-2.6.3.tar.gz) = bf34e1661954d808ac3a3eb9d394b69e4d3b1a98
 RMD160 (cmake-2.6.3.tar.gz) = 14f0e878844f55a1b3d02837e98087dcaabb16be
 Size (cmake-2.6.3.tar.gz) = 3594959 bytes
-SHA1 (patch-ae) = bcbf3a492d692fb3ca245f41c3e15f50c51bd3bd
+SHA1 (patch-aa) = c039328d82c187d5bbc780af18fb20a6b2ce3319
 SHA1 (patch-af) = 6fbbd58d67fac0261b958d2a68e2a44e24199b01
diff --git a/devel/cmake/patches/patch-aa b/devel/cmake/patches/patch-aa
new file mode 100644
index 00000000000..3b673334b1e
--- /dev/null
+++ b/devel/cmake/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.5 2009/04/19 10:35:55 hasso Exp $
+
+--- Modules/Platform/UnixPaths.cmake.orig	2009-03-15 06:17:18 +0200
++++ Modules/Platform/UnixPaths.cmake	2009-03-15 06:18:24 +0200
+@@ -24,7 +24,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
+   /usr/include/w32api
+ 
+   # X11
+-  /usr/X11R6/include /usr/include/X11
++  @X11BASE@/include /usr/X11R6/include /usr/include/X11
+ 
+   # Other
+   /opt/local/include /usr/pkg/include
+@@ -37,7 +37,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
+   /usr/lib/w32api
+ 
+   # X11
+-  /usr/X11R6/lib /usr/lib/X11
++  @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
+ 
+   # Other
+   /opt/local/lib /usr/pkg/lib
diff --git a/devel/cmake/patches/patch-ae b/devel/cmake/patches/patch-ae
deleted file mode 100644
index 761538b2c33..00000000000
--- a/devel/cmake/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2008/08/25 02:44:05 bjs Exp $
-
---- Modules/FindCURL.cmake.orig	2008-08-01 11:34:50.000000000 -0400
-+++ Modules/FindCURL.cmake
-@@ -6,11 +6,11 @@
- #  CURL_FOUND        - True if curl found.
- 
- # Look for the header file.
--FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h)
-+FIND_PATH(CURL_INCLUDE_DIR curl/curl.h @PREFIX@/include)
- MARK_AS_ADVANCED(CURL_INCLUDE_DIR)
- 
- # Look for the library.
--FIND_LIBRARY(CURL_LIBRARY NAMES curl)
-+FIND_LIBRARY(CURL_LIBRARY NAMES curl PATHS @prefix@/lib)
- MARK_AS_ADVANCED(CURL_LIBRARY)
- 
- # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if