summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-09-24 16:22:16 +0000
committerjoerg <joerg@pkgsrc.org>2006-09-24 16:22:16 +0000
commitc8723c2b15f31432f2d10d7dc50ce5d55783de79 (patch)
tree876e127ec39ccb011fc7aba050fe0773a70dcd34 /devel
parent8ae03965ace15874fd9c14db41915d264fbcf631 (diff)
downloadpkgsrc-c8723c2b15f31432f2d10d7dc50ce5d55783de79.tar.gz
Replace hard-coded /usr/X11R6 with X11BASE, so that X11_TYPE != native
for example has a change to find X11. Bump revision.
Diffstat (limited to 'devel')
-rw-r--r--devel/cmake/Makefile6
-rw-r--r--devel/cmake/distinfo3
-rw-r--r--devel/cmake/patches/patch-aa22
3 files changed, 28 insertions, 3 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index dd4cb3a4d84..f30f87a9f94 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -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 @@ BUILD_TARGET= default_target
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 --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 8e977f4aa59..902f5a8fdcb 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -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 --git a/devel/cmake/patches/patch-aa b/devel/cmake/patches/patch-aa
new file mode 100644
index 00000000000..4efb7ba020c
--- /dev/null
+++ b/devel/cmake/patches/patch-aa
@@ -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