diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2010-01-29 11:35:33 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2010-01-29 11:35:33 +0000 |
| commit | 645a2537dea4a75f955327b6e6f1937d21171782 (patch) | |
| tree | a038fe0c0f15d6e816239cdbc7d265336f94342e /devel/cmake | |
| parent | Update to 4.1: (diff) | |
- Fix warning in FindSDL.cmake
- Use @dirrmtry for Modules dir, as other ports may install their own cmake modules
PR: 143313
Submitted by: myself
Approved by: Max Brazhnikov <makc@issp.ac.ru>
Notes
Notes:
svn path=/head/; revision=248799
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindSDL.cmake | 22 | ||||
| -rw-r--r-- | devel/cmake/pkg-plist | 4 |
3 files changed, 23 insertions, 5 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 2d21155bcd93..439e35f9377b 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -7,7 +7,7 @@ PORTNAME= cmake PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ diff --git a/devel/cmake/files/patch-Modules_FindSDL.cmake b/devel/cmake/files/patch-Modules_FindSDL.cmake index 6551f99463f9..9e9881c7af03 100644 --- a/devel/cmake/files/patch-Modules_FindSDL.cmake +++ b/devel/cmake/files/patch-Modules_FindSDL.cmake @@ -1,5 +1,5 @@ ---- ./Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300 -+++ ./Modules/FindSDL.cmake 2010-01-25 22:23:16.749128606 +0300 +--- Modules/FindSDL.cmake.orig 2009-11-13 21:32:52.000000000 +0300 ++++ Modules/FindSDL.cmake 2010-01-28 17:32:40.000000000 +0300 @@ -81,6 +81,11 @@ /opt/csw # Blastwave /opt @@ -12,3 +12,21 @@ #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") # SDL-1.1 is the name used by FreeBSD ports... +@@ -100,7 +105,7 @@ + #MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") + + IF(NOT SDL_BUILDING_LIBRARY) +- IF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") ++ IF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework") + # Non-OS X framework versions expect you to also dynamically link to + # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms + # seem to provide SDLmain for compatibility even though they don't +@@ -116,7 +121,7 @@ + /opt/csw + /opt + ) +- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") ++ ENDIF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework") + ENDIF(NOT SDL_BUILDING_LIBRARY) + + # SDL may require threads on your system. diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 6728e15c5dd0..01427849dbe4 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -513,5 +513,5 @@ bin/ctest @dirrm %%DATADIR%%/Modules/FortranCInterface @dirrm %%DATADIR%%/Modules/FindCUDA @dirrm %%DATADIR%%/Modules/Compiler -@dirrm %%DATADIR%%/Modules -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%/Modules +@dirrmtry %%DATADIR%% |