FreeBSD Bugzilla – Attachment 68430 Details for
Bug 100603
[PATCH] Update games/warzone2100 to 2.0.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
warzone2100.patch
warzone2100.patch (text/plain), 7.86 KB, created by
Dmitry Marakasov
on 2006-07-20 11:30:15 UTC
(
hide
)
Description:
warzone2100.patch
Filename:
MIME Type:
Creator:
Dmitry Marakasov
Created:
2006-07-20 11:30:15 UTC
Size:
7.86 KB
patch
obsolete
>diff -ruN warzone2100.orig/Makefile warzone2100/Makefile >--- warzone2100.orig/Makefile Thu Jul 20 14:10:03 2006 >+++ warzone2100/Makefile Thu Jul 20 14:09:25 2006 >@@ -6,11 +6,10 @@ > # > > PORTNAME= warzone2100 >-PORTVERSION= 0.2.2 >-PORTREVISON= 2 >+PORTVERSION= 2.0.3 > CATEGORIES= games >-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} >-MASTER_SITE_SUBDIR= ${PORTNAME} >+MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ >+DISTNAME= warzone-${PORTVERSION} > > MAINTAINER= alepulver@FreeBSD.org > COMMENT= Innovative 3D real-time strategy game >@@ -20,7 +19,7 @@ > ogg.5:${PORTSDIR}/audio/libogg \ > openal.0:${PORTSDIR}/audio/openal \ > vorbis.3:${PORTSDIR}/audio/libvorbis \ >- alut.1:${PORTSDIR}/audio/freealut >+ physfs-1.0.1:${PORTSDIR}/devel/physfs > > USE_BZIP2= yes > USE_GL= yes >@@ -28,55 +27,24 @@ > > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --program-transform-name="" >-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ >- LDFLAGS="-L${X11BASE}/lib" >- >-SUB_FILES= warzone >+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ >+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ >+ LIBS="-pthread" > > post-patch: >-# Remove "-m32" flag >+ @${REINPLACE_CMD} -e '/stdint.h/d' ${WRKSRC}/lib/ivis_opengl/screen.c > @${REINPLACE_CMD} -e 's|-m32||' \ >- ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ >- ${WRKSRC}/makerules/common.mk >- >-# Fix SDL include statement >+ -e 's|/usr/local|${LOCALBASE}|; s|/usr/X11R6|${X11BASE}|' \ >+ ${WRKSRC}/configure > .for f in configure *.c *.h > @${FIND} ${WRKSRC} -type f -name "${f}" -print0 | \ >- ${XARGS} -0 ${REINPLACE_CMD} -e \ >- 's|\(#include.*\)SDL/\(SDL.*\)|\1\2| ; \ >- s|-lopenal |&-lalut|g ; \ >- s|"-lalut|"-lopenal -lalut|' >+ ${XARGS} -0 ${REINPLACE_CMD} -e 's|SDL/|SDL11/|' > .endfor > >-do-install: >-# Script >- @${INSTALL_SCRIPT} ${WRKDIR}/warzone ${PREFIX}/bin >- >-# Program >- @${INSTALL_PROGRAM} ${WRKSRC}/src/warzone ${PREFIX}/libexec >- >-# Data >- @${MKDIR} ${DATADIR} >- @${CP} -R ${WRKSRC}/data/* ${DATADIR} >- >-# Documentation > .if !defined(NOPORTDOCS) >- @${MKDIR} ${DOCSDIR} >- @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} >-.endif >- > post-install: >-# Fix permissions >- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} >- @${FIND} ${DATADIR} -type f -print0 | \ >- ${XARGS} -0 ${CHMOD} ${SHAREMODE} >- @${FIND} ${DATADIR} -type d -print0 | \ >- ${XARGS} -0 ${CHMOD} ${BINMODE} >- >-.include <bsd.port.pre.mk> >- >-.if ${OSVERSION} < 500000 >-IGNORE= does not compile (missing stdint.h) >+ @${MKDIR} ${DOCSDIR} >+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ > .endif > >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >diff -ruN warzone2100.orig/distinfo warzone2100/distinfo >--- warzone2100.orig/distinfo Thu Jul 20 14:10:03 2006 >+++ warzone2100/distinfo Thu Jul 20 14:09:25 2006 >@@ -1,3 +1,3 @@ >-MD5 (warzone2100-0.2.2.tar.bz2) = b23fa1896856c3b9ee37b39029e4c532 >-SHA256 (warzone2100-0.2.2.tar.bz2) = 677e891a25c7caae96fc8e3226945bb5b5ffa1258a3ef9023365c03d7b47e062 >-SIZE (warzone2100-0.2.2.tar.bz2) = 31076323 >+MD5 (warzone-2.0.3.tar.bz2) = 2396e0def69e5e48902448d04944927a >+SHA256 (warzone-2.0.3.tar.bz2) = 7668f6b794faad8d7ae66dbd0c7317df2521b33593f29174ab3fecb647326749 >+SIZE (warzone-2.0.3.tar.bz2) = 19902273 >diff -ruN warzone2100.orig/files/patch-src_loadsave.c warzone2100/files/patch-src_loadsave.c >--- warzone2100.orig/files/patch-src_loadsave.c Thu Jul 20 14:10:03 2006 >+++ warzone2100/files/patch-src_loadsave.c Thu Jan 1 03:00:00 1970 >@@ -1,22 +0,0 @@ >---- src/loadsave.c.orig Wed Jul 27 13:33:56 2005 >-+++ src/loadsave.c Thu Sep 22 15:40:54 2005 >-@@ -341,7 +341,8 @@ >- } >- } >- } >-- closedir(d); >-+ if (d) >-+ closedir(d); >- } >- #endif >- bLoadSaveUp = TRUE; >-@@ -444,7 +445,8 @@ >- DeleteFile(entry->d_name); >- } >- >-- closedir(d); >-+ if (d) >-+ closedir(d); >- } >- #endif >- >diff -ruN warzone2100.orig/files/warzone.in warzone2100/files/warzone.in >--- warzone2100.orig/files/warzone.in Thu Jul 20 14:10:03 2006 >+++ warzone2100/files/warzone.in Thu Jan 1 03:00:00 1970 >@@ -1,7 +0,0 @@ >-#!/bin/sh >- >-# The executable needs to be run from its data directory. >- >-cd %%DATADIR%% || exit 1 >- >-exec %%PREFIX%%/libexec/warzone "$@" >diff -ruN warzone2100.orig/pkg-descr warzone2100/pkg-descr >--- warzone2100.orig/pkg-descr Thu Jul 20 14:10:03 2006 >+++ warzone2100/pkg-descr Thu Jul 20 14:09:25 2006 >@@ -10,4 +10,4 @@ > now, Warzone 2100 works very well on Windows and GNU/Linux, and we have even > heard of it running on BSD with no particular issue. > >-WWW: http://warzone2100.sf.net/ >+WWW: http://home.gna.org/warzone/ >diff -ruN warzone2100.orig/pkg-plist warzone2100/pkg-plist >--- warzone2100.orig/pkg-plist Thu Jul 20 14:10:03 2006 >+++ warzone2100/pkg-plist Thu Jul 20 14:09:25 2006 >@@ -1,93 +1,4 @@ > bin/warzone >-libexec/warzone >-%%PORTDOCS%%%%DOCSDIR%%/README >-%%DATADIR%%/2c-ardvark.wdg >-%%DATADIR%%/2c-bitofabarny.wdg >-%%DATADIR%%/2c-marspyscho.wdg >-%%DATADIR%%/8c-mars3gorges_8.wdg >-%%DATADIR%%/8c-marscodao.wdg >-%%DATADIR%%/8c-marsendgame.wdg >-%%DATADIR%%/8c-marsnrglvalis.wdg >-%%DATADIR%%/8c-marsrelic.wdg >-%%DATADIR%%/aug27.wdg >-%%DATADIR%%/cam2tech.wdg >-%%DATADIR%%/dec00.wdg >-%%DATADIR%%/july30.wdg >-%%DATADIR%%/june25.wdg >-%%DATADIR%%/marsbetamaps.txt >-%%DATADIR%%/may21.wdg >-%%DATADIR%%/may28.wdg >-%%DATADIR%%/multiplay/skirmish/player0.slo >-%%DATADIR%%/multiplay/skirmish/player0.vlo >-%%DATADIR%%/multiplay/skirmish/player1.slo >-%%DATADIR%%/multiplay/skirmish/player1.vlo >-%%DATADIR%%/multiplay/skirmish/player2.slo >-%%DATADIR%%/multiplay/skirmish/player2.vlo >-%%DATADIR%%/multiplay/skirmish/player3.slo >-%%DATADIR%%/multiplay/skirmish/player3.vlo >-%%DATADIR%%/multiplay/skirmish/player4.slo >-%%DATADIR%%/multiplay/skirmish/player4.vlo >-%%DATADIR%%/multiplay/skirmish/player5.slo >-%%DATADIR%%/multiplay/skirmish/player5.vlo >-%%DATADIR%%/multiplay/skirmish/player6.slo >-%%DATADIR%%/multiplay/skirmish/player6.vlo >-%%DATADIR%%/multiplay/skirmish/player7.slo >-%%DATADIR%%/multiplay/skirmish/player7.vlo >-%%DATADIR%%/multiplay/skirmish/rules.slo >-%%DATADIR%%/multiplay/skirmish/rules.vlo >-%%DATADIR%%/multiplay/skirmish/scriptlang.rtf >-%%DATADIR%%/multiplay/skirmish/sk2tech.vlo >-%%DATADIR%%/multiplay/skirmish/sk3tech.vlo >-%%DATADIR%%/multiplay/skirmish/sktech.slo >-%%DATADIR%%/music/music.wpl >-%%DATADIR%%/music/neos_aurore.ogg >-%%DATADIR%%/music/neos_chocolat.ogg >-%%DATADIR%%/music/neos_down.ogg >-%%DATADIR%%/music/neos_esperance.ogg >-%%DATADIR%%/music/neos_indy.ogg >-%%DATADIR%%/music/neos_symphonie_du_vide.ogg >-%%DATADIR%%/newmaps.wdg >-%%DATADIR%%/newtech.wdg >-%%DATADIR%%/nov.wdg >-%%DATADIR%%/oct.wdg >-%%DATADIR%%/sep30.wdg >-%%DATADIR%%/skirmish3.wdg >-%%DATADIR%%/stats/names.txt >-%%DATADIR%%/texpages/bdrops/00-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/00-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/01-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/01-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/02-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/02-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/03-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/03-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/04-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/04-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/05-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/05-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/06-bdrop.jpg >-%%DATADIR%%/texpages/bdrops/06-bdrop.pcx >-%%DATADIR%%/texpages/bdrops/credits.jpg >-%%DATADIR%%/texpages/bdrops/credits.pcx >-%%DATADIR%%/texpages/bdrops/missionend.jpg >-%%DATADIR%%/texpages/bdrops/missionend.pcx >-%%DATADIR%%/texpages/readme.txt >-%%DATADIR%%/texpages/tertilesc1.pcx >-%%DATADIR%%/texpages/tertilesc2.pcx >-%%DATADIR%%/texpages/tertilesc3.pcx >-%%DATADIR%%/texpages/tertilesc4hw.pcx >-%%DATADIR%%/texpages/tertilesc5.pcx >-%%DATADIR%%/texpages/tertilesc5hw.pcx >-%%DATADIR%%/texpages/tertilesc6.pcx >-%%DATADIR%%/texpages/tertilesc7.pcx >-%%DATADIR%%/texpages/tertilesc7hw.pcx >-%%DATADIR%%/update.rtf >-%%DATADIR%%/warzone.wdg >-@dirrm %%DATADIR%%/texpages/bdrops >-@dirrm %%DATADIR%%/texpages >-@dirrm %%DATADIR%%/stats >-@dirrm %%DATADIR%%/music >-@dirrm %%DATADIR%%/multiplay/skirmish >-@dirrm %%DATADIR%%/multiplay >+%%DATADIR%%/mp.wz >+%%DATADIR%%/warzone.wz > @dirrm %%DATADIR%% >-%%PORTDOCS%%@dirrm %%DOCSDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 100603
: 68430