Attachment #89838 for bug #126870

View | Details | Raw Unified | Return to bug 126870
Collapse All | Expand All




#

PORTNAME=	holotz-castle
PORTVERSION=	1.3.11
PORTREVISION=	3
CATEGORIES=	games
MASTER_SITES=	http://www.mainreactor.net/holotzcastle/download/
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

MAINTAINER=	ppl@nbnet.nb.ca
COMMENT=	A platform game with high doses of mystery

MAKE_ARGS=	HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/

USE_GL=		gl
USE_SDL=	image mixer sdl ttf
USE_GMAKE=	yes

IGNORE=		Does not run (No video mode large enough for 676550817x676551540)

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (holotz-castle-1.3.9-src.tar.gz) = e25d7a328d07a9dca36ad80a40e685c0	1	MD5 (holotz-castle-1.3.11-src.tar.gz) = 04cfdfe3bd3152f6a26aad56ef6455cd
2	SHA256 (holotz-castle-1.3.9-src.tar.gz) = 33328a3a5e29ba87acff63c38704df2b824b98ef664d0421b9f33398a764972e	2	SHA256 (holotz-castle-1.3.11-src.tar.gz) = a918cc8832e73f34c8b496a2bcb7a2b5d7093dacea9c826bd3dd289f86f08735
3	SIZE (holotz-castle-1.3.9-src.tar.gz) = 3617589	3	SIZE (holotz-castle-1.3.11-src.tar.gz) = 3690807

Lines 54-59 Link Here

(-)pkg-plist (+54 lines)
54	%%DATADIR%%/game/help/es/help.txt	54	%%DATADIR%%/game/help/es/help.txt
55	%%DATADIR%%/game/help/eu/help.txt	55	%%DATADIR%%/game/help/eu/help.txt
56	%%DATADIR%%/game/help/fr/help.txt	56	%%DATADIR%%/game/help/fr/help.txt
		57	%%DATADIR%%/game/help/it/help.txt
		58	%%DATADIR%%/game/help/nl/help.txt
57	%%DATADIR%%/game/help/pt/help.txt	59	%%DATADIR%%/game/help/pt/help.txt
58	%%DATADIR%%/game/help/ru/help.txt	60	%%DATADIR%%/game/help/ru/help.txt
59	%%DATADIR%%/game/help/ua/help.txt	61	%%DATADIR%%/game/help/ua/help.txt
Lines 63-70 Link Here
63	%%DATADIR%%/game/intro/en/intro.txt	65	%%DATADIR%%/game/intro/en/intro.txt
64	%%DATADIR%%/game/intro/es/intro.txt	66	%%DATADIR%%/game/intro/es/intro.txt
65	%%DATADIR%%/game/intro/eu/intro.txt	67	%%DATADIR%%/game/intro/eu/intro.txt
		68	%%DATADIR%%/game/intro/ff.tga
66	%%DATADIR%%/game/intro/fr/intro.txt	69	%%DATADIR%%/game/intro/fr/intro.txt
67	%%DATADIR%%/game/intro/intro.tga	70	%%DATADIR%%/game/intro/intro.tga
		71	%%DATADIR%%/game/intro/it/intro.txt
		72	%%DATADIR%%/game/intro/nl/intro.txt
68	%%DATADIR%%/game/intro/pt/intro.txt	73	%%DATADIR%%/game/intro/pt/intro.txt
69	%%DATADIR%%/game/intro/ru/intro.txt	74	%%DATADIR%%/game/intro/ru/intro.txt
70	%%DATADIR%%/game/intro/ua/intro.txt	75	%%DATADIR%%/game/intro/ua/intro.txt
Lines 77-82 Link Here
77	%%DATADIR%%/game/menu/es/menu.txt	82	%%DATADIR%%/game/menu/es/menu.txt
78	%%DATADIR%%/game/menu/eu/menu.txt	83	%%DATADIR%%/game/menu/eu/menu.txt
79	%%DATADIR%%/game/menu/fr/menu.txt	84	%%DATADIR%%/game/menu/fr/menu.txt
		85	%%DATADIR%%/game/menu/it/menu.txt
		86	%%DATADIR%%/game/menu/nl/menu.txt
80	%%DATADIR%%/game/menu/pt/menu.txt	87	%%DATADIR%%/game/menu/pt/menu.txt
81	%%DATADIR%%/game/menu/ru/menu.txt	88	%%DATADIR%%/game/menu/ru/menu.txt
82	%%DATADIR%%/game/menu/ua/menu.txt	89	%%DATADIR%%/game/menu/ua/menu.txt
Lines 86-91 Link Here
86	%%DATADIR%%/game/messages/es/messages.txt	93	%%DATADIR%%/game/messages/es/messages.txt
87	%%DATADIR%%/game/messages/eu/messages.txt	94	%%DATADIR%%/game/messages/eu/messages.txt
88	%%DATADIR%%/game/messages/fr/messages.txt	95	%%DATADIR%%/game/messages/fr/messages.txt
		96	%%DATADIR%%/game/messages/it/messages.txt
		97	%%DATADIR%%/game/messages/nl/messages.txt
89	%%DATADIR%%/game/messages/pt/messages.txt	98	%%DATADIR%%/game/messages/pt/messages.txt
90	%%DATADIR%%/game/messages/ru/messages.txt	99	%%DATADIR%%/game/messages/ru/messages.txt
91	%%DATADIR%%/game/messages/ua/messages.txt	100	%%DATADIR%%/game/messages/ua/messages.txt
Lines 211-216 Link Here
211	%%DATADIR%%/game/stories/holotzcastle/script/fr/level030.hcs	220	%%DATADIR%%/game/stories/holotzcastle/script/fr/level030.hcs
212	%%DATADIR%%/game/stories/holotzcastle/script/fr/level032.hcs	221	%%DATADIR%%/game/stories/holotzcastle/script/fr/level032.hcs
213	%%DATADIR%%/game/stories/holotzcastle/script/fr/level033.hcs	222	%%DATADIR%%/game/stories/holotzcastle/script/fr/level033.hcs
		223	%%DATADIR%%/game/stories/holotzcastle/script/it/level001.hcs
		224	%%DATADIR%%/game/stories/holotzcastle/script/it/level002.hcs
		225	%%DATADIR%%/game/stories/holotzcastle/script/it/level007.hcs
		226	%%DATADIR%%/game/stories/holotzcastle/script/it/level014.hcs
		227	%%DATADIR%%/game/stories/holotzcastle/script/it/level016.hcs
		228	%%DATADIR%%/game/stories/holotzcastle/script/it/level019.hcs
		229	%%DATADIR%%/game/stories/holotzcastle/script/it/level020.hcs
		230	%%DATADIR%%/game/stories/holotzcastle/script/it/level025.hcs
		231	%%DATADIR%%/game/stories/holotzcastle/script/it/level030.hcs
		232	%%DATADIR%%/game/stories/holotzcastle/script/it/level032.hcs
		233	%%DATADIR%%/game/stories/holotzcastle/script/it/level033.hcs
		234	%%DATADIR%%/game/stories/holotzcastle/script/nl/level001.hcs
		235	%%DATADIR%%/game/stories/holotzcastle/script/nl/level002.hcs
		236	%%DATADIR%%/game/stories/holotzcastle/script/nl/level007.hcs
		237	%%DATADIR%%/game/stories/holotzcastle/script/nl/level014.hcs
		238	%%DATADIR%%/game/stories/holotzcastle/script/nl/level016.hcs
		239	%%DATADIR%%/game/stories/holotzcastle/script/nl/level019.hcs
		240	%%DATADIR%%/game/stories/holotzcastle/script/nl/level020.hcs
		241	%%DATADIR%%/game/stories/holotzcastle/script/nl/level025.hcs
		242	%%DATADIR%%/game/stories/holotzcastle/script/nl/level030.hcs
		243	%%DATADIR%%/game/stories/holotzcastle/script/nl/level032.hcs
		244	%%DATADIR%%/game/stories/holotzcastle/script/nl/level033.hcs
214	%%DATADIR%%/game/stories/holotzcastle/script/pt/level001.hcs	245	%%DATADIR%%/game/stories/holotzcastle/script/pt/level001.hcs
215	%%DATADIR%%/game/stories/holotzcastle/script/pt/level002.hcs	246	%%DATADIR%%/game/stories/holotzcastle/script/pt/level002.hcs
216	%%DATADIR%%/game/stories/holotzcastle/script/pt/level007.hcs	247	%%DATADIR%%/game/stories/holotzcastle/script/pt/level007.hcs
Lines 244-249 Link Here
244	%%DATADIR%%/game/stories/holotzcastle/script/ua/level030.hcs	275	%%DATADIR%%/game/stories/holotzcastle/script/ua/level030.hcs
245	%%DATADIR%%/game/stories/holotzcastle/script/ua/level032.hcs	276	%%DATADIR%%/game/stories/holotzcastle/script/ua/level032.hcs
246	%%DATADIR%%/game/stories/holotzcastle/script/ua/level033.hcs	277	%%DATADIR%%/game/stories/holotzcastle/script/ua/level033.hcs
		278	%%DATADIR%%/game/stories/milanb/level001.hlv
		279	%%DATADIR%%/game/stories/milanb/level002.hlv
		280	%%DATADIR%%/game/stories/milanb/level003.hlv
		281	%%DATADIR%%/game/stories/milanb/level004.hlv
		282	%%DATADIR%%/game/stories/milanb/level005.hlv
		283	%%DATADIR%%/game/stories/milanb/level006.hlv
		284	%%DATADIR%%/game/stories/milanb/level007.hlv
		285	%%DATADIR%%/game/stories/milanb/level008.hlv
		286	%%DATADIR%%/game/stories/milanb/level009.hlv
		287	%%DATADIR%%/game/stories/milanb/level010.hlv
		288	%%DATADIR%%/game/stories/milanb/level011.hlv
		289	%%DATADIR%%/game/stories/milanb/level012.hlv
247	%%DATADIR%%/game/theme/default/bar/1/bar.tga	290	%%DATADIR%%/game/theme/default/bar/1/bar.tga
248	%%DATADIR%%/game/theme/default/bar/2/bar.tga	291	%%DATADIR%%/game/theme/default/bar/2/bar.tga
249	%%DATADIR%%/game/theme/default/bar/3/bar.tga	292	%%DATADIR%%/game/theme/default/bar/3/bar.tga
Lines 1425-1433 Link Here
1425	@dirrm %%DATADIR%%/game/theme/default/bar	1468	@dirrm %%DATADIR%%/game/theme/default/bar
1426	@dirrm %%DATADIR%%/game/theme/default	1469	@dirrm %%DATADIR%%/game/theme/default
1427	@dirrm %%DATADIR%%/game/theme	1470	@dirrm %%DATADIR%%/game/theme
		1471	@dirrm %%DATADIR%%/game/stories/milanb
1428	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/ua	1472	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/ua
1429	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/ru	1473	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/ru
1430	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/pt	1474	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/pt
		1475	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/nl
		1476	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/it
1431	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/fr	1477	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/fr
1432	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/eu	1478	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/eu
1433	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/es	1479	@dirrm %%DATADIR%%/game/stories/holotzcastle/script/es
Lines 1442-1447 Link Here
1442	@dirrm %%DATADIR%%/game/messages/ua	1488	@dirrm %%DATADIR%%/game/messages/ua
1443	@dirrm %%DATADIR%%/game/messages/ru	1489	@dirrm %%DATADIR%%/game/messages/ru
1444	@dirrm %%DATADIR%%/game/messages/pt	1490	@dirrm %%DATADIR%%/game/messages/pt
		1491	@dirrm %%DATADIR%%/game/messages/nl
		1492	@dirrm %%DATADIR%%/game/messages/it
1445	@dirrm %%DATADIR%%/game/messages/fr	1493	@dirrm %%DATADIR%%/game/messages/fr
1446	@dirrm %%DATADIR%%/game/messages/eu	1494	@dirrm %%DATADIR%%/game/messages/eu
1447	@dirrm %%DATADIR%%/game/messages/es	1495	@dirrm %%DATADIR%%/game/messages/es
Lines 1452-1457 Link Here
1452	@dirrm %%DATADIR%%/game/menu/ua	1500	@dirrm %%DATADIR%%/game/menu/ua
1453	@dirrm %%DATADIR%%/game/menu/ru	1501	@dirrm %%DATADIR%%/game/menu/ru
1454	@dirrm %%DATADIR%%/game/menu/pt	1502	@dirrm %%DATADIR%%/game/menu/pt
		1503	@dirrm %%DATADIR%%/game/menu/nl
		1504	@dirrm %%DATADIR%%/game/menu/it
1455	@dirrm %%DATADIR%%/game/menu/fr	1505	@dirrm %%DATADIR%%/game/menu/fr
1456	@dirrm %%DATADIR%%/game/menu/eu	1506	@dirrm %%DATADIR%%/game/menu/eu
1457	@dirrm %%DATADIR%%/game/menu/es	1507	@dirrm %%DATADIR%%/game/menu/es
Lines 1463-1468 Link Here
1463	@dirrm %%DATADIR%%/game/intro/ua	1513	@dirrm %%DATADIR%%/game/intro/ua
1464	@dirrm %%DATADIR%%/game/intro/ru	1514	@dirrm %%DATADIR%%/game/intro/ru
1465	@dirrm %%DATADIR%%/game/intro/pt	1515	@dirrm %%DATADIR%%/game/intro/pt
		1516	@dirrm %%DATADIR%%/game/intro/nl
		1517	@dirrm %%DATADIR%%/game/intro/it
1466	@dirrm %%DATADIR%%/game/intro/fr	1518	@dirrm %%DATADIR%%/game/intro/fr
1467	@dirrm %%DATADIR%%/game/intro/eu	1519	@dirrm %%DATADIR%%/game/intro/eu
1468	@dirrm %%DATADIR%%/game/intro/es	1520	@dirrm %%DATADIR%%/game/intro/es
Lines 1474-1479 Link Here
1474	@dirrm %%DATADIR%%/game/help/ua	1526	@dirrm %%DATADIR%%/game/help/ua
1475	@dirrm %%DATADIR%%/game/help/ru	1527	@dirrm %%DATADIR%%/game/help/ru
1476	@dirrm %%DATADIR%%/game/help/pt	1528	@dirrm %%DATADIR%%/game/help/pt
		1529	@dirrm %%DATADIR%%/game/help/nl
		1530	@dirrm %%DATADIR%%/game/help/it
1477	@dirrm %%DATADIR%%/game/help/fr	1531	@dirrm %%DATADIR%%/game/help/fr
1478	@dirrm %%DATADIR%%/game/help/eu	1532	@dirrm %%DATADIR%%/game/help/eu
1479	@dirrm %%DATADIR%%/game/help/es	1533	@dirrm %%DATADIR%%/game/help/es




--- JLib/JLib/Util/JFS.cpp.orig	2008-08-23 22:36:06.000000000 +0400
+++ JLib/JLib/Util/JFS.cpp	2008-08-25 17:58:54.000000000 +0400
@@ -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)
 		{




--- JLib/Makefile.orig	2008-08-23 22:36:06.000000000 +0400
+++ JLib/Makefile	2008-08-25 18:00:54.000000000 +0400
@@ -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:




diff -ruN JLib/JLib/Util/JFS.cpp JLib/JLib/Util/JFS.cpp
--- JLib/JLib/Util/JFS.cpp	2007-11-01 02:27:55.000000000 +0000
+++ JLib/JLib/Util/JFS.cpp	2007-11-01 02:28:00.000000000 +0000
@@ -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)
 		{
diff -ruN JLib/Makefile JLib/Makefile
--- JLib/Makefile	2007-11-01 02:27:55.000000000 +0000
+++ JLib/Makefile	2007-11-01 02:29:12.000000000 +0000
@@ -19,7 +19,7 @@
 endif
 
 # 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$(LOCALBASE)/include -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++ -shared -fPIC -o $@.so $? \
+	$(CXX) -shared -fPIC -o $@.so $? \
 	&& ar rvus $@.a $? \
 
 $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
-	g++ $(CFLAGS) -c -o $@ $<
+	$(CXX) $(CFLAGS) -c -o $@ $<
 $(UTIL)/%.o: $(UTIL)/%.cpp
-	g++ $(CFLAGS) -c -o $@ $<
+	$(CXX) $(CFLAGS) -c -o $@ $<
 $(MATH)/%.o: $(MATH)/%.cpp
-	g++ $(CFLAGS) -c -o $@ $<
+	$(CXX) $(CFLAGS) -c -o $@ $<
 
 .PHONY: install
 install:
diff -ruN src/Makefile src/Makefile
--- src/Makefile	2007-11-01 02:27:56.000000000 +0000
+++ src/Makefile	2007-11-01 02:28:55.000000000 +0000
@@ -42,23 +42,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=-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$(LOCALBASE)/include -I. -I../JLib -Wall -Wshadow $(CPU_OPTS) -c `$(SDL_CONFIG) --cflags`
+LDFLAGS=-L$(LOCALBASE)/lib -L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
 
 
 JLib: 
 	$(MAKE) -C ../JLib;
 
 %.o: %.cpp %.h
-	g++ $(CFLAGS) $(DEFINES) $< -o $@
+	$(CXX) $(CFLAGS) $(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:




--- src/Makefile.orig	2008-08-23 22:36:07.000000000 +0400
+++ src/Makefile	2008-08-25 18:04:07.000000000 +0400
@@ -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:

Return to bug 126870

Lines 6-13 Link Here

(-)Makefile (-5 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= holotz-castle	8	PORTNAME= holotz-castle
9	PORTVERSION= 1.3.9	9	PORTVERSION= 1.3.11
10	PORTREVISION= 3
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/	11	MASTER_SITES= http://www.mainreactor.net/holotzcastle/download/
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Lines 15-26 Link Here
15	MAINTAINER= ppl@nbnet.nb.ca	14	MAINTAINER= ppl@nbnet.nb.ca
16	COMMENT= A platform game with high doses of mystery	15	COMMENT= A platform game with high doses of mystery
17		16
18	MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/ CXX=${CXX}	17	MAKE_ARGS= HC_BASE=${PREFIX}/share/${PORTNAME}/ HC_BIN_DIR=${PREFIX}/bin/
19		18
20	USE_GL= gl	19	USE_GL= gl
21	USE_SDL= image mixer sdl ttf	20	USE_SDL= image mixer sdl ttf
22	USE_GMAKE= yes	21	USE_GMAKE= yes
23		22
24	IGNORE= Does not run (No video mode large enough for 676550817x676551540)
25
26	.include <bsd.port.mk>	23	.include <bsd.port.mk>

Added Link Here

(-)files/patch-JLib-JLib-Util-JFS.cpp (+13 lines)
1	--- JLib/JLib/Util/JFS.cpp.orig 2008-08-23 22:36:06.000000000 +0400
2	+++ JLib/JLib/Util/JFS.cpp 2008-08-25 17:58:54.000000000 +0400
3	@@ -886,8 +886,8 @@
4	s32 n, k;
5
6	// Si es un directorio lo importa recursivamente
7	- struct dirent64 **namelist;
8	- n = scandir64(filename, &namelist, 0, alphasort);
9	+ struct dirent **namelist;
10	+ n = scandir(filename, &namelist, 0, alphasort);
11
12	if (n < 0)
13	{

Added Link Here

(-)files/patch-JLib-Makefile (+31 lines)
1	--- JLib/Makefile.orig 2008-08-23 22:36:06.000000000 +0400
2	+++ JLib/Makefile 2008-08-25 18:00:54.000000000 +0400
3	@@ -19,7 +19,7 @@
4	endif
5
6	# Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
7	-CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
8	+CXXFLAGS+=-I. -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
9
10	# Sample LDFLAGS for applications
11	# LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
12	@@ -28,15 +28,15 @@
13
14	# JLib
15	libJLib: $(JLIB_OBJS)
16	- g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \
17	+ $(CXX) -shared -fPIC -o $@.so $? \
18	&& ar rvus $@.a $? \
19
20	$(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
21	- g++-4.1 $(CFLAGS) -c -o $@ $<
22	+ $(CXX) ${CXXFLAGS} -c -o $@ $<
23	$(UTIL)/%.o: $(UTIL)/%.cpp
24	- g++-4.1 $(CFLAGS) -c -o $@ $<
25	+ $(CXX) ${CXXFLAGS} -c -o $@ $<
26	$(MATH)/%.o: $(MATH)/%.cpp
27	- g++-4.1 $(CFLAGS) -c -o $@ $<
28	+ $(CXX) ${CXXFLAGS} -c -o $@ $<
29
30	.PHONY: install
31	install:

Removed Link Here

(-)files/patch-all (-78 lines)
1	diff -ruN JLib/JLib/Util/JFS.cpp JLib/JLib/Util/JFS.cpp
2	--- JLib/JLib/Util/JFS.cpp 2007-11-01 02:27:55.000000000 +0000
3	+++ JLib/JLib/Util/JFS.cpp 2007-11-01 02:28:00.000000000 +0000
4	@@ -886,8 +886,8 @@
5	s32 n, k;
6
7	// Si es un directorio lo importa recursivamente
8	- struct dirent64 **namelist;
9	- n = scandir64(filename, &namelist, 0, alphasort);
10	+ struct dirent **namelist;
11	+ n = scandir(filename, &namelist, 0, alphasort);
12
13	if (n < 0)
14	{
15	diff -ruN JLib/Makefile JLib/Makefile
16	--- JLib/Makefile 2007-11-01 02:27:55.000000000 +0000
17	+++ JLib/Makefile 2007-11-01 02:29:12.000000000 +0000
18	@@ -19,7 +19,7 @@
19	endif
20
21	# Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
22	-CFLAGS=-I. -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
23	+CFLAGS+=-I$(LOCALBASE)/include -I. -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
24
25	# Sample LDFLAGS for applications
26	# LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
27	@@ -28,15 +28,15 @@
28
29	# JLib
30	libJLib: $(JLIB_OBJS)
31	- g++ -shared -fPIC -o $@.so $? \
32	+ $(CXX) -shared -fPIC -o $@.so $? \
33	&& ar rvus $@.a $? \
34
35	$(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
36	- g++ $(CFLAGS) -c -o $@ $<
37	+ $(CXX) $(CFLAGS) -c -o $@ $<
38	$(UTIL)/%.o: $(UTIL)/%.cpp
39	- g++ $(CFLAGS) -c -o $@ $<
40	+ $(CXX) $(CFLAGS) -c -o $@ $<
41	$(MATH)/%.o: $(MATH)/%.cpp
42	- g++ $(CFLAGS) -c -o $@ $<
43	+ $(CXX) $(CFLAGS) -c -o $@ $<
44
45	.PHONY: install
46	install:
47	diff -ruN src/Makefile src/Makefile
48	--- src/Makefile 2007-11-01 02:27:56.000000000 +0000
49	+++ src/Makefile 2007-11-01 02:28:55.000000000 +0000
50	@@ -42,23 +42,23 @@
51
52	# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
53	# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
54	-CFLAGS=-I. -I../JLib -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c `$(SDL_CONFIG) --cflags`
55	-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
56	+CFLAGS+=-I$(LOCALBASE)/include -I. -I../JLib -Wall -Wshadow $(CPU_OPTS) -c `$(SDL_CONFIG) --cflags`
57	+LDFLAGS=-L$(LOCALBASE)/lib -L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
58
59
60	JLib:
61	$(MAKE) -C ../JLib;
62
63	%.o: %.cpp %.h
64	- g++ $(CFLAGS) $(DEFINES) $< -o $@
65	+ $(CXX) $(CFLAGS) $(DEFINES) $< -o $@
66
67	HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
68	- g++ $(LDFLAGS) $? -o $@;\
69	+ $(CXX) $(LDFLAGS) $? -o $@;\
70	mv HC ../holotz-castle
71
72	# HCed (Holotz's Castle editor).
73	HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
74	- g++ $(LDFLAGS) $? -o $@;\
75	+ $(CXX) $(LDFLAGS) $? -o $@;\
76	mv HCed ../holotz-castle-editor
77
78	install:

Added Link Here

(-)files/patch-src-Makefile (+44 lines)
1	--- src/Makefile.orig 2008-08-23 22:36:07.000000000 +0400
2	+++ src/Makefile 2008-08-25 18:04:07.000000000 +0400
3	@@ -21,12 +21,8 @@
4	# Edita estas l�neas para cambiar el directorio de instalaci�n de datos y del juego o bien
5	# comenta estas l�neas si no quieres instalar el juego (y descomenta las de arriba)
6
7	-ifndef I486_BUILD
8	-HC_BASE = /usr/share/games/holotz-castle/
9	HC_DATA = $(HC_BASE)game/
10	HCED_DATA = $(HC_BASE)editor/
11	-HC_BIN_DIR = /usr/local/bin/
12	-endif
13
14	DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
15
16	@@ -42,23 +38,23 @@
17
18	# Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
19	# Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
20	-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
21	-LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
22	+CXXFLAGS+=-I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow -c
23	+LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
24
25
26	JLib:
27	$(MAKE) -C ../JLib;
28
29	%.o: %.cpp %.h
30	- g++ $(CFLAGS) $(DEFINES) $< -o $@
31	+ $(CXX) $(CXXFLAGS) $(DEFINES) $< -o $@
32
33	HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
34	- g++ $(LDFLAGS) $? -o $@;\
35	+ $(CXX) $(LDFLAGS) $? -o $@;\
36	mv HC ../holotz-castle
37
38	# HCed (Holotz's Castle editor).
39	HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
40	- g++ $(LDFLAGS) $? -o $@;\
41	+ $(CXX) $(LDFLAGS) $? -o $@;\
42	mv HCed ../holotz-castle-editor
43
44	install: