kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace paths with ${LOCALBASE} instead of hard-coding /usr/pkg into

Browse source 
installed files.
This commit is contained in:
brook 2011-09-14 17:54:48 +00:00
parent 6aece5a011
commit 46abe3822d
5 changed files with 55 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devel/cmake/Makefile
View file

@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.58 2011/07/31 22:04:03 adam Exp $
# $NetBSD: Makefile,v 1.59 2011/09/14 17:54:48 brook Exp $
DISTNAME= cmake-${CMAKE_API}.5
PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.cmake.org/files/v2.8/
@ -44,9 +45,10 @@ TEST_TARGET= test
SUBST_CLASSES+= cmake
SUBST_STAGE.cmake= pre-configure
SUBST_MESSAGE.cmake= Fixing X11 prefix.
SUBST_FILES.cmake= Modules/Platform/UnixPaths.cmake
SUBST_VARS.cmake= X11BASE
SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths.
SUBST_FILES.cmake+= Modules/FindX11.cmake
SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
SUBST_VARS.cmake= LOCALBASE X11BASE
SUBST_CLASSES+= flags
SUBST_STAGE.flags= pre-configure

4
devel/cmake/buildlink3.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:11 joerg Exp $
# $NetBSD: buildlink3.mk,v 1.11 2011/09/14 17:54:48 brook Exp $
BUILDLINK_TREE+= cmake
.if !defined(CMAKE_BUILDLINK3_MK)
CMAKE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.cmake+= cmake>=2.4.6nb3
BUILDLINK_API_DEPENDS.cmake+= cmake>=2.8.5nb1
BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake
BUILDLINK_DEPMETHOD.cmake?= build
BUILDLINK_FILES.cmake+= share/cmake-*/include/*

5
devel/cmake/distinfo
View file

@ -1,8 +1,9 @@
$NetBSD: distinfo,v 1.30 2011/07/31 22:04:03 adam Exp $
$NetBSD: distinfo,v 1.31 2011/09/14 17:54:48 brook Exp $
SHA1 (cmake-2.8.5.tar.gz) = 8dd4c31cbccf1a297829a476a0ef79d1614ca368
RMD160 (cmake-2.8.5.tar.gz) = e4767dc0ea3e53da3ab14cc6af5d42dd190eda76
Size (cmake-2.8.5.tar.gz) = 5517977 bytes
SHA1 (patch-aa) = c16ba8be422ec243995cd5d475324d469d08c37a
SHA1 (patch-Modules_FindX11.cmake) = ce3ddc82fdc5916f39abdd0f0291c7ce220f1bb2
SHA1 (patch-aa) = 6b6a2da6a73c139d3bc99b13329beddf910808d6
SHA1 (patch-ab) = c3bb671d98e0d91e32e94f8d8b8203e647559543
SHA1 (patch-ac) = 1f11e98d50127fae12286708215a90f118b2d2bc

24
devel/cmake/patches/patch-Modules_FindX11.cmake Normal file
View file

@ -0,0 +1,24 @@
$NetBSD: patch-Modules_FindX11.cmake,v 1.1 2011/09/14 17:54:48 brook Exp $
--- Modules/FindX11.cmake.orig 2011-07-08 12:21:44.000000000 +0000
+++ Modules/FindX11.cmake
@@ -56,7 +56,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@/include
/usr/X11R6/include
/usr/X11R7/include
/usr/include/X11
@@ -66,7 +67,8 @@ IF (UNIX)
)
SET(X11_LIB_SEARCH_PATH
- /usr/pkg/xorg/lib
+ @LOCALBASE@/xorg/lib
+ @X11BASE@/lib
/usr/X11R6/lib
/usr/X11R7/lib
/usr/openwin/lib

25
devel/cmake/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $
$NetBSD: patch-aa,v 1.8 2011/09/14 17:54:48 brook Exp $
--- Modules/Platform/UnixPaths.cmake.orig 2010-11-03 19:58:27.000000000 +0000
+++ Modules/Platform/UnixPaths.cmake
@@ -48,7 +48,7 @@ LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
@@ -48,10 +48,10 @@
/usr/include/w32api
# X11
@ -10,8 +10,12 @@ $NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $
+ @X11BASE@/include /usr/X11R6/include /usr/include/X11
# Other
/usr/pkg/include
@@ -61,7 +61,7 @@ LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- /usr/pkg/include
+ @LOCALBASE@/include
/opt/csw/include /opt/include
/usr/openwin/include
)
@@ -61,16 +61,16 @@
/usr/lib/w32api
# X11
@ -19,4 +23,15 @@ $NetBSD: patch-aa,v 1.7 2010/11/11 08:34:02 adam Exp $
+ @X11BASE@/lib /usr/X11R6/lib /usr/lib/X11
# Other
/usr/pkg/lib
- /usr/pkg/lib
+ @LOCALBASE@/lib
/opt/csw/lib /opt/lib
/usr/openwin/lib
)
LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
- /usr/pkg/bin
+ @LOCALBASE@/bin
)
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES