cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with KDE upstream

Browse Source
This commit is contained in:
dcoppa 2010-11-22 16:26:30 +00:00
parent d18c466226
commit 6738b0f177
7 changed files with 79 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2010/11/19 16:18:12 dcoppa Exp $
# $OpenBSD: Makefile,v 1.36 2010/11/22 16:26:30 dcoppa Exp $
VMEM_WARNING = Yes
@ -6,7 +6,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.3
REVISION = 1
REVISION = 2
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>
@ -45,8 +45,7 @@ MAKE_FLAGS += VERBOSE=1
pre-configure:
@cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
${SUBST_CMD} ${WRKSRC}/Modules/FindLibIntl.cmake \
${WRKSRC}/Modules/FindMPEG.cmake \
${SUBST_CMD} ${WRKSRC}/Modules/FindMPEG.cmake \
${WRKSRC}/Modules/FindMPEG2.cmake \
${WRKSRC}/Modules/FindQt.cmake \
${WRKSRC}/Modules/FindQt3.cmake \

47
devel/cmake/files/FindIconv.cmake
View File

@ -1,11 +1,11 @@
# - Try to find Iconv
# Once done this will define
#
# ICONV_FOUND - system has Iconv
# ICONV_INCLUDE_DIR - the Iconv include directory
# ICONV_LIBRARIES - Link these to use Iconv
# - Try to find Iconv
# Once done this will define
#
# ICONV_FOUND - system has Iconv
# ICONV_INCLUDE_DIR - the Iconv include directory
# ICONV_LIBRARIES - Link these to use Iconv
# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
#
include(CheckCXXSourceCompiles)
IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
@ -13,13 +13,13 @@ IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
SET(ICONV_FIND_QUIETLY TRUE)
ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
SET(ICONV_FOUND TRUE)
ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
SET(ICONV_FOUND TRUE)
ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
@ -36,22 +36,19 @@ IF(ICONV_FOUND)
return 0;
}
" ICONV_SECOND_ARGUMENT_IS_CONST )
IF(ICONV_SECOND_ARGUMENT_IS_CONST)
SET(ICONV_CONST "const")
ENDIF(ICONV_SECOND_ARGUMENT_IS_CONST)
ENDIF(ICONV_FOUND)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
IF(ICONV_FOUND)
IF(NOT ICONV_FIND_QUIETLY)
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
ENDIF(NOT ICONV_FIND_QUIETLY)
ELSE(ICONV_FOUND)
IF(Iconv_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Iconv")
ENDIF(Iconv_FIND_REQUIRED)
ENDIF(ICONV_FOUND)
IF(ICONV_FOUND)
IF(NOT ICONV_FIND_QUIETLY)
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
ENDIF(NOT ICONV_FIND_QUIETLY)
ELSE(ICONV_FOUND)
IF(Iconv_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Iconv")
ENDIF(Iconv_FIND_REQUIRED)
ENDIF(ICONV_FOUND)
MARK_AS_ADVANCED(
ICONV_INCLUDE_DIR

46
devel/cmake/files/FindLibIntl.cmake
View File

@ -1,46 +0,0 @@
# Try to find the libintl library. Explicit searching is currently
# only required for Win32, though it might be useful for some UNIX
# variants, too. Therefore code for searching common UNIX include
# directories is included, too.
#
# Once done this will define
#
# LIBINTL_FOUND - system has libintl
# LIBINTL_LIBRARIES - the library needed for linking
IF (LibIntl_LIBRARY)
SET(LibIntl_FIND_QUIETLY TRUE)
ENDIF ()
# for Windows we rely on the environement variables
# %INCLUDE% and %LIB%; FIND_LIBRARY checks %LIB%
# automatically on Windows
IF(WIN32)
FIND_LIBRARY(LibIntl_LIBRARY
NAMES intl
)
ELSE()
FIND_LIBRARY(LibIntl_LIBRARY
NAMES intl
PATHS /usr/lib ${LOCALBASE}/lib
)
ENDIF()
IF (LibIntl_LIBRARY)
SET(LIBINTL_FOUND TRUE)
SET(LIBINTL_LIBRARIES ${LibIntl_LIBRARY})
ELSE ()
SET(LIBINTL_FOUND FALSE)
ENDIF ()
IF (LIBINTL_FOUND)
IF (NOT LibIntl_FIND_QUIETLY)
MESSAGE(STATUS "Found libintl: ${LibIntl_LIBRARY}")
ENDIF ()
ELSE ()
IF (LibIntl_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could NOT find libintl")
ENDIF ()
ENDIF ()
MARK_AS_ADVANCED(LibIntl_LIBRARY)

46
devel/cmake/files/FindLibintl.cmake Normal file
View File

@ -0,0 +1,46 @@
# Try to find Libintl functionality
# Once done this will define
#
# LIBINTL_FOUND - system has Libintl
# LIBINTL_INCLUDE_DIR - Libintl include directory
# LIBINTL_LIBRARIES - Libraries needed to use Libintl
#
# TODO: This will enable translations only if Gettext functionality is
# present in libc. Must have more robust system for release, where Gettext
# functionality can also reside in standalone Gettext library, or the one
# embedded within kdelibs (cf. gettext.m4 from Gettext source).
# Copyright (c) 2006, Chusslove Illich, <caslav.ilic@gmx.net>
# Copyright (c) 2007, Alexander Neundorf, <neundorf@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
set(Libintl_FIND_QUIETLY TRUE)
endif(LIBINTL_INCLUDE_DIR AND LIBINTL_LIB_FOUND)
find_path(LIBINTL_INCLUDE_DIR libintl.h)
set(LIBINTL_LIB_FOUND FALSE)
if(LIBINTL_INCLUDE_DIR)
include(CheckFunctionExists)
check_function_exists(dgettext LIBINTL_LIBC_HAS_DGETTEXT)
if (LIBINTL_LIBC_HAS_DGETTEXT)
set(LIBINTL_LIBRARIES)
set(LIBINTL_LIB_FOUND TRUE)
else (LIBINTL_LIBC_HAS_DGETTEXT)
find_library(LIBINTL_LIBRARIES NAMES intl libintl )
if(LIBINTL_LIBRARIES)
set(LIBINTL_LIB_FOUND TRUE)
endif(LIBINTL_LIBRARIES)
endif (LIBINTL_LIBC_HAS_DGETTEXT)
endif(LIBINTL_INCLUDE_DIR)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR LIBINTL_LIB_FOUND)
mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND)

4
devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.4 2010/11/19 16:18:12 dcoppa Exp $
$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.5 2010/11/22 16:26:30 dcoppa Exp $
--- Modules/Qt4ConfigDependentSettings.cmake.orig Wed Nov 3 20:58:27 2010
+++ Modules/Qt4ConfigDependentSettings.cmake Fri Nov 19 17:14:55 2010
@@ -26,6 +26,9 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.4 2010/11/19 16:18:
# the variables themselves.
+INCLUDE(FindIconv)
+INCLUDE(FindLibIntl)
+INCLUDE(FindLibintl)
+
SET(QT_QTGUI_LIB_DEPENDENCIES "")
SET(QT_QTCORE_LIB_DEPENDENCIES "")

8
devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.1 2010/07/12 19:19:30 dcoppa Exp $
--- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Mon Jul 5 18:35:02 2010
+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Mon Jul 5 18:37:30 2010
$OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.2 2010/11/22 16:26:30 dcoppa Exp $
--- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Wed Nov 3 20:58:31 2010
+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Mon Nov 22 11:50:04 2010
@@ -22,6 +22,9 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege
# Modules that do not require our notice.
set(notice_exceptions
FindCUDA.cmake # MIT License, distributed here from upstream project
+ FindIconv.cmake
+ FindLibIntl.cmake
+ FindLibintl.cmake
+ MacroPushRequiredVars.cmake
)

4
devel/cmake/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2010/11/15 11:39:09 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.12 2010/11/22 16:26:30 dcoppa Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@ -244,9 +244,9 @@ share/cmake/Modules/FindKDE4.cmake
share/cmake/Modules/FindLAPACK.cmake
share/cmake/Modules/FindLATEX.cmake
share/cmake/Modules/FindLibArchive.cmake
share/cmake/Modules/FindLibIntl.cmake
share/cmake/Modules/FindLibXml2.cmake
share/cmake/Modules/FindLibXslt.cmake
share/cmake/Modules/FindLibintl.cmake
share/cmake/Modules/FindLua50.cmake
share/cmake/Modules/FindLua51.cmake
share/cmake/Modules/FindMFC.cmake