- Update to 0.5.2

- Introduce addon support

4 files changed, 72 insertions, 24 deletions

diff --git a/games/blinkensisters/Makefile b/games/blinkensisters/Makefile
index 4e9c9e90eab6..1f1f41da7ab4 100644
--- a/games/blinkensisters/Makefile
+++ b/games/blinkensisters/Makefile
@@ -6,44 +6,80 @@
 #
 
 PORTNAME=	blinkensisters
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.5.2
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTNAME=	LostPixels-${PORTVERSION}-source
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Parallax-style 2D scrolling platform game
 
 USE_SDL=	sdl image ttf
-WRKSRC=		${WRKDIR}//blinkensisters/lostpixels/game/software
+USE_PERL5_BUILD=	yes
 USE_CMAKE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	SOUND	"Build with souns support" on \
-		NETWORK	"Build with network support" on
+WRKSRC=		${WRKDIR}/blinkensisters/lostpixels/game/software
+ADDONS_WRKSRC=	${WRKDIR}/blinkensisters/lostpixels/game/addons
+
+PORTDOCS=	*
+
+OPTIONS=	ADDONS	"Install addons (~200 MB download size)" off \
+		SDL_MIXER	"Build with sound support" on \
+		SDL_NET	"Build with network support" on \
+		THEORA	"Build with theora support" off
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-.if defined(WITHOUT_SOUND)
-	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*SDL_mixer/ d' \
-		${WRKSRC}/CMakeLists.txt
+.if defined(WITH_ADDONS)
+DISTNAME=	LostPixels-${PORTVERSION}-source-with-addons
+PKGNAMESUFFIX=	-with-addons
+PLIST_SUB+=	ADDONS=""
+.else
+DISTNAME=	LostPixels-${PORTVERSION}-source
+PLIST_SUB+=	ADDONS="@comment "
 .endif
 
-.if defined(WITHOUT_NETWORK)
-	@${REINPLACE_CMD} -e '/FIND_PACKAGE.*SDL_net/ d' \
-		${WRKSRC}/CMakeLists.txt
+.if defined(WITHOUT_SDL_MIXER)
+CMAKE_ARGS+=	-DUSE_SDL_MIXER:BOOL=OFF
+PLIST_SUB+=	BLINKENPLAYER="@comment "
+.else
+USE_SDL+=	mixer
+PLIST_SUB+=	BLINKENPLAYER=""
+.endif
+
+.if defined(WITHOUT_SDL_NET)
+CMAKE_ARGS+=	-DUSE_SDL_NET:BOOL=OFF
+.else
+USE_SDL+=	net
 .endif
 
+.if defined(WITH_THEORA)
+CMAKE_ARGS+=	-DUSE_THEORA:BOOL=ON
+.else
+LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
+.endif
+
+post-patch:
 .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
+.if defined(WITH_ADDONS)
+	@${FIND} ${ADDONS_WRKSRC} -name "Makefile" | ${XARGS} \
+		${REINPLACE_CMD} -e 's|bmfcompress|${WRKSRC}/&|'
+.endif
+
+.if defined(WITH_ADDONS)
+post-build:
+	cd ${ADDONS_WRKSRC} && ${MAKE}
+
+post-install:
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${ADDONS_WRKSRC}/for_upload/*.bmf ${DATADIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/games/blinkensisters/distinfo b/games/blinkensisters/distinfo
index e466c8924879..85c66d37f2bb 100644
--- a/games/blinkensisters/distinfo
+++ b/games/blinkensisters/distinfo
@@ -1,3 +1,6 @@
-MD5 (LostPixels-0.5-source.tar.gz) = 3f4f23d16b8f0e47c28755fec01543b0
-SHA256 (LostPixels-0.5-source.tar.gz) = b797b50407bb513c650eac5147a9c9f7ea66a4b591a7d642fe84fdc5790b9a61
-SIZE (LostPixels-0.5-source.tar.gz) = 19902666
+MD5 (LostPixels-0.5.2-source.tar.gz) = 754e2130a56bc6657ee18b86b2a6c5af
+SHA256 (LostPixels-0.5.2-source.tar.gz) = 875b58c99bd20bd139260a77047047922364b5d1dc94f94890c71030a7a37842
+SIZE (LostPixels-0.5.2-source.tar.gz) = 85497588
+MD5 (LostPixels-0.5.2-source-with-addons.tar.gz) = b8be6ea0c96a736952fde5ae8193e9ee
+SHA256 (LostPixels-0.5.2-source-with-addons.tar.gz) = 53269788630deb59b8de98a39658c83d96809c4fafc726786693bd5a5eaaf636
+SIZE (LostPixels-0.5.2-source-with-addons.tar.gz) = 215793276
diff --git a/games/blinkensisters/pkg-descr b/games/blinkensisters/pkg-descr
index bb1de0195fa4..0d928e54afe6 100644
--- a/games/blinkensisters/pkg-descr
+++ b/games/blinkensisters/pkg-descr
@@ -4,4 +4,4 @@ SDL).
 
 You can even make your own levels with a simple text-editor.
 
-WWW: http://blinkensisters.sourceforge.net/
+WWW: http://www.blinkensisters.org/wiki/index.php/Main_Page
diff --git a/games/blinkensisters/pkg-plist b/games/blinkensisters/pkg-plist
index bccd680735a6..29d356b9e286 100644
--- a/games/blinkensisters/pkg-plist
+++ b/games/blinkensisters/pkg-plist
@@ -1,11 +1,20 @@
+%%BLINKENPLAYER%%bin/BlinkenPlayer
 bin/LostPixels
 bin/bmfcompress
 bin/bmfdecompress
+%%DATADIR%%/Gaposis Outline (BRK).ttf
+%%DATADIR%%/Gas Huffer Phat.ttf
+%%DATADIR%%/Georgia.ttf
+%%DATADIR%%/Ghostmeat.ttf
 %%DATADIR%%/basedata.bmf
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/HOWTOPLAY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/splash.jpg
+%%ADDONS%%%%DATADIR%%/24c3.bmf
+%%ADDONS%%%%DATADIR%%/mz_escape.bmf
+%%ADDONS%%%%DATADIR%%/mz_moviepack.bmf
+%%ADDONS%%%%DATADIR%%/mz_pnog.bmf
+%%ADDONS%%%%DATADIR%%/mz_template.bmf
+%%ADDONS%%%%DATADIR%%/mz_xmas2007.bmf
+%%ADDONS%%%%DATADIR%%/s23_ivorytower.bmf
+%%ADDONS%%%%DATADIR%%/theme_standard.bmf
+%%ADDONS%%%%DATADIR%%/theme_xmas2007.bmf
 @dirrm %%DATADIR%%