head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q1:1.4.0.8 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.6 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.4 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.2 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.3.0.6 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.4 pkgsrc-2008Q1:1.3.0.2 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2009.04.19.10.35.56; author hasso; state dead; branches; next 1.4; 1.4 date 2008.08.25.02.44.05; author bjs; state Exp; branches; next 1.3; 1.3 date 2008.02.03.13.01.11; author tnn; state Exp; branches; next 1.2; 1.2 date 2007.02.23.11.48.19; author wiz; state dead; branches; next 1.1; 1.1 date 2006.10.11.19.26.20; author rillig; state Exp; branches; next ; desc @@ 1.5 log @* 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 @ text @$NetBSD: patch-ae,v 1.4 2008/08/25 02:44:05 bjs Exp $ --- Modules/FindCURL.cmake.orig 2008-08-01 11:34:50.000000000 -0400 +++ Modules/FindCURL.cmake @@@@ -6,11 +6,11 @@@@ # CURL_FOUND - True if curl found. # Look for the header file. -FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) +FIND_PATH(CURL_INCLUDE_DIR curl/curl.h @@PREFIX@@/include) MARK_AS_ADVANCED(CURL_INCLUDE_DIR) # Look for the library. -FIND_LIBRARY(CURL_LIBRARY NAMES curl) +FIND_LIBRARY(CURL_LIBRARY NAMES curl PATHS @@prefix@@/lib) MARK_AS_ADVANCED(CURL_LIBRARY) # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if @ 1.4 log @Update to cmake-2.6.1. I could not find any release notes concise enough to include here; the changelog for this release is here: For changes prior to this release, please see ${WRKSRC}/ChangeLog. While here, add a list of *.cmake files in which to replace /usr/${X11R6,local} with X11BASE and LOCALBASE, respectively. Also, the [pkgsrc-relative] API, e.g. 2.6 is now defined by a variable so that it can be used in pathnames for the build and the PLIST. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2008/02/03 13:01:11 tnn Exp $ @ 1.3 log @Fix broken curl test. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Modules/FindCURL.cmake.orig 2007-01-10 18:59:12.000000000 +0100 d10 1 a10 1 +FIND_PATH(CURL_INCLUDE_DIR curl/curl.h @@prefix@@/include) d18 1 a18 1 # Copy the results to the output variables. @ 1.2 log @Update to 2.4.6: Changes in CMake 2.4.6 * Remove svn test in ctestctest3 * Fix for FIND_* order and framworks with PREFIX usage. * Fix for FindDoxygen and quiet mode. * Find JavaVM as well as jvm * Look for ruby1.8 and ruby * Fix for cpack .tgz.sh and dash * Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR. * Fix for Borland make and custom commands that do nothing Changes in CMake 2.4.5 * Fix for seg fault when a macro runs a bad command BUG# 3815 * Fix fix for foo.dll.lib that does not brea -L/usr/lib in link names * Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib instead of foo.lib * Do not depend on optimized libraries for a debug build and visa versa. * Fix target name matching custom command output conflict. * Fix FindQt3 so that it does not find qt4 * Fix FindKDE4 so that it only looks for kde4-config Changes in CMake 2.4.4 * CMake Version numbers on module directory * elseif added * Fix docs in CheckCSourceCompiles CheckCXXSourceCompiles and diagnostic output. * added Check(C/CXX)SourceRuns.cmake, CheckCXXCompilerFlag.cmake, Check * add static and shared flags to make sure the specified versions of libraries are used with -static -lfoo -shared -lbar * Search for the compiler only once and store a full path. avoids problems with PATH changes in cmake re-runs. * make sure manifest files are generated with VS 8 * added FindASPELL.cmake, FindBZip2.cmake FindHPELL.cmake, FindJasper.cmake FindLibXml2.cmake, FindLibXslt.cmake, FindOpenSSL.cmake * fix for bug#3646 GLUT not Glut for framework name * many fixes for FindKDE3.cmake * Better FindPNG that honors REQUIRED and looks in more places. * Support to find python 2.5 * Find Qt3 better * Find Qt4 better and work with qmake and qmake-qt4 on the same machine. * Much better FindRuby.cmake * More stuff marked as advanced in FindTcl and FindSDL * FindwxWidgets runs shell script wx-config with sh * Support for cpack and vs8 install libraries * Darwin shared library create and Fortran now work * Support for isystem directories INCLUDE_DIRECTORIES (SYSTEM) * Targets in makefiles to create pre-processed files and assembly files can be turned off with these variables: CMAKE_SKIP_PREPROCESSED_SOURCE_RULES CMAKE_SKIP_ASSEMBLY_SOURCE_RULES * Support for QNX * Better default search paths for unix and FIND_* stuff * Use link /lib and not lib to create static libraries with MS * Useqt4 works with static qt4 and other fixes * UseSwig.cmake interface to add extra dependencies. * Added APPEND option to ADD_CUSTOM_COMMAND, Added VERBATIM option to ADD_CUSTOM_COMMAND and ADD_CUSTOM_TARGET * add EXCLUDE_FROM_ALL option for ADD_LIBRARY and ADD_EXECUTABLE * Fix automatic computation of binary path to work for subdirectories of out of source directories. This addresses bug#3592. * --debug-ouput to cmake that gives stack trace to message send error commands. The stack trace is no longer there without it. * + can be in a variable * Do not replace @@VAR@@ syntax in list files. This addresses bug #2722 * much faster depend scanning * do depends on system include directories * Permission and install directory fixes * New target property _LOCATION (Debug, Release, etc) * fix exclude from all in VS * fix code completion problem in KDevelop * Define MSYS when using msys generator * fix referencece to projects outside the build tree VS 7,8 * Fix ZERO_CHECK to not always try and rebuild * Fix Xcode universal binary rebuild problem * add FILE_IS_NEWER to if command * Add OPTIONAL to INSTALL command fix bug@@2922 * add SORT and REVERSE to LIST command * fix for seg fault bug #3815 * add SYBOLIC as a source file property see SET_SOURCE_FILES_PROPERTIES * fix ctest valgrind if no coverage is done * better message if bogus generator is specified. * Better FindJava and FindJNI * Fix doxygen.config for CMake * add CPACK_MODULE_PATH * Fix configuration for ctest dashboard targets Experimental, Nightly, etc * Fix FindDoxygen for mac and app-bundles * Fix CPack simple install test with NSIS * Allow EXECUTE_PROCESS to strip trailing white space * Fix mingw echo in makefiles * Fix Xcode to not mess up -gdwarf-2 * Fix crash when "linking" to custom targets. * Allow HEADER_FILE_ONLY to not compile the file in VS 7 and 8 * Fix mingw out of binary with spaces in the path. * Fix for sudo make install (partial) * Allow installed zlib, curl, expat, xmlrpc to be used. * Add CMakeDependentOption.cmake module * Allow projects to set install prefix default * improved Find/Use wxWidgets * add support for windows dll version numbers * Fix message for -G when generator does not exist * Fix html references in help * Fix version on .exe cygwin * allow global timeout in ctest * Fix some odd cases with custom commands in VS 6 * Fix path suffix stuff with lib64 in FIND_* stuff. * Fix delete in CMakeSetup to not change the current position in the list * Fix debug stl run of ctest on Mac * Use #2 for manifest nt command on dll and #1 on exe * Add depends from files inside qrc files in qt * Fix explort_library_depends to work with optimized and debug Changes in CMake 2.4.3 * fix for 3557 - Under MSVC8 hardcoded TargetEnvironment for MIDL Compiler * Fix for Xcode all projects to prevent -fvisibility=hidden flags. This is needed to make RTTI work by default. * better prototype for main in try compile of c programs avoids warnings in logs. * with visual studio do not use incremental linking for release builds by default. * fix bootstrap to use more ansi c main it test compiler * fix import build settings to do case insensitive match on windows * fix building in root directory c:/ * Add support for CXX only projects * Better FindWxWidgets * Added FindBoose.cmake * add more fortran file extensions * Cpack supports multiple packages at the same time * Fix to FindKDE4 to look for kde4-config first * Support for env var CMAKE_CONFIG_TYPE in ctest * Fix for -DVAR=foo on the command line not saving to the cache * ENH: Added creation of XXX_FIND_COMPONENTS list of all components requested withREQUIRED option. This addresses the feature request in bug#3494. * Object files get safe names * progress is now reported with makefiles * location of CMakeTmp changed to a varible * CMAKE_COLOR_MAKEFILE cache variable available to turn off color output * fixes for FindQt4 on mac. * Better search paths for finding VTK * Fix relative path problems in ADD_SUBDIRECTORY * Fix long link commands on UNIX shells * Fix depend file names in makefiles for generated headers * CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS allows for if/endif without variable * Xcode multiple custom command problem fixed. * INSTALL_RPATH_USE_LINK_PATH when true will add the link path to the rpath * Add target/fast rules in the sub directories * Fix Visual stuido C and C++ targets to not add /TP and /TC * print a context when cmake errors occur * add rxvt-unicode, cygwin, and screen terminal support for color output * Fix crash in CMakeSetup when status line is long * make sure try compile files have a newline at the end * fix for hp itanium build @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2006/10/11 19:26:20 rillig Exp $ d3 4 a6 5 --- Modules/CPack.STGZ_Header.sh.in.orig 2006-05-17 15:48:52.000000000 +0200 +++ Modules/CPack.STGZ_Header.sh.in 2006-10-11 21:24:29.000000000 +0200 @@@@ -58,7 +58,7 @@@@ for a in "$@@CPACK_AT_SIGN@@"; do fi done d8 4 a11 6 -if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" == "xTRUEx" ] +if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" = "xTRUEx" ] then interactive=FALSE fi @@@@ -73,7 +73,7 @@@@ fi d13 4 a16 1 echo "The archive will be extracted to: ${toplevel}" d18 1 a18 23 -if [ "x${interactive}x" == "xTRUEx" ] +if [ "x${interactive}x" = "xTRUEx" ] then echo "" echo "If you want to stop extracting, please press ." @@@@ -95,7 +95,7 @@@@ ____cpack__here_doc____ esac fi - if [ "x${cpack_include_subdir}x" == "xx" ] + if [ "x${cpack_include_subdir}x" = "xx" ] then echo "By default the @@CPACK_PACKAGE_NAME@@ will be installed in:" echo " \"${toplevel}/@@CPACK_PACKAGE_FILE_NAME@@\"" @@@@ -110,7 +110,7 @@@@ ____cpack__here_doc____ fi fi -if [ "x${cpack_include_subdir}x" == "xTRUEx" ] +if [ "x${cpack_include_subdir}x" = "xTRUEx" ] then toplevel="${toplevel}/@@CPACK_PACKAGE_FILE_NAME@@" mkdir -p "${toplevel}" @ 1.1 log @Fixed "test ==". @ text @d1 1 a1 1 $NetBSD$ @