[pkgsrc/trunk]: pkgsrc/devel/cmake Replace hard-coded /usr/X11R6 with X11BASE...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f68d1efc964
branches:  trunk
changeset: 518941:7f68d1efc964
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 24 16:22:16 2006 +0000

description:
Replace hard-coded /usr/X11R6 with X11BASE, so that X11_TYPE != native
for example has a change to find X11. Bump revision.

diffstat:

 devel/cmake/Makefile         |   6 ++++--
 devel/cmake/distinfo         |   3 ++-
 devel/cmake/patches/patch-aa |  22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)

diffs (62 lines):

diff -r 12526c60eed8 -r 7f68d1efc964 devel/cmake/Makefile
--- a/devel/cmake/Makefile      Sun Sep 24 16:21:33 2006 +0000
+++ b/devel/cmake/Makefile      Sun Sep 24 16:22:16 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/05/19 21:35:01 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2006/09/24 16:22:16 joerg Exp $
 
 DISTNAME=      cmake-2.4.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.cmake.org/files/v2.4/
 
@@ -19,8 +20,9 @@
 SUBST_CLASSES+=                cmake
 SUBST_STAGE.cmake=     pre-configure
 SUBST_MESSAGE.cmake=   Fixing hard-coded prefix.
-SUBST_FILES.cmake=     Modules/FindCurses.cmake
+SUBST_FILES.cmake=     Modules/FindCurses.cmake Modules/FindX11.cmake
 SUBST_SED.cmake=       -e "s|@prefix@|${PREFIX}|g"
+SUBST_SED.cmake=       -e "s|@x11base@|${X11BASE}|g"
 
 post-extract:
        ${CP} ${WRKSRC}/Modules/Platform/FreeBSD.cmake \
diff -r 12526c60eed8 -r 7f68d1efc964 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Sun Sep 24 16:21:33 2006 +0000
+++ b/devel/cmake/distinfo      Sun Sep 24 16:22:16 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/05/19 21:32:52 rillig Exp $
+$NetBSD: distinfo,v 1.6 2006/09/24 16:22:16 joerg Exp $
 
 SHA1 (cmake-2.4.2.tar.gz) = 9fdef75873ba59cbd3ebb9400d60a26513897ee0
 RMD160 (cmake-2.4.2.tar.gz) = 436ea51033c4f20767f194165188b4d39ff4a0ab
 Size (cmake-2.4.2.tar.gz) = 2948510 bytes
+SHA1 (patch-aa) = 1652da758d103503d6cd657b7eb193a0174dab55
 SHA1 (patch-ac) = 69e026dcdf1aac1db54bcc8e73a8896f4831d345
 SHA1 (patch-ad) = c603f20478dcc3a7eef4e17c3dcfbab42f63e6a1
diff -r 12526c60eed8 -r 7f68d1efc964 devel/cmake/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-aa      Sun Sep 24 16:22:16 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2006/09/24 16:22:16 joerg Exp $
+
+--- Modules/FindX11.cmake.orig 2006-09-24 17:54:11.000000000 +0000
++++ Modules/FindX11.cmake
+@@ -11,7 +11,7 @@ IF (UNIX)
+   SET(CMAKE_FIND_FRAMEWORK_SAVE ${CMAKE_FIND_FRAMEWORK})
+   SET(CMAKE_FIND_FRAMEWORK NEVER)
+   SET(X11_INC_SEARCH_PATH
+-    /usr/X11R6/include 
++    @x11base@/include 
+     /usr/local/include 
+     /usr/include/X11
+     /usr/openwin/include 
+@@ -21,7 +21,7 @@ IF (UNIX)
+   )
+ 
+   SET(X11_LIB_SEARCH_PATH
+-    /usr/X11R6/lib
++    @x11base@/lib
+     /usr/local/lib 
+     /usr/openwin/lib 
+     /usr/lib