Attachment 217041 Details for Bug 242612 – Patch

[patch] Patch

ufoai.patch (text/plain), 6.74 KB, created by Dmitry Marakasov on 2020-08-05 23:02:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2020-08-05 23:02:00 UTC

Size: 6.74 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 544235)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ufoai
> PORTVERSION=	2.5
>-PORTREVISION=	9
>+PORTREVISION=	10
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION}
> DISTNAME=	${PORTNAME:S/$/-/}${PORTVERSION}-source
>@@ -20,18 +20,19 @@
> 		libcurl.so:ftp/curl \
> 		libtheora.so:multimedia/libtheora \
> 		libxvidcore.so:multimedia/xvid \
>-		libmxml.so:textproc/mxml
>+		libmxml.so:textproc/mxml \
>+		libogg.so:audio/libogg
> BUILD_DEPENDS=	zip:archivers/zip
> RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/base/default.cfg:games/ufoai-data
> 
>-ALL_TARGET=	all lang
>-USES=		compiler:c++11-lang gettext gl gmake jpeg openal:soft \
>+USES=		compiler:c++11-lang gettext gl gmake jpeg localbase openal:soft \
> 		pkgconfig python:build sdl tar:bzip2
>-USE_GL=		yes
>+USE_GL=		gl
> USE_SDL=	sdl image mixer ttf
> USE_CXXSTD=	c++11
> HAS_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	--enable-release --target-os=freebsd
>+CONFIGURE_ARGS=	--enable-release --target-os=freebsd
>+ALL_TARGET=	all lang
> LDFLAGS+=	-lpthread -lexecinfo
> 
> DATADIR=	share/${PORTNAME}
>@@ -42,61 +43,43 @@
> 
> OPTIONS_DEFINE=		SERVER UFO2MAP UFORADIANT
> OPTIONS_DEFAULT=	SERVER UFO2MAP
>+OPTIONS_SUB=		yes
> 
> SERVER_DESC=		Install dedicated server
> UFO2MAP_DESC=		Install UFO tools
> UFORADIANT_DESC=	Install UFO map editor
> 
>-.include <bsd.port.options.mk>
>+SERVER_CONFIGURE_ENABLE=ufoded
>+SERVER_VARS=		UFO_FILES+=ufoded
> 
>-.if ${PORT_OPTIONS:MSERVER}
>-CONFIGURE_ARGS+=	--enable-ufoded
>-UFO_FILES+=	ufoded
>-PLIST_SUB+=	UFOSERVER=""
>-.else
>-CONFIGURE_ARGS+=	--disable-ufoded
>-PLIST_SUB+=	UFOSERVER="@comment "
>-.endif
>+UFO2MAP_CONFIGURE_ENABLE=ufo2map
>+UFO2MAP_VARS=		UFO_FILES+=ufo2map
> 
>-.if ${PORT_OPTIONS:MUFO2MAP}
>-CONFIGURE_ARGS+=	--enable-ufo2map
>-UFO_FILES+=	ufo2map
>-PLIST_SUB+=	UFO2MAP=""
>-.else
>-CONFIGURE_ARGS+=	--disable-ufo2map
>-PLIST_SUB+=	UFO2MAP="@comment "
>-.endif
>+UFORADIANT_ALL_TARGET=	uforadiant
>+UFORADIANT_CONFIGURE_ENABLE=uforadiant
>+UFORADIANT_USES=	gnome
>+UFORADIANT_USE=		GNOME=gtk20,glib20,gtksourceview2,libxml2
>+UFORADIANT_LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
> 
>-.if ${PORT_OPTIONS:MUFORADIANT}
>-ALL_TARGET+=	uforadiant
>-CONFIGURE_ARGS+=--enable-uforadiant
>-USES+=		gnome
>-USE_GNOME+=	gtk20 glib20 gtksourceview2 libxml2
>-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
>-RADIANT_FILES=	colours.xml game.xml input.xml mapdef.template menu.xml user.xml
>-RADIANT_DIRS=	bitmaps i18n prefabs sourceviewer
>-PLIST_SUB+=	UFORADIANT=""
>-.else
>-CONFIGURE_ARGS+=--disable-uforadiant
>-PLIST_SUB+=	UFORADIANT="@comment "
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> post-extract:
> 	@${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models
>-	${REINPLACE_CMD} \
>+	@${REINPLACE_CMD} \
> 		-e 's|DEFAULT_COMPILER_CC=cc|DEFAULT_COMPILER_CC=${CC}|' \
> 		-e 's|DEFAULT_COMPILER_CXX=c++|DEFAULT_COMPILER_CXX=${CXX}|' \
> 		${WRKSRC}/configure
> .if ${CHOSEN_COMPILER_TYPE} == "clang"
>-	${REINPLACE_CMD} \
>+	@${REINPLACE_CMD} \
> 		-e 's|-falign-loops=2 -falign-jumps=2 -falign-functions=2||' \
> 		${WRKSRC}/build/modes/release.mk
> .endif
>+.for LIB in SDL SDL_mixer SDL_ttf curl intl jpeg mxml ogg png theora vorbis zlib
>+	@${RM} -rf ${WRKSRC}/src/libs/${LIB}
>+.endfor
> 
> do-install:
>-	${MKDIR} ${STAGEDIR}${UFO_DIR}
>+	@${MKDIR} ${STAGEDIR}${UFO_DIR}
> .for FILE in ${UFO_FILES}
> 	@${SED} \
> 		-e 's|@UFODIR@|${UFO_DIR}|' \
>@@ -105,11 +88,16 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${UFO_DIR}
> 	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${STAGEDIR}${PREFIX}/bin
> .endfor
>-	${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/base
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/base
> 	${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${STAGEDIR}${PREFIX}/${DATADIR}/base
> 
>-.if ${PORT_OPTIONS:MUFORADIANT}
>-	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant
>+	@cd ${WRKSRC}/base/i18n && \
>+		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; && \
>+			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \;
>+	${LN} -s ../../${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base
>+
>+do-install-UFORADIANT-on:
>+	@${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant
> 	@${SED} \
> 		-e 's|@UFODIR@|${UFO_DIR}/radiant|' \
> 		-e 's|@APP@|uforadiant|' \
>@@ -116,22 +104,6 @@
> 		${FILESDIR}/run.sh.in > ${WRKDIR}/uforadiant
> 	${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant ${STAGEDIR}${UFO_DIR}/radiant
> 	${INSTALL_SCRIPT} ${WRKDIR}/uforadiant ${STAGEDIR}${PREFIX}/bin
>+	@cd ${WRKSRC}/radiant && ${COPYTREE_SHARE} . ${STAGEDIR}${UFO_DIR}/radiant
> 
>-.for FILE in ${RADIANT_FILES}
>-	${INSTALL_DATA} ${WRKSRC}/radiant/${FILE} ${STAGEDIR}${UFO_DIR}/radiant
>-.endfor
>-
>-.for DIRE in ${RADIANT_DIRS}
>-	${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant/${DIRE}
>-	cd ${WRKSRC}/radiant/${DIRE} && \
>-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \; && \
>-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \;
>-.endfor
>-.endif
>-
>-	cd ${WRKSRC}/base/i18n && \
>-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; && \
>-			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \;
>-	${LN} -s ${PREFIX}/${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base
>-
> .include <bsd.port.post.mk>
>Index: files/patch-src__libs__vorbis__config.h
>===================================================================
>--- files/patch-src__libs__vorbis__config.h	(revision 544235)
>+++ files/patch-src__libs__vorbis__config.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- ./src/libs/vorbis/config.h.orig	2014-06-05 06:18:39.000000000 +0200
>-+++ ./src/libs/vorbis/config.h	2014-08-07 16:49:53.700302995 +0200
>-@@ -14,7 +14,7 @@
>- 
>- /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
>-    */
>--#define HAVE_ALLOCA_H 1
>-+/* #define HAVE_ALLOCA_H 1 */
>- 
>- /* Define to 1 if you have the <dlfcn.h> header file. */
>- #define HAVE_DLFCN_H 1
>
>Property changes on: files/patch-src__libs__vorbis__config.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 544235)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,6 @@
> bin/ufo
> bin/ufomodel
>-%%UFOSERVER%%bin/ufoded
>+%%SERVER%%bin/ufoded
> %%UFO2MAP%%bin/ufo2map
> %%UFORADIANT%%bin/uforadiant
> %%DATADIR%%/base/game.so
>@@ -34,7 +34,7 @@
> %%DATADIR%%/base/i18n/zh_TW/LC_MESSAGES/ufoai.mo
> lib/ufoai/ufo
> lib/ufoai/ufomodel
>-%%UFOSERVER%%lib/ufoai/ufoded
>+%%SERVER%%lib/ufoai/ufoded
> %%UFO2MAP%%lib/ufoai/ufo2map
> lib/ufoai/base
> %%UFORADIANT%%lib/ufoai/radiant/bitmaps/texwindow_hideunused.png

Actions: View | Diff

Attachments on bug 242612: 217016 | 217041