use MAKE_PROGRAM when we mean that, instead of MAKE

remove unecessary lib_depends
don't hardcode /usr/local or /usr/X11R6
bump

pointed out by, and OK ajacoutot@
This commit is contained in:
phessler 2009-10-09 23:45:19 +00:00
parent 96f0db9805
commit 002fe30d50
2 changed files with 13 additions and 11 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/10/09 22:09:22 phessler Exp $
# $OpenBSD: Makefile,v 1.2 2009/10/09 23:45:19 phessler Exp $
COMMENT = blinkensisters - hunt for the lost pixels
V = 0.5.3
DISTNAME = LostPixels-${V}-source-with-addons
PKGNAME = lostpixels-${V}
PKGNAME = lostpixels-${V}p0
HOMEPAGE = http://www.blinkensisters.org
CATEGORIES = games
@ -22,7 +22,6 @@ LIB_DEPENDS = SDL_net::devel/sdl-net \
SDL_image::devel/sdl-image \
SDL_mixer::devel/sdl-mixer \
SDL_ttf::devel/sdl-ttf \
::audio/libogg \
::audio/libvorbis
WANTLIB += SDL X11 Xau Xdmcp Xext Xrandr Xrender c freetype m
@ -37,16 +36,17 @@ WRKDIST = ${WRKDIR}/blinkensisters/lostpixels/game/software/
NO_REGRESS = Yes
pre-configure:
@perl -pi -e 's,make,${MAKE},g ; s,/usr/local,\$$\{PREFIX},g' \
${SUBST_CMD} ${WRKDIST}CMakeLists.txt
@perl -pi -e 's,make,${MAKE_PROGRAM},g ; s,/usr/local,\$$\{PREFIX},g' \
${WRKDIST}/../addons/Makefile
@find ${WRKDIST}/../addons/ -name Makefile -exec \
perl -pi -e 's,bmfcompress,${WRKDIST}/bmfcompress,g' {} \;
post-build:
cd ${WRKDIST}/../addons && $(MAKE) all
cd ${WRKDIST}/../addons && ${MAKE_PROGRAM} all
post-install:
mv ${PREFIX}/bin/LostPixels ${PREFIX}/bin/lostpixels
cd ${WRKDIST}/../addons && $(MAKE) install
cd ${WRKDIST}/../addons && ${MAKE_PROGRAM} install
.include <bsd.port.mk>

View File

@ -1,11 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2009/10/09 22:09:22 phessler Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2009/10/09 23:45:19 phessler Exp $
--- CMakeLists.txt.orig Sat Dec 6 21:51:54 2008
+++ CMakeLists.txt Sun Jul 5 21:09:53 2009
@@ -20,6 +20,7 @@ INCLUDE_DIRECTORIES(. BlinkenBMF/ SDL_gfx/ BlinkenLUA/
+++ CMakeLists.txt Sat Oct 10 01:19:48 2009
@@ -19,7 +19,8 @@ endif(COMMAND cmake_policy)
INCLUDE_DIRECTORIES(. BlinkenBMF/ SDL_gfx/ BlinkenLUA/LuaBindings/headers/ BlinkenLUA/LuaMain/headers/ BlinkenLib/headers/)
# Fixes a problem on FreeBSD - SDL_stdinc.h includes iconv.h, but that is in
# /usr/local/include/iconv.h, which is not searched for include files...
INCLUDE_DIRECTORIES(/usr/local/include)
+LINK_DIRECTORIES(/usr/X11R6/lib)
-INCLUDE_DIRECTORIES(/usr/local/include)
+INCLUDE_DIRECTORIES(${TRUEPREFIX}/include)
+LINK_DIRECTORIES(${X11BASE}/lib)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake-modules/)