From 456ab9294969bd57091cb5525a435e436ca057c7 Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Mon, 20 Aug 2007 07:51:23 +0000 Subject: - Update to 2.1.1 - Update WWW - Add patch-src-client_qal.h,patch-src-ports-linux_qal_linux.h patch files - Add two new OPTIONS to games/ufoai port - Now, it uses GNU_CONFIGURE - Remove obsolete patch file - Another tiny modifications --- games/ufoai/Makefile | 68 +++++++++++++--------- games/ufoai/distinfo | 9 ++- games/ufoai/files/patch-Makefile | 29 --------- games/ufoai/files/patch-src-client_qal.h | 11 ++++ .../ufoai/files/patch-src-ports-linux_qal_linux.h | 12 ++++ games/ufoai/pkg-descr | 2 +- games/ufoai/pkg-plist | 43 +++++++++----- 7 files changed, 97 insertions(+), 77 deletions(-) delete mode 100644 games/ufoai/files/patch-Makefile create mode 100644 games/ufoai/files/patch-src-client_qal.h create mode 100644 games/ufoai/files/patch-src-ports-linux_qal_linux.h (limited to 'games/ufoai') diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 142b5256efd4..61fd7bd11593 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -6,86 +6,98 @@ # PORTNAME= ufoai -DISTVERSION= 2.0RC5 -PORTREVISION= 3 +PORTVERSION= 2.1.1 CATEGORIES= games MASTER_SITES= SF -DISTNAME= ${PORTNAME:S/$/-/}${DISTVERSION:S/R/-R/}-source +DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source_hotfix +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME:S/$/-/}${PORTVERSION}-i18n${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= A strategy game featuring tactical combat LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - jpeg.9:${PORTSDIR}/graphics/jpeg + openal:${PORTSDIR}/audio/openal \ + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/default.cfg:${PORTSDIR}/games/ufoai-data USE_BZIP2= yes +USE_GCC= 3.4+ USE_GL= yes 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_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= SERVER "Install dedicated server" on \ +OPTIONS= MASTER "Install master server" off \ + SERVER "Install dedicated server" on \ UFO2MAP "Install UFO tools" on \ ARTS "Support for arts sound system" off \ IPV6 "Support for ipv6" off .include -.if ${OSVERSION} < 500000 -IGNORE= does not build on FreeBSD 4.x +.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) -HAVE_SERVER= true -MAKE_ENV+= BUILD_DEDICATED="YES" +CONFIGURE_ARGS+= --enable-dedicated UFO_FILES+= ufoded -PLIST_SUB+= SERVER="" +PLIST_SUB+= UFOSERVER="" .else -MAKE_ENV+= BUILD_DEDICATED="NO" -PLIST_SUB+= SERVER="@comment " +CONFIGURE_ARGS+= --disable-dedicated +PLIST_SUB+= UFOSERVER="@comment " .endif .if !defined(WITHOUT_UFO2MAP) -HAVE_UFO2MAP= true -MAKE_ENV+= BUILD_COMPILETOOLS="YES" +CONFIGURE_ARGS+= --enable-ufo2map UFO_FILES+= ufo2map PLIST_SUB+= UFO2MAP="" .else -MAKE_ENV+= BUILD_COMPILETOOLS="NO" +CONFIGURE_ARGS+= --disable-ufo2map PLIST_SUB+= UFO2MAP="@comment " .endif .if defined(WITH_ARTS) -HAVE_ARTS= true -MAKE_ENV+= BUILD_ARTS="YES" +CONFIGURE_ARGS+= --with-snd-arts=yes LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts UFO_LIBS+= snd_arts PLIST_SUB+= ARTS="" .else -MAKE_ENV+= BUILD_ARTS="NO" +CONFIGURE_ARGS+= --with-snd-arts=no PLIST_SUB+= ARTS="@comment " .endif .if defined(WITH_IPV6) HAVE_IPV6= true -MAKE_ENV+= HAVE_IPV6="YES" +CONFIGURE_ARGS+= --with-ipv6=yes .else -MAKE_ENV+= HAVE_IPV6="NO" +CONFIGURE_ARGS+= --with-ipv6=no .endif post-patch: - ${REINPLACE_CMD} -e "s|^BUILD_ARTS=|BUILD_ARTS?=|g" -e \ - "s|^BUILD_DEDICATED=|BUILD_DEDICATED?=|g" -e \ - "s|^BUILD_COMPILETOOLS=|BUILD_COMPILETOOLS?=|g" -e \ - "s|^HAVE_IPV6=|HAVE_IPV6?=|g" ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s|||g" ${WRKSRC}/src/ports/unix/cd_sdl.c pre-install: . for FILE in ${UFO_FILES} @@ -101,15 +113,15 @@ do-install: -e 's|@UFODIR@|${UFO_DIR}|' \ -e 's|@APP@|${FILE}|' \ ${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE} - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE} ${UFO_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR} ${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin . endfor . for FILE in ${UFO_LIBS} - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/${FILE}.so ${UFO_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${FILE}.so ${UFO_DIR} . endfor - ${INSTALL_PROGRAM} ${WRKSRC}/release${ARCH}/game.so ${UFO_DIR}/base + ${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base - @cd ${WRKSRC}/base/i18n && \ + @cd ${WRKDIR}/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 5adfd025e748..1aeafa180679 100644 --- a/games/ufoai/distinfo +++ b/games/ufoai/distinfo @@ -1,3 +1,6 @@ -MD5 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = ac5642370d419d73af0076ad7172c363 -SHA256 (ufoai/ufoai-2.0-RC5-source.tar.bz2) = bf7b74bfec193183f4a2b03d2f22eefd27a7ba243c840c8003c83a34e8ad9361 -SIZE (ufoai/ufoai-2.0-RC5-source.tar.bz2) = 3163820 +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 diff --git a/games/ufoai/files/patch-Makefile b/games/ufoai/files/patch-Makefile deleted file mode 100644 index 18b837d7eb6a..000000000000 --- a/games/ufoai/files/patch-Makefile +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile Sat Sep 30 13:30:44 2006 -+++ Makefile Sat Sep 30 20:44:26 2006 -@@ -346,6 +346,15 @@ - endif - endif # ARCH i386 - -+ifeq ($(ARCH),amd64) -+ ifeq ($(strip $(BUILD_GLX)),YES) -+ TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT) -+ endif -+ ifeq ($(strip $(BUILD_SDLUFO)),YES) -+ TARGETS += $(BUILDDIR)/ref_sdl.$(SHLIBEXT) -+ endif -+endif # ARCH FreeBSD/amd64 -+ - ifeq ($(strip $(BUILD_COMPILETOOLS)),YES) - TARGETS += $(BUILDDIR)/ufo2map - endif -@@ -1326,8 +1335,8 @@ - for po in $$pofiles; do \ - po=`basename $$po`; \ - dir=`echo $$po | sed -e 's,\.po,,'`; \ -- mkdir -p ../base/i18n/$$dir/LC_MESSAGES; \ -- msgfmt -v -o ../base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \ -+ mkdir -p base/i18n/$$dir/LC_MESSAGES; \ -+ msgfmt -v -o base/i18n/$$dir/LC_MESSAGES/ufoai.mo po/$$po; \ - done - - docs: diff --git a/games/ufoai/files/patch-src-client_qal.h b/games/ufoai/files/patch-src-client_qal.h new file mode 100644 index 000000000000..3d222595a557 --- /dev/null +++ b/games/ufoai/files/patch-src-client_qal.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..2c5f0c77de75 --- /dev/null +++ b/games/ufoai/files/patch-src-ports-linux_qal_linux.h @@ -0,0 +1,12 @@ +--- 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-descr b/games/ufoai/pkg-descr index cf785c18d3ee..fc96cff299d2 100644 --- a/games/ufoai/pkg-descr +++ b/games/ufoai/pkg-descr @@ -5,4 +5,4 @@ strike force. To be successful on the long run, you will also have to have a research team study the aliens and their technologies in order to learn as much as possible about their technology, their goals and the aliens themselves. -WWW: http://www.ufoai.net/ +WWW: http://ufoai.ninex.info/ diff --git a/games/ufoai/pkg-plist b/games/ufoai/pkg-plist index 772d0fd107ce..3b84275d13ad 100644 --- a/games/ufoai/pkg-plist +++ b/games/ufoai/pkg-plist @@ -1,41 +1,48 @@ bin/ufo -%%SERVER%%bin/ufoded +%%UFOSERVER%%bin/ufoded %%UFO2MAP%%bin/ufo2map -lib/ufoai/base/autoexec.cfg -lib/ufoai/base/dedicated.cfg -lib/ufoai/base/default.cfg -lib/ufoai/base/keys.cfg +%%UFOMASTER%%bin/ufomaster lib/ufoai/base/game.so -lib/ufoai/base/maps -lib/ufoai/base/mapshots.cfg -lib/ufoai/base/media -lib/ufoai/base/models -lib/ufoai/base/music -lib/ufoai/base/pics -lib/ufoai/base/shaders -lib/ufoai/base/sound -lib/ufoai/base/textures -lib/ufoai/base/ufos lib/ufoai/base/i18n/cs/LC_MESSAGES/ufoai.mo lib/ufoai/base/i18n/da/LC_MESSAGES/ufoai.mo lib/ufoai/base/i18n/de/LC_MESSAGES/ufoai.mo lib/ufoai/base/i18n/en/LC_MESSAGES/ufoai.mo lib/ufoai/base/i18n/es/LC_MESSAGES/ufoai.mo +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/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/ufo -%%SERVER%%lib/ufoai/ufoded +%%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 +lib/ufoai/base/pics +lib/ufoai/base/shaders +lib/ufoai/base/sound +lib/ufoai/base/textures +lib/ufoai/base/ufos +@dirrm lib/ufoai/base/i18n/sv/LC_MESSAGES +@dirrm lib/ufoai/base/i18n/sv @dirrm lib/ufoai/base/i18n/slo/LC_MESSAGES @dirrm lib/ufoai/base/i18n/slo @dirrm lib/ufoai/base/i18n/ru/LC_MESSAGES @@ -46,12 +53,16 @@ lib/ufoai/snd_oss.so @dirrm lib/ufoai/base/i18n/pl @dirrm lib/ufoai/base/i18n/it/LC_MESSAGES @dirrm lib/ufoai/base/i18n/it +@dirrm lib/ufoai/base/i18n/fi/LC_MESSAGES +@dirrm lib/ufoai/base/i18n/fi @dirrm lib/ufoai/base/i18n/fr/LC_MESSAGES @dirrm lib/ufoai/base/i18n/fr @dirrm lib/ufoai/base/i18n/est/LC_MESSAGES @dirrm lib/ufoai/base/i18n/est @dirrm lib/ufoai/base/i18n/es/LC_MESSAGES @dirrm lib/ufoai/base/i18n/es +@dirrm lib/ufoai/base/i18n/es_ES/LC_MESSAGES +@dirrm lib/ufoai/base/i18n/es_ES @dirrm lib/ufoai/base/i18n/en/LC_MESSAGES @dirrm lib/ufoai/base/i18n/en @dirrm lib/ufoai/base/i18n/de/LC_MESSAGES -- cgit v1.2.3