Attachment 84581 Details for Bug 120612 – file.diff

[patch] file.diff

file.diff (text/plain), 9.72 KB, created by Alex Kozlov on 2008-02-13 12:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Kozlov

Created: 2008-02-13 12:00:10 UTC

Size: 9.72 KB

patch

obsolete

>Index: games/ufoai-data/Makefile
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	data
>-PORTVERSION=	2.1.1
>+PORTVERSION=	2.2
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX:S/-//}
>@@ -20,7 +20,7 @@
> 
> BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
> 
>-NO_PACKAGE=	Package will be 250MB, set FORCE_PACKAGE if you really want it
>+NO_PACKAGE=	Package will be ~400MB, set FORCE_PACKAGE if you really want it
> NO_BUILD=	yes
> NO_WRKSUBDIR=	yes
> 
>@@ -29,20 +29,19 @@
> 
> post-extract:
> 	@cd ${WRKDIR}/base && \
>-		${FIND} * -type f -exec ${UNZIP_CMD} "{}" -d ${WRKDIR}/base \;
>+		${FIND} . -type f -exec ${UNZIP_CMD} "{}" -d ${WRKDIR}/base \;
> 	@${RM} ${WRKDIR}/base/*.pk3
> 
> pre-install:
> 	@${RM} -f ${PLIST}
> 	@cd ${WRKDIR}/base && \
>-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
>-			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
>-	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
>+		${FIND} . -type f | ${SORT} | ${SED} -e 's|^.|%%DATADIR%%|' >> ${PLIST} && \
>+			${FIND} . -type d | ${SORT} -r | ${SED} -e 's|^.|@dirrm %%DATADIR%%|' >> ${PLIST}
> 
> do-install:
> 	${MKDIR} ${PREFIX}/${DATADIR}
> 	cd ${WRKDIR}/base && \
>-		${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/{}" \; && \
>-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/{}" \;
>+		${FIND} . -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/{}" \; && \
>+			${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/{}" \;
> 
> .include <bsd.port.mk>
>Index: games/ufoai-data/distinfo
>@@ -1,3 +1,3 @@
>-MD5 (ufoai/ufoai-2.1.1-data.tar) = ae2ebfeaf34afab92638e128c76860b9
>-SHA256 (ufoai/ufoai-2.1.1-data.tar) = 5e92950f93d0dcef7fbdefc0c0da6f398b06476837bfce79243baa6227176f7c
>-SIZE (ufoai/ufoai-2.1.1-data.tar) = 267755520
>+MD5 (ufoai/ufoai-2.2-data.tar) = a6bb13414d01299679c4e2effc6e41b7
>+SHA256 (ufoai/ufoai-2.2-data.tar) = 2900bb7160b5a833b33888518b600c52a550aae0b0e4c50b4c55f655e6aebd65
>+SIZE (ufoai/ufoai-2.2-data.tar) = 390369280
>Index: games/ufoai/files/patch-src-client_qal.h
>@@ -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
>- 
>Index: games/ufoai/files/patch-src-ports-linux_qal_linux.h
>@@ -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
>- 
>- 
>Index: games/ufoai/files/run.sh.in
>@@ -1,4 +0,0 @@
>-#!/bin/sh
>-
>-cd @UFODIR@ || exit 1
>-exec @UFODIR@/@APP@ "$@"
>Index: games/ufoai/Makefile
>@@ -6,21 +6,19 @@
> #
> 
> PORTNAME=	ufoai
>-PORTVERSION=	2.1.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}
>+DISTFILES=	${PORTNAME:S/$/-/}${PORTVERSION}-source${EXTRACT_SUFX}
> 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
>@@ -30,103 +28,35 @@
> 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 --enable-dedicated --enable-ufo2map
>+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 \
>-			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
>-PLIST_SUB+=	UFOSERVER=""
>-.else
>-CONFIGURE_ARGS+=	--disable-dedicated
>-PLIST_SUB+=	UFOSERVER="@comment "
>-.endif
>-
>-.if !defined(WITHOUT_UFO2MAP)
>-CONFIGURE_ARGS+=	--enable-ufo2map
>-UFO_FILES+=	ufo2map
>-PLIST_SUB+=	UFO2MAP=""
>-.else
>-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}
>-		@${ECHO} "cd ${PREFIX}/${DATADIR} || exit 1 " >> ${WRKDIR}/${FILE}
>-		@${ECHO} "exec ${PREFIX}/${DATADIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}
>-.	endfor
>+UFO_FILES=	ufo ufoded ufo2map
> 
> do-install:
> 	@${MKDIR} ${UFO_DIR}/base/i18n
>+	@cd ${WRKSRC} && ${GMAKE} lang
> .	for FILE in ${UFO_FILES}
>-	@${SED} \
>-		-e 's|@UFODIR@|${UFO_DIR}|' \
>-		-e 's|@APP@|${FILE}|' \
>-		${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE}
>-		${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR}
>+		@${ECHO} "#!/bin/sh" > ${WRKDIR}/${FILE}
>+		@${ECHO} "cd ${UFO_DIR} || exit 1 " >> ${WRKDIR}/${FILE}
>+		@${ECHO} "exec ${UFO_DIR}/${FILE} \"$$@\"" >> ${WRKDIR}/${FILE}
> 		${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin
>-.	endfor
>-.	for FILE in ${UFO_LIBS}
>-		${INSTALL_PROGRAM} ${WRKSRC}/${FILE}.so ${UFO_DIR}
>+		${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${UFO_DIR}
> .	endfor
> 		${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${UFO_DIR}/base
>-
>-	@cd ${WRKDIR}/base/i18n && \
>-		${FIND} * -type d -exec ${MKDIR} "${UFO_DIR}/base/i18n/{}" \; && \
>-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${UFO_DIR}/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
> 
> post-install:
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: 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
>Index: games/ufoai/pkg-plist
>@@ -1,7 +1,6 @@
> bin/ufo
>-%%UFOSERVER%%bin/ufoded
>-%%UFO2MAP%%bin/ufo2map
>-%%UFOMASTER%%bin/ufomaster
>+bin/ufoded
>+bin/ufo2map
> 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/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/ufoded
>+lib/ufoai/ufo2map
> 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/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
>@@ -53,6 +49,8 @@
> @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/ja/LC_MESSAGES
>+@dirrm lib/ufoai/base/i18n/ja
> @dirrm lib/ufoai/base/i18n/fi/LC_MESSAGES
> @dirrm lib/ufoai/base/i18n/fi
> @dirrm lib/ufoai/base/i18n/fr/LC_MESSAGES

Actions: View | Diff

Attachments on bug 120612: 84581