From 50eb2f1d5c1138cc75862116e12e28398aa21b30 Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Fri, 9 Sep 2011 03:28:49 +0000
Subject: - Update to 20110820 - Unbreak

---
 games/palomino/Makefile | 38 +++++++++++++++++++++++---------------
 games/palomino/distinfo |  4 ++--
 2 files changed, 25 insertions(+), 17 deletions(-)

(limited to 'games')

diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 82e1374453bd..d3f58529b05b 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	palomino
-PORTVERSION=	20101112
+PORTVERSION=	20110820
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.palomino3d.org/sim/
-DISTFILES=	${PORTNAME}_src_${PORTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}_data_misc_${MISC_VER}${EXTRACT_SUFX} \
-		${PORTNAME}_data_models_${MODELS_VER}${EXTRACT_SUFX} \
-		${PORTNAME}_data_sounds_${SOUNDS_VER}${EXTRACT_SUFX} \
-		${PORTNAME}_data_terrain_${TERRAIN_VER}${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}_src_${PORTVERSION}.txz \
+		${PORTNAME}_data_misc_${MISC_VER}.tar.bz2 \
+		${PORTNAME}_data_models_${MODELS_VER}.tar.bz2 \
+		${PORTNAME}_data_sounds_${SOUNDS_VER}.tar.bz2 \
+		${PORTNAME}_data_terrain_${TERRAIN_VER}.tar.bz2
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Action flight simulator with its own 3D engine
 
 LIB_DEPENDS=	osg.55:${PORTSDIR}/graphics/osg
 
-BROKEN=		does not compile
-
 USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GL=		gl
 USE_CMAKE=	yes
 USE_LUA=	5.1
@@ -37,12 +36,10 @@ TERRAIN_VER=	20080206
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS=	JOYSTICK "Enable joystick support through linux-js" off \
+		SDL	"SDL support for input and sound" on \
 		PLIB	"Enable sound support through plib" off \
 		GUI	"Enable FLTK GUI" on
 
-# Broken
-#		SDL	"SDL support for input and sound" on \
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_JOYSTICK)
@@ -50,10 +47,9 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
 .endif
 
-#.if !defined(WITHOUT_SDL)
-#USE_SDL+=	sdl mixer
-#BROKEN=		does not build
-#.endif
+.if !defined(WITHOUT_SDL)
+USE_SDL+=	sdl mixer
+.endif
 
 .if defined(WITHOUT_PLIB)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
@@ -63,6 +59,18 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS+=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 .endif
 
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@cd ${WRKDIR}; \
+	for file in ${DISTFILES}; do \
+		if ${ECHO_CMD} $$file | ${GREP} -q txz$$; then \
+			${XZ_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+		else \
+			${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+		fi; \
+	done
+
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
diff --git a/games/palomino/distinfo b/games/palomino/distinfo
index e166018f0f83..457b69d55454 100644
--- a/games/palomino/distinfo
+++ b/games/palomino/distinfo
@@ -1,5 +1,5 @@
-SHA256 (palomino_src_20101112.tar.bz2) = 6ee63a8a8fb7e16637cd7b2f1f11af6fea8aa18219c7b1f7fd14f3160fd60766
-SIZE (palomino_src_20101112.tar.bz2) = 599713
+SHA256 (palomino_src_20110820.txz) = 8a9d4bdbbf24c18b849253651968e11bd3f4f7587870bcc69a8ec579a03f98f8
+SIZE (palomino_src_20110820.txz) = 571496
 SHA256 (palomino_data_misc_20091027.tar.bz2) = f5b7183ae98a7842dcc626de388d396a50c98011745bc6afca7da402c13fdac8
 SIZE (palomino_data_misc_20091027.tar.bz2) = 632943
 SHA256 (palomino_data_models_20090615.tar.bz2) = 53acdb00a61cbfe5faca7c30276ae76a2d0c8a169eff292b54fc9701bfbe885a
-- 
cgit