Attachment 130017 Details for Bug 174093 – patch.txt

patch.txt

patch.txt (text/plain; charset=US-ASCII), 4.20 KB, created by fiziologus on 2013-01-13 09:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fiziologus

Created: 2013-01-13 09:22:02 UTC

Size: 4.20 KB

patch

obsolete

>diff -u odamex.orig/Makefile odamex/Makefile
>--- odamex.orig/Makefile	2012-11-17 09:57:47.000000000 +0400
>+++ odamex/Makefile	2013-01-13 13:19:56.000000000 +0400
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	odamex
>-PORTVERSION=	0.5.6
>+PORTVERSION=	0.6.1
> CATEGORIES=	games
> MASTER_SITES=	SF/${PORTNAME}/Odamex/${PORTVERSION}
> DISTNAME=	odamex-src-${PORTVERSION}
>@@ -15,26 +15,23 @@
> COMMENT=	The Standard in Online Multiplayer Doom
> 
> USE_BZIP2=	yes
>-USE_GMAKE=	yes
> USE_SDL=	sdl mixer
>+USE_CMAKE=	yes
>+USE_DOS2UNIX=	CMakeLists.txt odalaunch/CMakeLists.txt
> 
>-OPTIONS_DEFINE= LAUNCHER MIDI
>+OPTIONS_DEFINE=	LAUNCHER
> 
> LAUNCHER_DESC=	Enable GUI launcher program
>-MIDI_DESC=	Enable MIDI support (timidity)
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MLAUNCHER}
> USE_WX=		2.6+
>-MAKE_ENV+=	WXRC_CMD="${WXRC_CMD}" WITH_LAUNCHER=yes
>+CMAKE_ARGS+=	-DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off
> PLIST_SUB+=	LAUNCHER=""
> .else
> PLIST_SUB+=	LAUNCHER="@comment "
>-.endif
>-
>-.if ${PORT_OPTIONS:MMIDI}
>-RUN_DEPENDS+=	timidity:${PORTSDIR}/audio/timidity
>+CMAKE_ARGS+=	-DODALAUNCH_TARGET=off
> .endif
> 
> post-patch:
>@@ -42,24 +39,43 @@
> 		s|%%DATADIR%%|${DATADIR}|' \
> 		${WRKSRC}/client/src/d_main.cpp \
> 		${WRKSRC}/server/src/d_main.cpp
>-
>-.if ${PORT_OPTIONS:MLAUNCHER}
>-	@${REINPLACE_CMD} -e 's|\./odamex|odamex|' \
>-		${WRKSRC}/odalaunch/src/misc.cpp
>-.endif
>+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
>+		${WRKSRC}/odalaunch/src/dlg_main.cpp
>+	@${REINPLACE_CMD} -e 's|%%WX_VER%%|${WX_VERSION}|' \
>+		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
>+		${WRKSRC}/odalaunch/CMakeLists.txt
>+	@${REINPLACE_CMD} -e 's|-waddir /usr/share/doom||' \
>+		${WRKSRC}/installer/arch/odamex.desktop
> 
> do-install:
>-.for f in odamex odasrv
>-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
>-.endfor
>+# Binary
>+	${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${PREFIX}/bin
> .if ${PORT_OPTIONS:MLAUNCHER}
> 	${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${PREFIX}/bin
> .endif
>+# Wad
> 	${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKSRC}/odamex.wad ${DATADIR}
>+# Docs
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
>+.endif
>+# Icons
>+.for f in odamex odasrv
>+	${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${LOCALBASE}/share/pixmaps
>+.endfor
>+.if ${PORT_OPTIONS:MLAUNCHER}
>+	${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${LOCALBASE}/share/pixmaps
>+.endif
>+# Desktop
>+.for f in odamex odasrv
>+	${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${LOCALBASE}/share/applications
>+.endfor
>+.if ${PORT_OPTIONS:MLAUNCHER}
>+	${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${LOCALBASE}/share/applications
> .endif
> 
> .include "${.CURDIR}/../doom-data/Makefile.include"
>diff -u odamex.orig/distinfo odamex/distinfo
>--- odamex.orig/distinfo	2012-03-04 16:25:06.000000000 +0400
>+++ odamex/distinfo	2013-01-13 12:28:26.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (odamex-src-0.5.6.tar.bz2) = fc832ac2df2fceeed79b512cd789d0d30c93c46b246f50af973bb867b02a3440
>-SIZE (odamex-src-0.5.6.tar.bz2) = 2954090
>+SHA256 (odamex-src-0.6.1.tar.bz2) = d7758141d00510eae55132a2376326560a206c772da3d604666dc2c62009f861
>+SIZE (odamex-src-0.6.1.tar.bz2) = 7522333
>Common subdirectories: odamex.orig/files and odamex/files
>diff -u odamex.orig/pkg-plist odamex/pkg-plist
>--- odamex.orig/pkg-plist	2012-03-04 16:25:06.000000000 +0400
>+++ odamex/pkg-plist	2013-01-13 12:28:26.000000000 +0400
>@@ -1,7 +1,23 @@
> %%LAUNCHER%%bin/odalaunch
>+%%LAUNCHER%%share/applications/odalaunch.desktop
>+%%LAUNCHER%%share/pixmaps/icon_odalaunch_128.png
>+%%LAUNCHER%%share/pixmaps/icon_odalaunch_256.png
>+%%LAUNCHER%%share/pixmaps/icon_odalaunch_512.png
>+%%LAUNCHER%%share/pixmaps/icon_odalaunch_96.png
> bin/odamex
> bin/odasrv
>+share/applications/odamex.desktop
>+share/applications/odasrv.desktop
>+share/pixmaps/icon_odamex_128.png
>+share/pixmaps/icon_odamex_256.png
>+share/pixmaps/icon_odamex_512.png
>+share/pixmaps/icon_odamex_96.png
>+share/pixmaps/icon_odasrv_128.png
>+share/pixmaps/icon_odasrv_256.png
>+share/pixmaps/icon_odasrv_512.png
>+share/pixmaps/icon_odasrv_96.png
> %%DATADIR%%/odamex.wad
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/README
> @dirrm %%DATADIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View

Attachments on bug 174093: 130016 | 130017