- Update to 20061125

3 files changed, 30 insertions, 19 deletions

diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 866b0976c7fb..1082f8ace993 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	palomino
+# New ports collection makefile for:	palomodulesmemino
 # Date created:		28 August 2006
 # Whom:			Andrew Pantyukhin <infofarmer@FreeBSD.org>
 #
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	palomino
-PORTVERSION=	20060827
-PORTREVISION=	1
+PORTVERSION=	20061125
 CATEGORIES=	games
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}-sim
+MASTER_SITES=	SF/${PORTNAME}-sim
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	infofarmer@FreeBSD.org
@@ -24,24 +22,28 @@ USE_GL=		yes
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}/game/pony
+INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}/modules/pony
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's!(string installDir = ).*$$!\1"${DATADIR}/";!' \
-		-e 's!../game/!!' ${WRKSRC}/palomino/game/pony/src/game_pony_init.cc
-	@${REINPLACE_CMD} -Ee 's!(CC_FLAGS.*:=)!\1 $$(CFLAGS)!' ${WRKSRC}/gfx/GNUmakefile_common
-	@${REINPLACE_CMD} -Ee 's!(-O[0-9s]?|-funroll-loops|-fno-inline)!!g' ${WRKSRC}/gfx/tools/cc-config.sh
+	@${REINPLACE_CMD} -e '/APPLE_CC/s|$$| \&\& !defined(__FreeBSD__)|'\
+		${WRKSRC}/gfx/src/gfx_math.hh
+	@${REINPLACE_CMD} -Ee 's|(string (unix)?[iI]nstallDir = ).*$$|\1"${DATADIR}/";|'\
+		-e 's!../modules/!!' ${WRKSRC}/palomino/modules/pony/src/mod_pony_init.cc
+	@${REINPLACE_CMD} -Ee 's|(CC_FLAGS.*:=)|\1 $$(CFLAGS)|' ${WRKSRC}/gfx/GNUmakefile_common
+	@${REINPLACE_CMD} -Ee 's!(-O[0-9s]?|-funroll-loops|-fno-inline)!!g'\
+		${WRKSRC}/gfx/tools/cc-config.sh
 	@${REINPLACE_CMD} -e 's|-march=$$ARCH||' ${WRKSRC}/gfx/tools/cc-config.sh
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/gfx/tools/cc-config.sh ${WRKSRC}/gfx/tools/ld-config.sh
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g'\
+		${WRKSRC}/gfx/tools/cc-config.sh ${WRKSRC}/gfx/tools/ld-config.sh
 
 do-install:
 	@${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/out/palomino ${PREFIX}/bin/
-	@${INSTALL} -d ${DATADIR}/pony/out
+	@${INSTALL} -d ${DATADIR}/pony/out/
 	@${CP} -R ${INSTALL_WRKSRC}/models ${INSTALL_WRKSRC}/textures ${DATADIR}/pony/
-	@${CHMOD} -R a+rX,u+w,go-w ${DATADIR}/pony
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/src/game_pony.py \
+	@${CHMOD} -R a+rX,u+w,go-w ${DATADIR}/pony/
+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/src/mod_pony.py \
 			${WRKSRC}/palomino/engine/src/eng.py ${DATADIR}/pony/out/
 
 .include <bsd.port.pre.mk>
diff --git a/games/palomino/distinfo b/games/palomino/distinfo
index ab2d8902152a..1eb439854a9e 100644
--- a/games/palomino/distinfo
+++ b/games/palomino/distinfo
@@ -1,3 +1,3 @@
-MD5 (palomino_20060827.zip) = 5487172783ab6c2733bfe0b9b1d59551
-SHA256 (palomino_20060827.zip) = ef94db2e55fcbfe0fb2d2a2a5f058b9c0ebe3b145a5f6dbfc854ee04b254f006
-SIZE (palomino_20060827.zip) = 1100864
+MD5 (palomino_20061125.zip) = e612244976749b31cfe368e71486a947
+SHA256 (palomino_20061125.zip) = de2b5c3f4e210d739768d94b7d36be8c9898376480eff17a1b3a496475940ebd
+SIZE (palomino_20061125.zip) = 1311526
diff --git a/games/palomino/pkg-plist b/games/palomino/pkg-plist
index 34e062e63655..2ed4be60ce81 100644
--- a/games/palomino/pkg-plist
+++ b/games/palomino/pkg-plist
@@ -2,14 +2,23 @@ bin/palomino
 %%DATADIR%%/pony/models/f-14tomcat.pal
 %%DATADIR%%/pony/models/tank.pal
 %%DATADIR%%/pony/out/eng.py
-%%DATADIR%%/pony/out/game_pony.py
-%%DATADIR%%/pony/textures/cloud1.tga.gz
+%%DATADIR%%/pony/out/mod_pony.py
+%%DATADIR%%/pony/textures/cloudCirrus1.tga.gz
+%%DATADIR%%/pony/textures/cloudCirrus2.tga.gz
+%%DATADIR%%/pony/textures/cloudCirrus3.tga.gz
+%%DATADIR%%/pony/textures/cloudCirrus4.tga.gz
+%%DATADIR%%/pony/textures/cloudCirrus5.tga.gz
 %%DATADIR%%/pony/textures/desert1.tga.gz
 %%DATADIR%%/pony/textures/explosion1.tga.gz
 %%DATADIR%%/pony/textures/grass1.tga.gz
 %%DATADIR%%/pony/textures/hangar1.tga.gz
 %%DATADIR%%/pony/textures/road1.tga.gz
 %%DATADIR%%/pony/textures/sand1.tga.gz
+%%DATADIR%%/pony/textures/skySide1.tga.gz
+%%DATADIR%%/pony/textures/skySide2Sunset_128.tga.gz
+%%DATADIR%%/pony/textures/skySide2_128.tga.gz
+%%DATADIR%%/pony/textures/skySideCirrus1_128.tga.gz
+%%DATADIR%%/pony/textures/skyTop2_128.tga.gz
 %%DATADIR%%/pony/textures/tree1.tga.gz
 %%DATADIR%%/pony/textures/tree2.tga.gz
 %%DATADIR%%/pony/textures/tree3.tga.gz