5 files changed, 26 insertions, 89 deletions

diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 7c776e25d655..e36a346dfcdc 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	ufoai
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source_hotfix
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME:S/$/-/}${PORTVERSION}-i18n${EXTRACT_SUFX}
+DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A strategy game featuring tactical combat
 
 LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
-		openal:${PORTSDIR}/audio/openal \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		curl:${PORTSDIR}/ftp/curl
+
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data
 
 USE_BZIP2=	yes
@@ -31,37 +29,23 @@ USE_SDL=	sdl ttf
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-release=yes \
-			--with-snd-jack=no
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-			CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS+=	--enable-release=yes
+CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+			CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+			LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DATADIR=	share/${PORTNAME}
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME:S/$/-/}${PORTVERSION}-source
 UFO_DIR=	${PREFIX}/lib/${PORTNAME}
-UFO_LIBS=	ref_glx ref_sdl snd_sdl ref_glx snd_oss
 UFO_FILES=	ufo
 
-OPTIONS=		MASTER	"Install master server" off \
-			SERVER	"Install dedicated server"	on \
+OPTIONS=		SERVER	"Install dedicated server"	on \
 			UFO2MAP	"Install UFO tools"	on \
-			ARTS	"Support for arts sound system"	off \
-			IPV6	"Support for ipv6"	off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MASTER)
-CONFIGURE_ARGS+=	--enable-master
-UFO_FILES+=	ufomaster
-PLIST_SUB+=	UFOMASTER=""
-.else
-CONFIGURE_ARGS+=	--disable-master
-PLIST_SUB+=	UFOMASTER="@comment "
-.endif
-
 .if !defined(WITHOUT_SERVER)
 CONFIGURE_ARGS+=	--enable-dedicated
 UFO_FILES+=	ufoded
@@ -80,26 +64,6 @@ CONFIGURE_ARGS+=	--disable-ufo2map
 PLIST_SUB+=	UFO2MAP="@comment "
 .endif
 
-.if defined(WITH_ARTS)
-CONFIGURE_ARGS+=	--with-snd-arts=yes
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-UFO_LIBS+=	snd_arts
-PLIST_SUB+=	ARTS=""
-.else
-CONFIGURE_ARGS+=	--with-snd-arts=no
-PLIST_SUB+=	ARTS="@comment "
-.endif
-
-.if defined(WITH_IPV6)
-HAVE_IPV6=	true
-CONFIGURE_ARGS+=	--with-ipv6=yes
-.else
-CONFIGURE_ARGS+=	--with-ipv6=no
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e "s|<SDL.h>|<SDL/SDL.h>|g" ${WRKSRC}/src/ports/unix/cd_sdl.c
-
 pre-install:
 .	for FILE in ${UFO_FILES}
 		@${ECHO} "#!/bin/sh" > ${WRKDIR}/${FILE}
@@ -107,6 +71,9 @@ pre-install:
 		@${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}
 .	endfor
 
+post-build:
+	@cd ${WRKSRC} && ${GMAKE} lang
+
 do-install:
 	@${MKDIR} ${UFO_DIR}/base/i18n
 .	for FILE in ${UFO_FILES}
@@ -117,12 +84,10 @@ do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR}
 		${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin
 .	endfor
-.	for FILE in ${UFO_LIBS}
-		${INSTALL_PROGRAM} ${WRKSRC}/${FILE}.so ${UFO_DIR}
-.	endfor
+
 		${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base
 
-	@cd ${WRKDIR}/base/i18n && \
+	@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
diff --git a/games/ufoai/distinfo b/games/ufoai/distinfo
index 1aeafa180679..ca8a73d08c85 100644
--- a/games/ufoai/distinfo
+++ b/games/ufoai/distinfo
@@ -1,6 +1,3 @@
-MD5 (ufoai/ufoai-2.1.1-source_hotfix.tar.bz2) = f7c7a15074c2eb5916bf791df89ebee0
-SHA256 (ufoai/ufoai-2.1.1-source_hotfix.tar.bz2) = 485c4e78ae73d28c4a06156805925047391a3ae571883275c1875bbeb1651129
-SIZE (ufoai/ufoai-2.1.1-source_hotfix.tar.bz2) = 6896824
-MD5 (ufoai/ufoai-2.1.1-i18n.tar.bz2) = e3d628c3bfde98b933620c6c30160666
-SHA256 (ufoai/ufoai-2.1.1-i18n.tar.bz2) = ed3467118be97bcd27f983567ba09f2cf5492841c10a595b2bc51b4d1c48738e
-SIZE (ufoai/ufoai-2.1.1-i18n.tar.bz2) = 1065252
+MD5 (ufoai/ufoai-2.2-source.tar.bz2) = 67347e7124fe5679c672a392161a6611
+SHA256 (ufoai/ufoai-2.2-source.tar.bz2) = ec86848c08a8c01a53006708ff5d7ffcb48da378afd3d86f30efb4f0c9e24ce8
+SIZE (ufoai/ufoai-2.2-source.tar.bz2) = 7440368
diff --git a/games/ufoai/files/patch-src-client_qal.h b/games/ufoai/files/patch-src-client_qal.h
deleted file mode 100644
index 3d222595a557..000000000000
--- a/games/ufoai/files/patch-src-client_qal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/client/qal.h	Mon Apr  2 10:06:41 2007
-+++ src/client/qal.h	Mon Apr  2 10:06:57 2007
-@@ -28,7 +28,7 @@
- 	#include "../ports/win32/qal_win.h"
- #endif
- 
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- 	#include "../ports/linux/qal_linux.h"
- #endif
- 
diff --git a/games/ufoai/files/patch-src-ports-linux_qal_linux.h b/games/ufoai/files/patch-src-ports-linux_qal_linux.h
deleted file mode 100644
index 2c5f0c77de75..000000000000
--- a/games/ufoai/files/patch-src-ports-linux_qal_linux.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ports/linux/qal_linux.h	Mon Apr  2 10:10:24 2007
-+++ src/ports/linux/qal_linux.h	Mon Apr  2 10:17:39 2007
-@@ -28,7 +28,9 @@
- 
- 
- #ifndef __linux__
-+#	ifndef __FreeBSD__
- #error "You should not be including this file on this platform"
-+#	endif
- #endif
- 
- 
diff --git a/games/ufoai/pkg-plist b/games/ufoai/pkg-plist
index 3b84275d13ad..ed6b9397f310 100644
--- a/games/ufoai/pkg-plist
+++ b/games/ufoai/pkg-plist
@@ -1,7 +1,6 @@
 bin/ufo
 %%UFOSERVER%%bin/ufoded
 %%UFO2MAP%%bin/ufo2map
-%%UFOMASTER%%bin/ufomaster
 lib/ufoai/base/game.so
 lib/ufoai/base/i18n/cs/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/da/LC_MESSAGES/ufoai.mo
@@ -12,27 +11,22 @@ lib/ufoai/base/i18n/es_ES/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/est/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/fi/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/fr/LC_MESSAGES/ufoai.mo
+lib/ufoai/base/i18n/ja/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/it/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/pl/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/pt_BR/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/ru/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/slo/LC_MESSAGES/ufoai.mo
 lib/ufoai/base/i18n/sv/LC_MESSAGES/ufoai.mo
+lib/ufoai/base/i18n/th/LC_MESSAGES/ufoai.mo
 lib/ufoai/ufo
 %%UFOSERVER%%lib/ufoai/ufoded
 %%UFO2MAP%%lib/ufoai/ufo2map
-%%UFOMASTER%%lib/ufoai/ufo2map
-lib/ufoai/ref_glx.so
-lib/ufoai/ref_sdl.so
-%%ARTS%%lib/ufoai/snd_arts.so
-lib/ufoai/snd_sdl.so
-lib/ufoai/snd_oss.so
 lib/ufoai/base/autoexec.cfg
 lib/ufoai/base/dedicated.cfg
 lib/ufoai/base/default.cfg
 lib/ufoai/base/keys.cfg
 lib/ufoai/base/maps
-lib/ufoai/base/mapshots.cfg
 lib/ufoai/base/media
 lib/ufoai/base/models
 lib/ufoai/base/music
@@ -41,6 +35,8 @@ lib/ufoai/base/shaders
 lib/ufoai/base/sound
 lib/ufoai/base/textures
 lib/ufoai/base/ufos
+@dirrm lib/ufoai/base/i18n/th/LC_MESSAGES/
+@dirrm lib/ufoai/base/i18n/th/
 @dirrm lib/ufoai/base/i18n/sv/LC_MESSAGES
 @dirrm lib/ufoai/base/i18n/sv
 @dirrm lib/ufoai/base/i18n/slo/LC_MESSAGES
@@ -51,6 +47,8 @@ lib/ufoai/base/ufos
 @dirrm lib/ufoai/base/i18n/pt_BR
 @dirrm lib/ufoai/base/i18n/pl/LC_MESSAGES
 @dirrm lib/ufoai/base/i18n/pl
+@dirrm lib/ufoai/base/i18n/ja/LC_MESSAGES/
+@dirrm lib/ufoai/base/i18n/ja
 @dirrm lib/ufoai/base/i18n/it/LC_MESSAGES
 @dirrm lib/ufoai/base/i18n/it
 @dirrm lib/ufoai/base/i18n/fi/LC_MESSAGES
@@ -72,5 +70,5 @@ lib/ufoai/base/ufos
 @dirrm lib/ufoai/base/i18n/cs/LC_MESSAGES
 @dirrm lib/ufoai/base/i18n/cs
 @dirrm lib/ufoai/base/i18n
-@dirrm lib/ufoai/base
-@dirrm lib/ufoai
+@dirrmtry lib/ufoai/base
+@dirrmtry lib/ufoai