From owner-svn-ports-all@FreeBSD.ORG Tue Dec 2 23:29:21 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A374472C; Tue, 2 Dec 2014 23:29:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84643601; Tue, 2 Dec 2014 23:29:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB2NTLLl013574; Tue, 2 Dec 2014 23:29:21 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB2NTKuc013567; Tue, 2 Dec 2014 23:29:20 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412022329.sB2NTKuc013567@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 2 Dec 2014 23:29:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373796 - in head/games/blockout: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Dec 2014 23:29:21 -0000 Author: amdmi3 Date: Tue Dec 2 23:29:20 2014 New Revision: 373796 URL: https://svnweb.freebsd.org/changeset/ports/373796 QAT: https://qat.redports.org/buildarchive/r373796/ Log: - Add LICENSE - Fix patch line endings - Simplify installation - Don't require user to manually specify path to datadir - Don't install needless static library - Drop @dirrm* from plist Added: head/games/blockout/files/patch-BlockOut__Utils.cpp (contents, props changed) Deleted: head/games/blockout/files/pkg-message.in Modified: head/games/blockout/Makefile head/games/blockout/files/patch-gif.c head/games/blockout/pkg-plist Modified: head/games/blockout/Makefile ============================================================================== --- head/games/blockout/Makefile Tue Dec 2 23:19:03 2014 (r373795) +++ head/games/blockout/Makefile Tue Dec 2 23:29:20 2014 (r373796) @@ -12,33 +12,26 @@ DISTNAME= bl24-src-linux-i586 MAINTAINER= ports@FreeBSD.org COMMENT= BlockOut II is an adaptation of the original Blockout DOS game +LICENSE= GPLv2 # or later + ONLY_FOR_ARCHS= i386 USE_SDL= mixer sdl -USES= gmake +USES= gmake dos2unix +DOS2UNIX_FILES= ${WRKSRC}/ImageLib/src/gif/gif.c USE_GL= gl glu WRKSRC= ${WRKDIR}/bl24_lin_src BUILD_WRKSRC= ${WRKSRC}/BlockOut -SUB_FILES= pkg-message +post-patch: + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/BlockOut/Utils.cpp pre-build: - cd ${WRKSRC}/ImageLib/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} + cd ${WRKSRC}/ImageLib/src && ${DO_MAKE_BUILD} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/ImageLib/src/libimagelib.a ${STAGEDIR}${PREFIX}/lib - @${MKDIR} ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DATADIR}/sounds - @${MKDIR} ${STAGEDIR}${DATADIR}/images -. for i in allPieces background background2 background3 font gameover gameovera marble \ -marbleg menuback menucredits menufont menufont2 menupit online onlinea spark sparka sprites spritesa star_crystal_grid - ${INSTALL_DATA} ${WRKSRC}/BlockOut/images/${i}.png ${STAGEDIR}${DATADIR}/images -. endfor -. for s in blub empty empty2 hit level level2 line line2 tchh welldone welldone2 wozz - ${INSTALL_DATA} ${WRKSRC}/BlockOut/sounds/${s}.wav ${STAGEDIR}${DATADIR}/sounds -. endfor - ${INSTALL_DATA} ${WRKSRC}/BlockOut/sounds/music.mp3 ${STAGEDIR}${DATADIR}/sounds + ${INSTALL_PROGRAM} ${WRKSRC}/BlockOut/blockout ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC}/BlockOut && ${COPYTREE_SHARE} "images sounds" ${STAGEDIR}${DATADIR} .include Added: head/games/blockout/files/patch-BlockOut__Utils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blockout/files/patch-BlockOut__Utils.cpp Tue Dec 2 23:29:20 2014 (r373796) @@ -0,0 +1,16 @@ +--- BlockOut/Utils.cpp.orig 2008-01-09 21:29:06.000000000 +0300 ++++ BlockOut/Utils.cpp 2014-12-02 07:58:58.452013513 +0300 +@@ -162,11 +162,9 @@ + return FALSE; + } + +- char *blockoutHome = getenv("BL2_HOME"); ++ const char *blockoutHome = getenv("BL2_HOME"); + if( blockoutHome==NULL ) { +- printf("BL2_HOME environement variable if not defined !\n"); +- printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n"); +- return FALSE; ++ blockoutHome="%%DATADIR%%"; + } + strcpy( bl2Home , blockoutHome ); + Modified: head/games/blockout/files/patch-gif.c ============================================================================== --- head/games/blockout/files/patch-gif.c Tue Dec 2 23:19:03 2014 (r373795) +++ head/games/blockout/files/patch-gif.c Tue Dec 2 23:29:20 2014 (r373796) @@ -1,11 +1,11 @@ --- ImageLib/src/gif/gif.c.orig 2009-08-07 15:16:48.000000000 -0400 +++ ImageLib/src/gif/gif.c 2009-08-07 15:19:01.000000000 -0400 @@ -4,7 +4,7 @@ - /* Use an ultra fast compression method */ - /***************************************************/ - #include --#include -+#include - #include - #include "gif.h" - + /* Use an ultra fast compression method */ + /***************************************************/ + #include +-#include ++#include + #include + #include "gif.h" + Modified: head/games/blockout/pkg-plist ============================================================================== --- head/games/blockout/pkg-plist Tue Dec 2 23:19:03 2014 (r373795) +++ head/games/blockout/pkg-plist Tue Dec 2 23:29:20 2014 (r373796) @@ -1,5 +1,4 @@ bin/blockout -lib/libimagelib.a %%DATADIR%%/images/allPieces.png %%DATADIR%%/images/background.png %%DATADIR%%/images/background2.png @@ -34,6 +33,3 @@ lib/libimagelib.a %%DATADIR%%/sounds/welldone.wav %%DATADIR%%/sounds/welldone2.wav %%DATADIR%%/sounds/wozz.wav -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%