Sun Apr 19 10:35:56 2009 UTC ()
* 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


(hasso)
diff -r1.42 -r1.43 pkgsrc/devel/cmake/Makefile
diff -r1.18 -r1.19 pkgsrc/devel/cmake/distinfo
diff -r0 -r1.5 pkgsrc/devel/cmake/patches/patch-aa
diff -r1.4 -r0 pkgsrc/devel/cmake/patches/patch-ae
cvs diff -r1.42 -r1.43 pkgsrc/devel/cmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2009/04/07 10:42:14 1.42
+++ pkgsrc/devel/cmake/Makefile 2009/04/19 10:35:55 1.43
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.42 2009/04/07 10:42:14 drochner Exp $ 1# $NetBSD: Makefile,v 1.43 2009/04/19 10:35:55 hasso Exp $
2 2
3DISTNAME= cmake-${CMAKE_API}.3 3DISTNAME= cmake-${CMAKE_API}.3
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= http://www.cmake.org/files/v2.6/ 5MASTER_SITES= http://www.cmake.org/files/v2.6/
6 6
7CMAKE_API= 2.6 7CMAKE_API= 2.6
 8PKGREVISION= 1
8 9
9MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.cmake.org/ 11HOMEPAGE= http://www.cmake.org/
11COMMENT= Cross platform make 12COMMENT= Cross platform make
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_TOOLS+= gmake 16USE_TOOLS+= gmake
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17USE_NCURSES= yes 18USE_NCURSES= yes
18GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
19 20
20BUILD_TARGET= default_target 21BUILD_TARGET= default_target
@@ -24,42 +25,24 @@ CONFIGURE_ARGS+= --mandir=/${PKGMANDIR} @@ -24,42 +25,24 @@ CONFIGURE_ARGS+= --mandir=/${PKGMANDIR}
24CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API} 25CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API}
25CONFIGURE_ARGS+= --system-libs 26CONFIGURE_ARGS+= --system-libs
26 27
27PLIST_SUBST+= CMAKE_API=${CMAKE_API} 28PLIST_SUBST+= CMAKE_API=${CMAKE_API}
28 29
29# for Source/cmDependsJavaParser.cxx 30# for Source/cmDependsJavaParser.cxx
30UNLIMIT_RESOURCES= datasize 31UNLIMIT_RESOURCES= datasize
31 32
32# as of 2.4.6, x11 and fortran tests fail in pkgsrc 33# as of 2.4.6, x11 and fortran tests fail in pkgsrc
33TEST_TARGET= test 34TEST_TARGET= test
34 35
35SUBST_CLASSES+= cmake 36SUBST_CLASSES+= cmake
36SUBST_STAGE.cmake= pre-configure 37SUBST_STAGE.cmake= pre-configure
37SUBST_MESSAGE.cmake= Fixing hard-coded prefix. 38SUBST_MESSAGE.cmake= Fixing X11 prefix.
38SUBST_FILES.cmake= ${REPLACE_CMAKE.Modules:@m@Modules/${m}.cmake@} 39SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
39SUBST_FILES.cmake+= Modules/FindCURL.cmake 40SUBST_VARS.cmake= X11BASE
40SUBST_SED.cmake= -e 's|/usr/X11R6|${X11BASE}|g' 
41SUBST_SED.cmake+= -e 's|/usr/local|${LOCALBASE}|g' 
42SUBST_VARS.cmake= PREFIX 
43 
44REPLACE_CMAKE.Modules=\ 
45 CMakeDetermineJavaCompiler CMakeDetermineSystem \ 
46 CMakeGenericSystem FindAVIFile FindBLAS FindFLTK FindFLTK2 \ 
47 FindFreetype FindGDAL FindGIF FindGTK FindITK FindJNI \ 
48 FindJava FindKDE3 FindLAPACK FindLua50 FindLua51 FindMPEG \ 
49 FindMPEG2 FindMPI FindMatlab FindOpenAL FindOpenThreads \ 
50 FindPHP4 FindPNG FindPhysFS FindPike FindProducer FindQt \ 
51 FindQt3 FindSDL FindSDL_image FindSDL_mixer FindSDL_net \ 
52 FindSDL_sound FindSDL_ttf FindSelfPackers FindTCL FindTclStub \ 
53 FindUnixCommands FindVTK FindX11 Findosg FindosgDB FindosgFX \ 
54 FindosgGA FindosgIntrospection FindosgManipulator \ 
55 FindosgParticle FindosgProducer FindosgShadow FindosgSim \ 
56 FindosgTerrain FindosgText FindosgUtil FindosgViewer \ 
57 GetPrerequisites Platform/UnixPaths UsePkgConfig 
58 41
59.include "../../devel/ncurses/buildlink3.mk" 42.include "../../devel/ncurses/buildlink3.mk"
60.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
61.include "../../textproc/xmlrpc-c/buildlink3.mk" 44.include "../../textproc/xmlrpc-c/buildlink3.mk"
62.include "../../textproc/expat/buildlink3.mk" 45.include "../../textproc/expat/buildlink3.mk"
63.include "../../www/curl/buildlink3.mk" 46.include "../../www/curl/buildlink3.mk"
64 47
65.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/devel/cmake/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cmake/distinfo 2009/04/07 10:42:14 1.18
+++ pkgsrc/devel/cmake/distinfo 2009/04/19 10:35:55 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2009/04/07 10:42:14 drochner Exp $ 1$NetBSD: distinfo,v 1.19 2009/04/19 10:35:55 hasso Exp $
2 2
3SHA1 (cmake-2.6.3.tar.gz) = bf34e1661954d808ac3a3eb9d394b69e4d3b1a98 3SHA1 (cmake-2.6.3.tar.gz) = bf34e1661954d808ac3a3eb9d394b69e4d3b1a98
4RMD160 (cmake-2.6.3.tar.gz) = 14f0e878844f55a1b3d02837e98087dcaabb16be 4RMD160 (cmake-2.6.3.tar.gz) = 14f0e878844f55a1b3d02837e98087dcaabb16be
5Size (cmake-2.6.3.tar.gz) = 3594959 bytes 5Size (cmake-2.6.3.tar.gz) = 3594959 bytes
6SHA1 (patch-ae) = bcbf3a492d692fb3ca245f41c3e15f50c51bd3bd 6SHA1 (patch-aa) = c039328d82c187d5bbc780af18fb20a6b2ce3319
7SHA1 (patch-af) = 6fbbd58d67fac0261b958d2a68e2a44e24199b01 7SHA1 (patch-af) = 6fbbd58d67fac0261b958d2a68e2a44e24199b01
File Added: pkgsrc/devel/cmake/patches/Attic/patch-aa
$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
File Deleted: pkgsrc/devel/cmake/patches/Attic/patch-ae