1 files changed, 52 insertions, 19 deletions

diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index b169280a909f..0d435717b192 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ufoai
-PORTVERSION=	2.2.1
-PORTREVISION=	9
+PORTVERSION=	2.3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source
@@ -19,15 +18,20 @@ COMMENT=	A strategy game featuring tactical combat
 LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
-		curl:${PORTSDIR}/ftp/curl
-
-RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data
+		curl:${PORTSDIR}/ftp/curl \
+		execinfo:${PORTSDIR}/devel/libexecinfo \
+		theora.0:${PORTSDIR}/multimedia/libtheora \
+		xvidcore.4:${PORTSDIR}/multimedia/xvid
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data
 
+USE_AUTOTOOLS=	aclocal:110 autoconf:262
 USE_BZIP2=	yes
 USE_GL=		yes
-USE_SDL=	sdl mixer ttf
+USE_SDL=	sdl image mixer ttf
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_GNOME=	pkgconfig
+USE_OPENAL=	soft
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-release=yes
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -38,10 +42,11 @@ DATADIR=	share/${PORTNAME}
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:S/$/-/}${PORTVERSION}-source
 UFO_DIR=	${PREFIX}/lib/${PORTNAME}
-UFO_FILES=	ufo
+UFO_FILES=	ufo ufomodel
 
 OPTIONS=		SERVER	"Install dedicated server"	on \
 			UFO2MAP	"Install UFO tools"	on \
+			UFORADIANT	"Install UFO map editor"	off
 
 .include <bsd.port.pre.mk>
 
@@ -63,26 +68,37 @@ CONFIGURE_ARGS+=	--disable-ufo2map
 PLIST_SUB+=	UFO2MAP="@comment "
 .endif
 
+.if !defined(WITHOUT_UFORADIANT)
+CONFIGURE_ARGS+=--enable-uforadiant
+USE_GNOME+=	gtk20 glib20 gtksourceview2 libxml2
+LIB_DEPENDS+=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+RADIANT_FILE=	uforadiant
+RADIANT_DIRS=	bitmaps games i18n plugins prefabs shaders sourceviewer
+PLIST_SUB+=	UFORADIANT=""
+.else
+CONFIGURE_ARGS+=--disable-uforadiant
+PLIST_SUB+=	UFORADIANT="@comment "
+.endif
+
 # Resolve name collision with jpeg-8 amd API png
 post-patch:
 	${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
 		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		-e 's|png_check_sig(PngFileBuffer.buffer, 8)|!png_sig_cmp(PngFileBuffer.buffer, 0, 8)|' \
-		${WRKSRC}/src/renderer/r_image.c \
+		${WRKSRC}/src/client/renderer/r_image.c \
 		${WRKSRC}/src/tools/ufo2map/common/imagelib.c
 
-pre-install:
-.	for FILE in ${UFO_FILES}
-		@${ECHO} "#!/bin/sh" > ${WRKDIR}/${FILE}
-		@${ECHO} "cd ${PREFIX}/${DATADIR} || exit 1 " >> ${WRKDIR}/${FILE}
-		@${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}
-.	endfor
+pre-configure:
+	@cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF}
 
 post-build:
 	@cd ${WRKSRC} && ${GMAKE} lang
+.       if defined(WITH_UFORADIANT)
+		@cd ${WRKSRC} && ${GMAKE} uforadiant
+.	endif
 
 do-install:
-	@${MKDIR} ${UFO_DIR}/base/i18n
+	@${MKDIR} ${UFO_DIR}
 .	for FILE in ${UFO_FILES}
 	@${SED} \
 		-e 's|@UFODIR@|${UFO_DIR}|' \
@@ -92,12 +108,29 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin
 .	endfor
 
-		${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base
+		${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${PREFIX}/${DATADIR}/base
+
+.	if defined(WITH_UFORADIANT)
+	@${MKDIR} ${UFO_DIR}/radiant
+	@${SED} \
+		-e 's|@UFODIR@|${UFO_DIR}/radiant|' \
+		-e 's|@APP@|${RADIANT_FILE}|' \
+		${FILESDIR}/run.sh.in > ${WRKDIR}/${RADIANT_FILE}
+		${INSTALL_PROGRAM} ${WRKSRC}/radiant/${RADIANT_FILE} ${UFO_DIR}/radiant
+		${INSTALL_SCRIPT} ${WRKDIR}/${RADIANT_FILE} ${PREFIX}/bin
+
+.		for DIRE in ${RADIANT_DIRS}
+			@${MKDIR} ${UFO_DIR}/radiant/${DIRE}
+			@cd ${WRKSRC}/radiant/${DIRE} && \
+				${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/radiant/${DIRE}/{}" \; && \
+					${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${UFO_DIR}/radiant/${DIRE}/{}" \;
+.		endfor
+.	endif
 
 	@cd ${WRKSRC}/base/i18n && \
-		${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/base/i18n/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${UFO_DIR}/base/i18n/{}" \;
-	${LN} -s ${PREFIX}/${DATADIR}/* ${UFO_DIR}/base
+		${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/base/i18n/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/base/i18n/{}" \;
+	${LN} -s ${PREFIX}/${DATADIR}/base ${UFO_DIR}/base
 
 post-install:
 	@${CAT} ${PKGMESSAGE}