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

fixes for lua

Browse Source 
from dcoppa@
This commit is contained in:
jasper 2012-07-10 15:20:24 +00:00
parent 1ab04af85e
commit d81eaeb0d8
7 changed files with 227 additions and 14 deletions

7
devel/cmake/Makefile

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.59 2012/07/03 07:48:54 dcoppa Exp $
# $OpenBSD: Makefile,v 1.60 2012/07/10 15:20:24 jasper Exp $
VMEM_WARNING = Yes
BROKEN-arm = build fails since move to gcc4
@ -7,7 +7,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.8
REVISION = 6
REVISION = 7
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>
@ -44,6 +44,8 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
${WRKSRC}/Modules/FindJNI.cmake \
${WRKSRC}/Modules/FindJava.cmake \
${WRKSRC}/Modules/FindLuaInterp.cmake \
${WRKSRC}/Modules/FindLuaLibs.cmake \
${WRKSRC}/Modules/FindMPEG.cmake \
${WRKSRC}/Modules/FindMPEG2.cmake \
${WRKSRC}/Modules/FindQt.cmake \
@ -53,6 +55,7 @@ pre-configure:
${WRKSRC}/Modules/UseJava.cmake
post-install:
@rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/FindLua5?.cmake
@rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig}
@rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/Compiler/*.orig
@rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/Platform/*.orig

3
devel/cmake/cmake.port.mk

@ -1,4 +1,4 @@
# $OpenBSD: cmake.port.mk,v 1.12 2012/03/29 13:38:13 sthen Exp $
# $OpenBSD: cmake.port.mk,v 1.13 2012/07/10 15:20:24 jasper Exp $
BUILD_DEPENDS+= devel/cmake>=2.8.0
@ -8,6 +8,7 @@ MAKE_ENV+=LIB${_n}_VERSION=${_v}
.endfor
CONFIGURE_ENV += MODJAVA_VER=${MODJAVA_VER} \
MODLUA_VERSION=${MODLUA_VERSION} \
MODPY_VERSION=${MODPY_VERSION} \
MODPY_BIN=${MODPY_BIN} \
MODPY_INCDIR=${MODPY_INCDIR} \

68
devel/cmake/files/FindLuaInterp.cmake Normal file

@ -0,0 +1,68 @@
# Locate Lua interpreter
# This module defines
# LUAINTERP_FOUND
# LUA_EXECUTABLE
#
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
# Copyright 2011 Peter Colberg
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
SET(MODLUA_VERSION $ENV{MODLUA_VERSION})
IF(MODLUA_VERSION)
IF(MODLUA_VERSION MATCHES "^5\\.2$")
find_program(LUA_EXECUTABLE
NAMES lua52
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES bin
PATHS
${LOCALBASE}
)
ELSE(MODLUA_VERSION MATCHES "^5\\.2$")
find_program(LUA_EXECUTABLE
NAMES lua51
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES bin
PATHS
${LOCALBASE}
)
ENDIF(MODLUA_VERSION MATCHES "^5\\.2$")
ELSE(MODLUA_VERSION)
find_program(LUA_EXECUTABLE
NAMES lua51 lua5.1 lua-5.1 lua52 lua5.2 lua-5.2 lua
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES bin
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
)
ENDIF(MODLUA_VERSION)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LUAINTERP_FOUND to TRUE if
# all listed variables are TRUE
find_package_handle_standard_args(LuaInterp DEFAULT_MSG LUA_EXECUTABLE)
mark_as_advanced(
LUA_EXECUTABLE
)

111
devel/cmake/files/FindLuaLibs.cmake Normal file

@ -0,0 +1,111 @@
# Locate Lua library
# This module defines
# LUALIBS_FOUND
# LUA_LIBRARIES
# LUA_INCLUDE_DIR
#
#=============================================================================
# Copyright 2007-2009 Kitware, Inc.
# Copyright 2011 Peter Colberg
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
SET(MODLUA_VERSION $ENV{MODLUA_VERSION})
IF(MODLUA_VERSION)
IF(MODLUA_VERSION MATCHES "^5\\.2$")
find_path(LUA_INCLUDE_DIR lua.h
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES include/lua-5.2
PATHS
${LOCALBASE}
)
find_library(LUA_LIBRARY
NAMES lua5.2
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES lib
PATHS
${LOCALBASE}
)
ELSE(MODLUA_VERSION MATCHES "^5\\.2$")
find_path(LUA_INCLUDE_DIR lua.h
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES include/lua-5.1
PATHS
${LOCALBASE}
)
find_library(LUA_LIBRARY
NAMES lua5.1
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES lib
PATHS
${LOCALBASE}
)
ENDIF(MODLUA_VERSION MATCHES "^5\\.2$")
ELSE(MODLUA_VERSION)
find_path(LUA_INCLUDE_DIR lua.h
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES include/lua-5.1 include/lua51 include/lua5.1 include/lua-5.2 include/lua52 include/lua5.2 include/lua include
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw # Fink
/opt/local # DarwinPorts
/opt/csw # Blastwave
/opt
)
find_library(LUA_LIBRARY
NAMES lua5.1 lua51 lua-5.1 lua5.2 lua52 lua-5.2 lua
HINTS
$ENV{LUA_DIR}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
/Library/Frameworks
/usr/local
/usr
/sw
/opt/local
/opt/csw
/opt
)
ENDIF(MODLUA_VERSION)
if(LUA_LIBRARY)
# include the math library for Unix
if(UNIX AND NOT APPLE)
find_library(LUA_MATH_LIBRARY m)
set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
# For Windows and Mac, don't need to explicitly include the math library
else(UNIX AND NOT APPLE)
set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
endif(UNIX AND NOT APPLE)
endif(LUA_LIBRARY)
include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set LUALIBS_FOUND to TRUE if
# all listed variables are TRUE
find_package_handle_standard_args(LuaLibs DEFAULT_MSG LUA_LIBRARIES LUA_INCLUDE_DIR)
mark_as_advanced(
LUA_INCLUDE_DIR
LUA_LIBRARIES
LUA_LIBRARY
LUA_MATH_LIBRARY
)

6
devel/cmake/pkg/PLIST

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2012/06/15 10:26:56 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.19 2012/07/10 15:20:24 jasper Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@ -297,8 +297,8 @@ share/cmake/Modules/FindLibLZMA.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/FindLuaInterp.cmake
share/cmake/Modules/FindLuaLibs.cmake
share/cmake/Modules/FindMFC.cmake
share/cmake/Modules/FindMPEG.cmake
share/cmake/Modules/FindMPEG2.cmake

4
x11/awesome/Makefile

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.49 2012/07/09 09:01:54 dcoppa Exp $
# $OpenBSD: Makefile,v 1.50 2012/07/10 15:21:01 jasper Exp $
COMMENT= highly configurable framework window manager
DISTNAME= awesome-3.4.12
REVISION= 0
REVISION= 1
EXTRACT_SUFX= .tar.xz
CATEGORIES= x11

42
x11/awesome/patches/patch-awesomeConfig_cmake

@ -1,6 +1,6 @@
$OpenBSD: patch-awesomeConfig_cmake,v 1.5 2011/11/30 11:50:58 dcoppa Exp $
--- awesomeConfig.cmake.orig Wed Nov 23 15:08:50 2011
+++ awesomeConfig.cmake Wed Nov 30 10:43:32 2011
$OpenBSD: patch-awesomeConfig_cmake,v 1.6 2012/07/10 15:21:01 jasper Exp $
--- awesomeConfig.cmake.orig Mon Jun 11 13:57:35 2012
+++ awesomeConfig.cmake Tue Jul 10 13:44:30 2012
@@ -16,11 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
option(GENERATE_LUADOC "generate luadoc" ON)
@ -18,7 +18,28 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.5 2011/11/30 11:50:58 dcoppa Exp $
-Wstrict-prototypes)
# }}}
@@ -139,9 +139,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
@@ -54,7 +54,8 @@ a_find_program(ASCIIDOC_EXECUTABLE asciidoc FALSE)
a_find_program(XMLTO_EXECUTABLE xmlto FALSE)
a_find_program(GZIP_EXECUTABLE gzip FALSE)
# lua documentation
-a_find_program(LUA_EXECUTABLE lua FALSE)
+include(FindLuaInterp)
+a_find_program(LUA_EXECUTABLE ${LUA_EXECUTABLE} FALSE)
a_find_program(LUADOC_EXECUTABLE luadoc FALSE)
# theme graphics
a_find_program(CONVERT_EXECUTABLE convert TRUE)
@@ -62,8 +63,8 @@ a_find_program(CONVERT_EXECUTABLE convert TRUE)
include(FindDoxygen)
# pkg-config
include(FindPkgConfig)
-# lua 5.1
-include(FindLua51) #Due to a cmake bug, you will see Lua50 on screen
+# lua libraries
+include(FindLuaLibs)
# }}}
# {{{ Check if documentation can be build
@@ -139,9 +140,10 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
xcb-xtest
xcb-xinerama
xcb-shape
@ -31,7 +52,16 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.5 2011/11/30 11:50:58 dcoppa Exp $
xcb-image>=0.3.0
cairo-xcb
libstartup-notification-1.0>=0.10
@@ -239,7 +240,7 @@ endif()
@@ -192,7 +194,7 @@ else()
endif()
# Error check
-if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
+if(NOT LUALIBS_FOUND)
message(FATAL_ERROR "lua library not found")
endif()
@@ -239,7 +241,7 @@ endif()
if(DEFINED SYSCONFDIR)
set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
else()
@ -40,7 +70,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.5 2011/11/30 11:50:58 dcoppa Exp $
endif()
#If an XDG Config Dir is specificed, use it instead
@@ -268,7 +269,7 @@ endif()
@@ -268,7 +270,7 @@ endif()
if(DEFINED AWESOME_MAN_PATH)
set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
else()