4 files changed, 46 insertions, 179 deletions

diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index cf5971c3f2d6..255d1bd549d7 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -6,47 +6,52 @@
 #
 
 PORTNAME=	blinkensisters
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	LostPixels_${PORTVERSION}_src
+MASTER_SITES=	SF
+DISTNAME=	LostPixels-${PORTVERSION}-source
 
 MAINTAINER=	amdmi3@amdmi3.ru
 COMMENT=	Parallax-style 2D scrolling platform game
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_SDL=	sdl mixer image ttf
+BUILD_DEPENDS=	${CMAKE}:${PORTSDIR}/devel/cmake
 
-WRKSRC=		${WRKDIR}/LostPixels_${PORTVERSION}
+CMAKE?=		${LOCALBASE}/bin/cmake
 
-MAKE_ARGS=	CC="${CXX}"
+USE_SDL=	sdl image ttf
+WRKSRC=		${WRKDIR}//blinkensisters/lostpixels/game/software
 
-PORTDOCS=	AUTHORS HOWTOPLAY INSTALL README SCRIPTING
+CMAKE_DEFS=	-DCMAKE_C_COMPILER:STRING="${CC}" \
+		-DCMAKE_C_FLAGS:STRING="${CFLAGS} -I${LOCALBASE}/include" \
+		-DCMAKE_CXX_COMPILER:STRING="${CXX}" \
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -I${LOCALBASE}/include" \
+		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX}
+
+OPTIONS=	SOUND	"Build with souns support" on \
+		NETWORK	"Build with network support" on
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" && ${OSVERSION} >= 700000
-BROKEN=		Doesn't build
+post-patch:
+.if defined(WITHOUT_SOUND)
+	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*SDL_mixer/ d' \
+		${WRKSRC}/CMakeLists.txt
+.endif
+
+.if defined(WITHOUT_NETWORK)
+	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*SDL_net/ d' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/LostPixels ${PREFIX}/bin/${PORTNAME}
-
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/TTF/*.ttf ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/SND/*.ogg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/GFX/*.bmp ${WRKSRC}/GFX/*.jpg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/LEVELS/*.dat ${WRKSRC}/LEVELS/*.conf \
-		${WRKSRC}/LEVELS/*.bsl ${DATADIR}
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/^INSTALL.*doc/ d' ${WRKSRC}/CMakeLists.txt
 .endif
 
+	@${REINPLACE_CMD} -e 's|share/blinkensisters|${DATADIR:S,${PREFIX}/,,}|; \
+		s|share/doc/blinkensisters|${DOCSDIR:S,${PREFIX}/,,}|' \
+		${WRKSRC}/CMakeLists.txt
+
+do-configure:
+	cd ${WRKSRC} && ${CMAKE} . ${CMAKE_DEFS}
+
 .include <bsd.port.post.mk>
diff --git a/games/blinkensisters/distinfo b/games/blinkensisters/distinfo
index 98fe3e388202..e466c8924879 100644
--- a/games/blinkensisters/distinfo
+++ b/games/blinkensisters/distinfo
@@ -1,3 +1,3 @@
-MD5 (LostPixels_0.3_src.tar.bz2) = 6b8c669afedeb7246331a05447d1f901
-SHA256 (LostPixels_0.3_src.tar.bz2) = 83e977f31a5fcf2749411850c6d2ec3089c148316ea41f8186a3238e78a8b5fe
-SIZE (LostPixels_0.3_src.tar.bz2) = 12149450
+MD5 (LostPixels-0.5-source.tar.gz) = 3f4f23d16b8f0e47c28755fec01543b0
+SHA256 (LostPixels-0.5-source.tar.gz) = b797b50407bb513c650eac5147a9c9f7ea66a4b591a7d642fe84fdc5790b9a61
+SIZE (LostPixels-0.5-source.tar.gz) = 19902666
diff --git a/games/blinkensisters/files/patch-Makefile b/games/blinkensisters/files/patch-Makefile
deleted file mode 100644
index 804c323de572..000000000000
--- a/games/blinkensisters/files/patch-Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig	Fri Mar 17 16:03:03 2006
-+++ Makefile	Mon Mar 27 01:01:12 2006
-@@ -12,10 +12,9 @@
- 
- 
- # Commands to use (I recommend the GNU versions (sometimes called gsed, gcp, gtar, ...)
--CC=g++
-+CC?=cc
- GREP=grep
- SED=sed
--SDLCONFIG=sdl-config
- INSTALL=install
- MAKEDEPEND=makedepend
- CP=cp
-@@ -28,7 +27,7 @@
- BZIP2=bzip2
- RPMBUILD=rpmbuild
- 
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- BINDIR=$(PREFIX)/bin
- SHAREDIR=$(PREFIX)/share/blinkensisters
- DOCDIR=$(PREFIX)/share/doc/blinkensisters
-@@ -36,11 +35,8 @@
- # get the version number from globals.h
- VERSION=$(shell $(GREP) "^.define.VERSION" globals.h | $(SED) "s/^.define.VERSION.//" )
- 
--CFLAGS  = -c -Wall -O3 -IBlinkenLUA/headers
--CFLAGS += $(shell $(SDLCONFIG) --cflags)
--CFLAGS += -DRESPATH="\"$(SHAREDIR)/\""
--
--LDFLAGS = $(shell $(SDLCONFIG) --libs)
-+CFLAGS += -c -Wall -IBlinkenLUA/headers `${SDL_CONFIG} --cflags` -DRESPATH="\"$(SHAREDIR)/\""
-+LDFLAGS = `${SDL_CONFIG} --libs`
- 
- 
- SOURCES = ${wildcard *.cpp BlinkenLUA/source/*.cpp}
-@@ -62,7 +58,7 @@
- all: $(EXECUTABLE)
- 
- $(EXECUTABLE): $(OBJECTS) Makefile
--	$(CC) $(LDFLAGS) $(OBJECTS) -o $@ -lSDL -lSDL_mixer -lSDL_image -lSDL_ttf
-+	$(CC) $(LDFLAGS) $(OBJECTS) -o $@ -lSDL_mixer -lSDL_image -lSDL_ttf
- 
- .cpp.o: Makefile
- 	$(CC) $(CFLAGS) $< -o $@
-@@ -113,8 +109,6 @@
- 
- 
- # rule for building dependency lists, and writing them to a file ".depend".
--.depend: $(SOURCES) $(HEADERS)
--	$(MAKEDEPEND) -f- -- $(CFLAGS) -- $(SOURCES) $(HEADERS) > .depend
- 
- 
- tar.gz: clean
-@@ -143,4 +137,4 @@
- # include a dependency file if one exists
- ifeq (.depend,$(wildcard .depend))
- include .depend
--endif
-\ No newline at end of file
-+endif
diff --git a/games/blinkensisters/pkg-plist b/games/blinkensisters/pkg-plist
index 44c28cd1b60a..bccd680735a6 100644
--- a/games/blinkensisters/pkg-plist
+++ b/games/blinkensisters/pkg-plist
@@ -1,87 +1,11 @@
-bin/blinkensisters
-%%DATADIR%%/Gaposis Outline (BRK).ttf
-%%DATADIR%%/Gas Huffer Phat.ttf
-%%DATADIR%%/Ghostmeat.ttf
-%%DATADIR%%/bathtiles.bmp
-%%DATADIR%%/bs_ingame2.ogg
-%%DATADIR%%/fg_door_closed.bmp
-%%DATADIR%%/fg_door_open.bmp
-%%DATADIR%%/fg_emergency_stop.bmp
-%%DATADIR%%/fg_explode_0.bmp
-%%DATADIR%%/fg_explode_1.bmp
-%%DATADIR%%/fg_explode_2.bmp
-%%DATADIR%%/fg_explode_3.bmp
-%%DATADIR%%/fg_hint_level0.jpg
-%%DATADIR%%/fg_huntingseason.bmp
-%%DATADIR%%/fg_huntingseason_neon.bmp
-%%DATADIR%%/fg_machine1.bmp
-%%DATADIR%%/fg_machine2.bmp
-%%DATADIR%%/fg_progress_0.bmp
-%%DATADIR%%/fg_progress_1.bmp
-%%DATADIR%%/fg_progress_2.bmp
-%%DATADIR%%/fg_progress_3.bmp
-%%DATADIR%%/fg_progress_4.bmp
-%%DATADIR%%/fg_progress_5.bmp
-%%DATADIR%%/fg_switch_green.bmp
-%%DATADIR%%/fg_switch_red.bmp
-%%DATADIR%%/fixme_logo.bmp
-%%DATADIR%%/font.bmp
-%%DATADIR%%/fx_close_door.ogg
-%%DATADIR%%/fx_collect_pixel.ogg
-%%DATADIR%%/fx_kill_monster.ogg
-%%DATADIR%%/fx_killed.ogg
-%%DATADIR%%/fx_level0_hint.ogg
-%%DATADIR%%/fx_level_finished.ogg
-%%DATADIR%%/fx_open_door.ogg
-%%DATADIR%%/gameover.jpg
-%%DATADIR%%/gamewon.jpg
-%%DATADIR%%/intro.bmp
-%%DATADIR%%/introMusic.ogg
-%%DATADIR%%/introbg.jpg
-%%DATADIR%%/level0.bsl
-%%DATADIR%%/level0.conf
-%%DATADIR%%/level0.dat
-%%DATADIR%%/level1.conf
-%%DATADIR%%/level1.dat
-%%DATADIR%%/level1.jpg
-%%DATADIR%%/level2.conf
-%%DATADIR%%/level2.dat
-%%DATADIR%%/level2.jpg
-%%DATADIR%%/level3.bsl
-%%DATADIR%%/level3.conf
-%%DATADIR%%/level3.dat
-%%DATADIR%%/level3.jpg
-%%DATADIR%%/level4.conf
-%%DATADIR%%/level4.dat
-%%DATADIR%%/level4.jpg
-%%DATADIR%%/level5.bsl
-%%DATADIR%%/level5.conf
-%%DATADIR%%/level5.dat
-%%DATADIR%%/level5.jpg
-%%DATADIR%%/level6.conf
-%%DATADIR%%/level6.dat
-%%DATADIR%%/level6.jpg
-%%DATADIR%%/level7.conf
-%%DATADIR%%/level7.dat
-%%DATADIR%%/level7.jpg
-%%DATADIR%%/level8.conf
-%%DATADIR%%/level8.dat
-%%DATADIR%%/livelost.jpg
-%%DATADIR%%/loading.jpg
-%%DATADIR%%/menuMusic.ogg
-%%DATADIR%%/menubg.jpg
-%%DATADIR%%/monster1_left.bmp
-%%DATADIR%%/monster1_right.bmp
-%%DATADIR%%/monster2_left.bmp
-%%DATADIR%%/monster2_right.bmp
-%%DATADIR%%/monster3_left.bmp
-%%DATADIR%%/monster3_right.bmp
-%%DATADIR%%/monster4_left.bmp
-%%DATADIR%%/monster4_right.bmp
-%%DATADIR%%/monster5_left.bmp
-%%DATADIR%%/monster5_right.bmp
-%%DATADIR%%/sister_moveleft.bmp
-%%DATADIR%%/sister_moveright.bmp
-%%DATADIR%%/sisters_orient.ogg
-%%DATADIR%%/weirdtiles.bmp
+bin/LostPixels
+bin/bmfcompress
+bin/bmfdecompress
+%%DATADIR%%/basedata.bmf
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/HOWTOPLAY
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%