Use cmake arguments instead of patches/buildlink hacking.
Suggested by Jaka Kranjc.
This commit is contained in:
parent
2bc3ffcb52
commit
27a0b762ae
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.5 2011/08/22 13:41:00 thomasklausner Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2012/09/13 12:31:33 thomasklausner Exp $
|
||||
#
|
||||
|
||||
DISTNAME= gemrb-0.6.5
|
||||
|
@ -17,8 +17,9 @@ USE_LIBTOOL= yes
|
|||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gmake pkg-config
|
||||
|
||||
BUILDLINK_TRANSFORM+= rm:-Werror
|
||||
CMAKE_ARGS+= -DDISABLE_WERROR=1
|
||||
CMAKE_ARGS+= -DINSOURCEBUILD=1
|
||||
CMAKE_ARGS+= -DMAN_DIR:PATH=${PREFIX}/${PKGMANDIR}/man6
|
||||
CMAKE_ARGS+= -DSDLMIXER_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_mixer}/include
|
||||
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/gemrb
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: distinfo,v 1.7 2011/08/22 13:41:00 thomasklausner Exp $
|
||||
$NetBSD: distinfo,v 1.8 2012/09/13 12:31:33 thomasklausner Exp $
|
||||
|
||||
SHA1 (gemrb-0.6.5.tar.gz) = db464d74e7fc9bb488ee93094b43d602f7786b9e
|
||||
RMD160 (gemrb-0.6.5.tar.gz) = 1c88b5075a1a4d04634bcf10049f5653e18a4608
|
||||
Size (gemrb-0.6.5.tar.gz) = 1876212 bytes
|
||||
SHA1 (patch-aa) = 33a8fb98d3bf703fe538bad3ed84a5e7fe3eda18
|
||||
SHA1 (patch-ab) = c912a4f134ed3b26a1ad782b694dc910612ab4ee
|
||||
SHA1 (patch-ad) = f660da4c016539d53df4dc0b1bd5f9918dd07689
|
||||
SHA1 (patch-ad) = c108420e03302d8d96b82b529e275452cb870b72
|
||||
|
|
|
@ -1,19 +1,9 @@
|
|||
$NetBSD: patch-ad,v 1.4 2011/08/22 13:41:00 thomasklausner Exp $
|
||||
$NetBSD: patch-ad,v 1.5 2012/09/13 12:31:34 thomasklausner Exp $
|
||||
|
||||
Fix installation path for man pages for pkgsrc.
|
||||
Fix linking with gcc-4.5.
|
||||
|
||||
--- CMakeLists.txt.orig 2011-07-24 12:10:13.000000000 +0000
|
||||
+++ CMakeLists.txt
|
||||
@@ -78,7 +78,7 @@ elseif (${LAYOUT} MATCHES "fhs")
|
||||
SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/gemrb )
|
||||
SET_PATH( PLUGIN_DIR ${LIB_DIR}/plugins )
|
||||
SET_PATH( DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/gemrb )
|
||||
- SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man6 )
|
||||
+ SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
|
||||
SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
|
||||
IF( NOT SYSCONF_DIR )
|
||||
if ( ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr" )
|
||||
@@ -249,6 +251,7 @@ MACRO(ADD_GEMRB_PLUGIN plugin_name)
|
||||
if (NOT UNSAFE_PLUGIN)
|
||||
TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
|
Loading…
Reference in New Issue