From owner-svn-ports-all@FreeBSD.ORG Tue May 13 21:31:43 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 333AEA61; Tue, 13 May 2014 21:31:43 +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 1FF292101; Tue, 13 May 2014 21:31:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DLVgVK008672; Tue, 13 May 2014 21:31:42 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DLVgp3008668; Tue, 13 May 2014 21:31:42 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201405132131.s4DLVgp3008668@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 13 May 2014 21:31:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354001 - in head/games/holotz-castle: . 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 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, 13 May 2014 21:31:43 -0000 Author: nemysis Date: Tue May 13 21:31:41 2014 New Revision: 354001 URL: http://svnweb.freebsd.org/changeset/ports/354001 QAT: https://qat.redports.org/buildarchive/r354001/ Log: - Fix STAGEDIR, add USES desthack, change MAKE_ARGS - Change installation handling for executable - Recreate patches with make makepatch Added: head/games/holotz-castle/files/patch-JLib__JLib__Util__JFS.cpp (contents, props changed) head/games/holotz-castle/files/patch-JLib__Makefile (contents, props changed) head/games/holotz-castle/files/patch-src__Makefile (contents, props changed) Deleted: head/games/holotz-castle/files/patch-JLib-JLib-Util-JFS.cpp head/games/holotz-castle/files/patch-JLib-Makefile head/games/holotz-castle/files/patch-src-Makefile Modified: head/games/holotz-castle/Makefile Modified: head/games/holotz-castle/Makefile ============================================================================== --- head/games/holotz-castle/Makefile Tue May 13 21:25:15 2014 (r354000) +++ head/games/holotz-castle/Makefile Tue May 13 21:31:41 2014 (r354001) @@ -18,13 +18,11 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src -MAKE_ARGS= HC_BASE=${STAGEDIR}${PREFIX}/share/${PORTNAME}/ \ - HC_BIN_DIR=${STAGEDIR}${PREFIX}/bin/ -MAKE_JOBS_UNSAFE= yes - -USES= gmake +USES= gmake desthack USE_GL= gl USE_SDL= image mixer sdl ttf +MAKE_ARGS= HC_BASE=${STAGEDIR}${PREFIX}/share/${PORTNAME}/ +MAKE_JOBS_UNSAFE= yes INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 @@ -47,6 +45,9 @@ EXTRACT_ONLY+= ${PORTNAME}_solutions${EX .endif post-install: +.for f in ${PORTNAME} ${PORTNAME}-editor + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${f} ${STAGEDIR}${PREFIX}/bin/) +.endfor .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ @@ -62,7 +63,7 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}-solutions.desktop \ ${STAGEDIR}${DESKTOPDIR} @${MKDIR} ${STAGEDIR}${DATADIR}/solutions - @(cd ${WRKDIR} ; ${INSTALL_DATA} *.avi ${STAGEDIR}${DATADIR}/solutions) + @(cd ${WRKDIR} && ${INSTALL_DATA} *.avi ${STAGEDIR}${DATADIR}/solutions) .endif .include Added: head/games/holotz-castle/files/patch-JLib__JLib__Util__JFS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/holotz-castle/files/patch-JLib__JLib__Util__JFS.cpp Tue May 13 21:31:41 2014 (r354001) @@ -0,0 +1,13 @@ +--- ./JLib/JLib/Util/JFS.cpp.orig 2009-05-02 11:17:15.000000000 +0200 ++++ ./JLib/JLib/Util/JFS.cpp 2014-05-06 09:39:45.658916968 +0200 +@@ -886,8 +886,8 @@ + s32 n, k; + + // Si es un directorio lo importa recursivamente +- struct dirent64 **namelist; +- n = scandir64(filename, &namelist, 0, alphasort); ++ struct dirent **namelist; ++ n = scandir(filename, &namelist, 0, alphasort); + + if (n < 0) + { Added: head/games/holotz-castle/files/patch-JLib__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/holotz-castle/files/patch-JLib__Makefile Tue May 13 21:31:41 2014 (r354001) @@ -0,0 +1,31 @@ +--- ./JLib/Makefile.orig 2009-05-02 11:17:15.000000000 +0200 ++++ ./JLib/Makefile 2014-05-06 09:39:45.658916968 +0200 +@@ -19,7 +19,7 @@ + endif + + # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag +-CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` ++CXXFLAGS+=-I. -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` + + # Sample LDFLAGS for applications + # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` +@@ -28,15 +28,15 @@ + + # JLib + libJLib: $(JLIB_OBJS) +- g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \ ++ $(CXX) -shared -fPIC -o $@.so $? \ + && ar rvus $@.a $? \ + + $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp +- g++-4.1 $(CFLAGS) -c -o $@ $< ++ $(CXX) ${CXXFLAGS} -c -o $@ $< + $(UTIL)/%.o: $(UTIL)/%.cpp +- g++-4.1 $(CFLAGS) -c -o $@ $< ++ $(CXX) ${CXXFLAGS} -c -o $@ $< + $(MATH)/%.o: $(MATH)/%.cpp +- g++-4.1 $(CFLAGS) -c -o $@ $< ++ $(CXX) ${CXXFLAGS} -c -o $@ $< + + .PHONY: install + install: Added: head/games/holotz-castle/files/patch-src__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/holotz-castle/files/patch-src__Makefile Tue May 13 21:31:41 2014 (r354001) @@ -0,0 +1,44 @@ +--- ./src/Makefile.orig 2009-05-02 11:17:15.000000000 +0200 ++++ ./src/Makefile 2014-05-06 09:47:06.888924553 +0200 +@@ -21,12 +21,8 @@ + # Edita estas l�neas para cambiar el directorio de instalaci�n de datos y del juego o bien + # comenta estas l�neas si no quieres instalar el juego (y descomenta las de arriba) + +-ifndef I486_BUILD +-HC_BASE = /usr/share/games/holotz-castle/ + HC_DATA = $(HC_BASE)game/ + HCED_DATA = $(HC_BASE)editor/ +-HC_BIN_DIR = /usr/local/bin/ +-endif + + DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\" + +@@ -42,23 +38,23 @@ + + # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib. + # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile. +-CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c +-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` ++CXXFLAGS+=-I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow -c ++LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` + + + JLib: + $(MAKE) -C ../JLib; + + %.o: %.cpp %.h +- g++ $(CFLAGS) $(DEFINES) $< -o $@ ++ $(CXX) $(CXXFLAGS) $(DEFINES) $< -o $@ + + HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a +- g++ $(LDFLAGS) $? -o $@;\ ++ $(CXX) $(LDFLAGS) $? -o $@;\ + mv HC ../holotz-castle + + # HCed (Holotz's Castle editor). + HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a +- g++ $(LDFLAGS) $? -o $@;\ ++ $(CXX) $(LDFLAGS) $? -o $@;\ + mv HCed ../holotz-castle-editor + + install: