From dacd5a2345928d921f5641ca5561aac1cda79a0e Mon Sep 17 00:00:00 2001 From: pav Date: Tue, 24 Jan 2006 17:20:27 +0000 Subject: - Update to 1.3.8 PR: ports/92237 Submitted by: Pierre-Paul Lavoie (maintainer) --- games/holotz-castle/Makefile | 2 +- games/holotz-castle/distinfo | 6 +- games/holotz-castle/files/patch-all | 354 +++--------------------------------- games/holotz-castle/pkg-plist | 17 ++ 4 files changed, 43 insertions(+), 336 deletions(-) (limited to 'games/holotz-castle') diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile index 40361b67c368..d6e02ce382b3 100644 --- a/games/holotz-castle/Makefile +++ b/games/holotz-castle/Makefile @@ -6,7 +6,7 @@ # PORTNAME= holotz-castle -PORTVERSION= 1.3.7 +PORTVERSION= 1.3.8 CATEGORIES= games MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src diff --git a/games/holotz-castle/distinfo b/games/holotz-castle/distinfo index 923ab373ad64..0042e2280cc7 100644 --- a/games/holotz-castle/distinfo +++ b/games/holotz-castle/distinfo @@ -1,3 +1,3 @@ -MD5 (holotz-castle-1.3.7-src.tar.gz) = 571be7f4dadf81f0eb5df7bee65d215b -SHA256 (holotz-castle-1.3.7-src.tar.gz) = ab25f02657a55e70d0dd1b3cb2e911e45639477fc67084fd3372148779debf32 -SIZE (holotz-castle-1.3.7-src.tar.gz) = 3612543 +MD5 (holotz-castle-1.3.8-src.tar.gz) = 0d842884c943ef200b37057de7ee9f3a +SHA256 (holotz-castle-1.3.8-src.tar.gz) = abb09158f8c6b4d105cdb7979e8f5b721f3cba17ceff3e7b12e3d1ed6bf78158 +SIZE (holotz-castle-1.3.8-src.tar.gz) = 3612345 diff --git a/games/holotz-castle/files/patch-all b/games/holotz-castle/files/patch-all index 2b913bfb4bbb..a9313d4da8ce 100644 --- a/games/holotz-castle/files/patch-all +++ b/games/holotz-castle/files/patch-all @@ -1,161 +1,6 @@ -diff -ru JLib/JLib/Graphics/JControlImage.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JControlImage.h ---- JLib/JLib/Graphics/JControlImage.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JControlImage.h Tue Jan 3 20:16:47 2006 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - - /** Control de interfaz de usuario compuesto por imágenes. - */ -diff -ru JLib/JLib/Graphics/JFont.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h ---- JLib/JLib/Graphics/JFont.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JFont.h Tue Jan 3 20:16:47 2006 -@@ -31,7 +31,7 @@ - #define _JFONT_INCLUDED - - #include --#include -+#include - #include - - /** Alineación del texto a renderizar. -diff -ru JLib/JLib/Graphics/JGLAxes.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h ---- JLib/JLib/Graphics/JGLAxes.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLAxes.h Tue Jan 3 20:16:47 2006 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - - class JGLAxes : public JDrawable -diff -ru JLib/JLib/Graphics/JGLCamera.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h ---- JLib/JLib/Graphics/JGLCamera.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLCamera.h Tue Jan 3 20:16:47 2006 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff -ru JLib/JLib/Graphics/JGLGrid.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h ---- JLib/JLib/Graphics/JGLGrid.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLGrid.h Tue Jan 3 20:16:47 2006 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - - class JGLGrid : public JDrawable -diff -ru JLib/JLib/Graphics/JGLLight.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h ---- JLib/JLib/Graphics/JGLLight.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLLight.h Tue Jan 3 20:16:47 2006 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - // Clase para gestión de texturas -diff -ru JLib/JLib/Graphics/JGLText.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h ---- JLib/JLib/Graphics/JGLText.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLText.h Tue Jan 3 20:16:47 2006 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - class JGLText : public JObject -diff -ru JLib/JLib/Graphics/JGLVector.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h ---- JLib/JLib/Graphics/JGLVector.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JGLVector.h Tue Jan 3 20:16:47 2006 -@@ -32,7 +32,7 @@ - - #include - #include --#include -+#include - #include - - /** Vector en pantalla para OpenGL. -diff -ru JLib/JLib/Graphics/JImage.h holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h ---- JLib/JLib/Graphics/JImage.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Graphics/JImage.h Tue Jan 3 20:16:47 2006 -@@ -36,8 +36,8 @@ - #include - #include - #include --#include --#include -+#include -+#include - - /** Imágen genérica. - */ -diff -ru JLib/JLib/Sound/JChunk.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h ---- JLib/JLib/Sound/JChunk.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JChunk.h Tue Jan 3 20:16:47 2006 -@@ -30,7 +30,7 @@ - #ifndef _JCHUNK_INCLUDED - #define _JCHUNK_INCLUDED - --#include -+#include - - /** Encapsula una muestra de audio. - */ -diff -ru JLib/JLib/Sound/JMixer.h holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h ---- JLib/JLib/Sound/JMixer.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Sound/JMixer.h Tue Jan 3 20:16:47 2006 -@@ -30,7 +30,7 @@ - #ifndef _JMIXER_INCLUDED - #define _JMIXER_INCLUDED - --#include -+#include - #include - #include - -diff -ru JLib/JLib/Util/JApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h ---- JLib/JLib/Util/JApp.h Tue Jan 3 13:42:42 2006 -+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JApp.h Tue Jan 3 20:16:47 2006 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -@@ -53,7 +53,7 @@ - *
-  * 
-  * #include 
-- * #include 
-+ * #include 
-  * #include 
-  * 
-  * class MyApp : public JApp
-diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp
---- JLib/JLib/Util/JFS.cpp	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp	Wed Jan  4 01:20:59 2006
+diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp
+--- JLib/JLib/Util/JFS.cpp	Fri Jan 20 08:59:37 2006
++++ holotz-castle-1.3.8-src/JLib/JLib/Util/JFS.cpp	Mon Jan 23 21:21:36 2006
 @@ -886,8 +886,8 @@
  		s32 n, k;
  
@@ -167,184 +12,29 @@ diff -ru JLib/JLib/Util/JFS.cpp holotz-castle-1.3.7-src/JLib/JLib/Util/JFS.cpp
  
  		if (n < 0)
  		{
-diff -ru JLib/JLib/Util/JFile.h holotz-castle-1.3.7-src/JLib/JLib/Util/JFile.h
---- JLib/JLib/Util/JFile.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JFile.h	Tue Jan  3 20:16:47 2006
-@@ -38,7 +38,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include 
- #include 
- 
-diff -ru JLib/JLib/Util/JGLApp.h holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h
---- JLib/JLib/Util/JGLApp.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JGLApp.h	Tue Jan  3 20:16:47 2006
-@@ -35,7 +35,7 @@
- #endif
- 
- #include 
--#include 
-+#include 
- #include 
- #include 
- #include 
-diff -ru JLib/JLib/Util/JRW.h holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h
---- JLib/JLib/Util/JRW.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JRW.h	Tue Jan  3 20:16:47 2006
-@@ -33,8 +33,8 @@
- #include 
- #include 
- #include 
--#include 
--#include 
-+#include 
-+#include 
- 
- /** Encapsulates a SDL_RWops object. It's a simple wrapper.
-  */
-diff -ru JLib/JLib/Util/JTextUtil.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h
---- JLib/JLib/Util/JTextUtil.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTextUtil.h	Tue Jan  3 20:16:47 2006
-@@ -30,7 +30,7 @@
- #define _JTEXTUTIL_INCLUDED
- 
- #include 
--#include 
-+#include 
- //#include 
- 
- // Crea una superficie en formato RGBA de 32 bits con los caracteres en
-diff -ru JLib/JLib/Util/JThread.h holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h
---- JLib/JLib/Util/JThread.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JThread.h	Tue Jan  3 20:16:47 2006
-@@ -31,8 +31,8 @@
- #define _JTHREAD_INCLUDED
- 
- #include 
--#include 
--#include 
-+#include 
-+#include 
- 
- /** Base class for threads.
-  */
-diff -ru JLib/JLib/Util/JTimer.h holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h
---- JLib/JLib/Util/JTimer.h	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/JLib/Util/JTimer.h	Tue Jan  3 20:16:47 2006
-@@ -32,7 +32,7 @@
- 
- #include 
- #include 
--#include 
-+#include 
- #include 
- #include 
- #include 
-diff -ru JLib/Makefile holotz-castle-1.3.7-src/JLib/Makefile
---- JLib/Makefile	Tue Jan  3 13:42:42 2006
-+++ holotz-castle-1.3.7-src/JLib/Makefile	Wed Jan  4 12:23:28 2006
-@@ -15,8 +15,8 @@
- 					$(UTIL)/JApp.o $(UTIL)/JFS.o $(UTIL)/JThread.o $(UTIL)/JRW.o $(MATH)/J2DPolygon.o
- 
- # Definir -D_JLIB_DEBUG para hacer debug de JLib. Compilar el programa a debugear también con este flag
--CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
--LDFLAGS=-L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
-+CFLAGS=`sdl11-config --cflags` -I/usr/X11R6/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow -Winline
-+LDFLAGS=`sdl11-config --libs` -L/usr/X11R6/lib -L. -ffast-math -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer
- 
- all: libJLib
- 
-diff -ru Makefile holotz-castle-1.3.7-src/Makefile
---- Makefile	Tue Jan  3 13:42:45 2006
-+++ holotz-castle-1.3.7-src/Makefile	Wed Jan  4 12:11:52 2006
-@@ -5,11 +5,11 @@
- HC_VERSION=1.3.7
- 
- all: 
--	make -C src
-+	$(MAKE) -C src
- 
- distro-src:
- 	find . -iname "*~" -exec 'rm' '{}' ';';
--	make clean;
-+	$(MAKE) clean;
- 	rm -rf _DISTRO/SRC;
- 	mkdir -p _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src;\
- 	cp -RL [^_h]* _DISTRO/SRC/holotz-castle-$(HC_VERSION)-src &&\
-@@ -20,7 +20,7 @@
- 
- distro-i486:
- 	find . -iname "*~" -exec 'rm' '{}' ';';
--	make I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
-+	$(MAKE) I486_BUILD=1 CPU_OPTS="-march=i486 -mcpu=i486" &&\
- 	rm -rf _DISTRO/I486;
- 	mkdir -p _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486;
- 	cp -RL holotz-castle holotz-castle-editor res HCedHome doc LICENSE.txt MANUAL* _DISTRO/I486/holotz-castle-$(HC_VERSION)-linux-i486 &&\
-@@ -39,11 +39,11 @@
- 	rm -rf _DISTRO/WIN32/HC;
- 
- install:
--	make -C src install
-+	$(MAKE) -C src install
- 
- uninstall:
--	make -C src uninstall;
-+	$(MAKE) -C src uninstall;
- 
- .PHONY: clean
- clean:
--	make -C src clean
-+	$(MAKE) -C src clean
-diff -ru src/Makefile holotz-castle-1.3.7-src/src/Makefile
---- src/Makefile	Tue Jan  3 13:42:45 2006
-+++ holotz-castle-1.3.7-src/src/Makefile	Wed Jan  4 13:29:39 2006
-@@ -18,10 +18,10 @@
- # 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_BASE = /usr/share/games/holotz-castle/
- HC_DATA = $(HC_BASE)game/
- HCED_DATA = $(HC_BASE)editor/
--HC_BIN_DIR = /usr/local/bin/
-+#HC_BIN_DIR = /usr/local/bin/
+diff -ru JLib/Makefile holotz-castle-1.3.8-src/JLib/Makefile
+--- JLib/Makefile	Fri Jan 20 08:59:37 2006
++++ holotz-castle-1.3.8-src/JLib/Makefile	Mon Jan 23 21:20:53 2006
+@@ -19,7 +19,7 @@
  endif
  
- DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
-@@ -38,22 +38,22 @@
+ # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
+-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
++CFLAGS=-I$(X11BASE)/include -I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
+ 
+ # Sample LDFLAGS for applications
+ # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
+diff -ru src/Makefile holotz-castle-1.3.8-src/src/Makefile
+--- src/Makefile	Fri Jan 20 08:59:38 2006
++++ holotz-castle-1.3.8-src/src/Makefile	Mon Jan 23 21:12:33 2006
+@@ -42,8 +42,8 @@
  
  # 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=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c $(shell sdl-config --cflags)
--LDFLAGS=-L/usr/X11R6/lib -ffast-math -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
-+CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c $(shell sdl11-config --cflags)
-+LDFLAGS=-L/usr/X11R6/lib `sdl11-config --libs ` -ffast-math -lSDL_image -lSDL_mixer -lSDL_ttf
+-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
+-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
++CFLAGS=-I$(X11BASE)/include -I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
++LDFLAGS=-L$(X11BASE)/lib -L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
  
- JLib: 
--	make -C ../JLib;
-+	$(MAKE) -C ../JLib;
- 
- %.o: %.cpp %.h
- 	g++ $(CFLAGS) $(DEFINES) $< -o $@
- 
- HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
--	g++ $(LDFLAGS) $? -o $@;\
-+	g++ $(LDFLAGS) $? -o $@ -l compat;\
- 	mv HC ../holotz-castle
  
- # HCed (Holotz's Castle editor).
- HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
--	g++ $(LDFLAGS) $? -o $@;\
-+	g++ $(LDFLAGS) $? -o $@ -lcompat;\
- 	mv HCed ../holotz-castle-editor
- 
- install:
-@@ -75,4 +75,4 @@
- 	rm -f ../holotz-castle;\
- 	rm -f ../holotz-castle-editor;\
- 	rm -f *\.o;\
--  make -C ../JLib clean
-+	$(MAKE) -C ../JLib clean
+ JLib: 
diff --git a/games/holotz-castle/pkg-plist b/games/holotz-castle/pkg-plist
index f69a9a14a6e4..3601049bce85 100644
--- a/games/holotz-castle/pkg-plist
+++ b/games/holotz-castle/pkg-plist
@@ -77,6 +77,14 @@ share/holotz-castle/game/menu/eu/menu.txt
 share/holotz-castle/game/menu/fr/menu.txt
 share/holotz-castle/game/menu/ru/menu.txt
 share/holotz-castle/game/menu/ua/menu.txt
+share/holotz-castle/game/messages/cs/messages.txt
+share/holotz-castle/game/messages/de/messages.txt
+share/holotz-castle/game/messages/en/messages.txt
+share/holotz-castle/game/messages/es/messages.txt
+share/holotz-castle/game/messages/eu/messages.txt
+share/holotz-castle/game/messages/fr/messages.txt
+share/holotz-castle/game/messages/ru/messages.txt
+share/holotz-castle/game/messages/ua/messages.txt
 share/holotz-castle/game/playlist.txt
 share/holotz-castle/game/savedata/empty.txt
 share/holotz-castle/game/sound/HCBeginLevel.wav
@@ -1415,6 +1423,15 @@ share/holotz-castle/game/theme/dungeons/rope/2/top.tga
 @dirrm share/holotz-castle/game/stories
 @dirrm share/holotz-castle/game/sound
 @dirrm share/holotz-castle/game/savedata
+@dirrm share/holotz-castle/game/messages/ua
+@dirrm share/holotz-castle/game/messages/ru
+@dirrm share/holotz-castle/game/messages/fr
+@dirrm share/holotz-castle/game/messages/eu
+@dirrm share/holotz-castle/game/messages/es
+@dirrm share/holotz-castle/game/messages/en
+@dirrm share/holotz-castle/game/messages/de
+@dirrm share/holotz-castle/game/messages/cs
+@dirrm share/holotz-castle/game/messages
 @dirrm share/holotz-castle/game/menu/ua
 @dirrm share/holotz-castle/game/menu/ru
 @dirrm share/holotz-castle/game/menu/fr
-- 
cgit