Date: Tue, 29 Mar 2011 14:42:24 -0500 From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/156046: port games/spring updates to 0.82.7.1 Message-ID: <4d923622.0a13e70a.382c.06ed@mx.google.com> Resent-Message-ID: <201103291950.p2TJo9wt045460@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156046
>Category: ports
>Synopsis: port games/spring updates to 0.82.7.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 29 19:50:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Zhihao Yuan
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Mar 14 02:51:28 CDT 2011 root@compaq.yuetime:/usr/obj/usr/src/sys/HOUKAGO amd64
>Description:
The famous RTS framework spring was updated to 0.82.7.1 . Note that I removed the patch which claim itself as "to remove unit pieces that don't render correctly". I don't agree with the patch.
And I replaced the static pkg-plist with PORTDATA. Actually, the old plist is incorrect. Use PORTDATA can make it correct even in the future :)
>How-To-Repeat:
>Fix:
--- patch-spring-0.82.7.1 begins here ---
diff -rupN spring.orig/Makefile spring/Makefile
--- spring.orig/Makefile 2010-09-22 19:26:55.000000000 -0500
+++ spring/Makefile 2011-03-29 14:23:58.965648823 -0500
@@ -6,7 +6,7 @@
#
PORTNAME= spring
-PORTVERSION= 0.82.5.1
+PORTVERSION= 0.82.7.1
CATEGORIES= games
MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
@@ -42,6 +42,7 @@ CMAKE_ARGS= -DDATADIR:STRING="share/${PO
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}
PORTDOCS= *
+PORTDATA= *
.include <bsd.port.pre.mk>
diff -rupN spring.orig/distinfo spring/distinfo
--- spring.orig/distinfo 2010-09-22 19:26:55.000000000 -0500
+++ spring/distinfo 2011-03-29 00:22:38.989642000 -0500
@@ -1,3 +1,2 @@
-MD5 (spring_0.82.5.1_src.tar.gz) = fe4f2080e6f923e37676cdfd90d7fd3c
-SHA256 (spring_0.82.5.1_src.tar.gz) = da858f981bfe679fffd1d283a8e20532fcfd78faabfc124328f545e730eb7645
-SIZE (spring_0.82.5.1_src.tar.gz) = 11216225
+SHA256 (spring_0.82.7.1_src.tar.gz) = 24a02b9489a52d96bc78899dda577e05ab24933f501ea50b504ae197777fde74
+SIZE (spring_0.82.7.1_src.tar.gz) = 11277409
diff -rupN spring.orig/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp
--- spring.orig/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp 2010-09-22 19:26:55.000000000 -0500
+++ spring/files/patch-rts-Sim-Projectiles-PieceProjectile.cpp 1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
---- rts/Sim/Projectiles/PieceProjectile.cpp.orig 2010-09-06 16:16:18.000000000 +0400
-+++ rts/Sim/Projectiles/PieceProjectile.cpp 2010-09-23 03:36:30.000000000 +0400
-@@ -64,7 +64,7 @@
- CPieceProjectile::CPieceProjectile(const float3& pos, const float3& speed, LocalModelPiece* lmp, int f, CUnit* owner, float radius):
- CProjectile(pos, speed, owner, true, false, true),
- flags(f),
-- dispList(lmp? lmp->displist: 0),
-+ dispList(),
- omp(NULL),
- spinAngle(0.0f),
- alphaThreshold(0.1f),
diff -rupN spring.orig/pkg-plist spring/pkg-plist
--- spring.orig/pkg-plist 2010-09-22 19:26:55.000000000 -0500
+++ spring/pkg-plist 2011-03-29 00:41:15.776731000 -0500
@@ -8,204 +8,6 @@ share/applications/spring.desktop
share/mime/packages/spring.xml
share/pixmaps/application-x-spring-demo.png
share/pixmaps/spring.png
-%%DATADIR%%/AI/Interfaces/C/0.1/InterfaceInfo.lua
-%%DATADIR%%/AI/Interfaces/C/0.1/libAIInterface.so
-%%DATADIR%%/AI/Skirmish/AAI/0.9/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/AAI/0.9/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/AAI/0.9/FAQ.txt
-%%DATADIR%%/AI/Skirmish/AAI/0.9/ReadMe.txt
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/general.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help/example_general.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help/example_mod.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AA5.0project.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AAIA10.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA_14.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/CA-BETA1.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/Expand_and_Exterminate_v_0.171.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/FF_1.21_S.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/KuroTA-v047.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/PURE0.51.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/S44Lyuban_v106.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/StarWars01.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTA.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTAPEV9585.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_epic.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_tiny.cfg
-%%DATADIR%%/AI/Skirmish/AAI/0.9/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BA-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BA-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BOTA-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/BOTA-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/NOTA-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/NOTA-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/SA-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/SA-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/XTA-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/XTA-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ca-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ca-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ct-categorization.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/ct-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs/template-config.cfg
-%%DATADIR%%/AI/Skirmish/E323AI/3.22.3/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/KAIK/0.13/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/KAIK/0.13/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/KAIK/0.13/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/NullAI/0.1/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/NullAI/0.1/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/NullAI/0.1/libSkirmishAI.so
-%%DATADIR%%/AI/Skirmish/RAI/0.601/AIInfo.lua
-%%DATADIR%%/AI/Skirmish/RAI/0.601/AIOptions.lua
-%%DATADIR%%/AI/Skirmish/RAI/0.601/libSkirmishAI.so
-%%DATADIR%%/CMakeFiles/CMakeDirectoryInformation.cmake
-%%DATADIR%%/CMakeFiles/gamedata.dir/DependInfo.cmake
-%%DATADIR%%/CMakeFiles/gamedata.dir/build.make
-%%DATADIR%%/CMakeFiles/gamedata.dir/cmake_clean.cmake
-%%DATADIR%%/CMakeFiles/gamedata.dir/depend.internal
-%%DATADIR%%/CMakeFiles/gamedata.dir/depend.make
-%%DATADIR%%/CMakeFiles/gamedata.dir/progress.make
-%%DATADIR%%/CMakeFiles/progress.marks
-%%DATADIR%%/LuaUI/CHANGELOG.txt
-%%DATADIR%%/LuaUI/Config/README.txt
-%%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.lua
-%%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.png
-%%DATADIR%%/LuaUI/Fonts/README
-%%DATADIR%%/LuaUI/Headers/colors.h.lua
-%%DATADIR%%/LuaUI/Headers/keysym.h.lua
-%%DATADIR%%/LuaUI/Icons/chi.png
-%%DATADIR%%/LuaUI/Icons/cross.png
-%%DATADIR%%/LuaUI/Icons/diamond.png
-%%DATADIR%%/LuaUI/Icons/e.png
-%%DATADIR%%/LuaUI/Icons/hemi-down.png
-%%DATADIR%%/LuaUI/Icons/hemi-up.png
-%%DATADIR%%/LuaUI/Icons/hemi.png
-%%DATADIR%%/LuaUI/Icons/hourglass-side.png
-%%DATADIR%%/LuaUI/Icons/hourglass.png
-%%DATADIR%%/LuaUI/Icons/m-down.png
-%%DATADIR%%/LuaUI/Icons/m-up.png
-%%DATADIR%%/LuaUI/Icons/m.png
-%%DATADIR%%/LuaUI/Icons/sphere.png
-%%DATADIR%%/LuaUI/Icons/square.png
-%%DATADIR%%/LuaUI/Icons/square_+.png
-%%DATADIR%%/LuaUI/Icons/square_x.png
-%%DATADIR%%/LuaUI/Icons/star-dark.png
-%%DATADIR%%/LuaUI/Icons/star.png
-%%DATADIR%%/LuaUI/Icons/tri-down.png
-%%DATADIR%%/LuaUI/Icons/tri-up.png
-%%DATADIR%%/LuaUI/Icons/triangle-down.png
-%%DATADIR%%/LuaUI/Icons/triangle-up.png
-%%DATADIR%%/LuaUI/Icons/x.png
-%%DATADIR%%/LuaUI/Images/flags25x15.png
-%%DATADIR%%/LuaUI/Images/highlight_strip.png
-%%DATADIR%%/LuaUI/Images/players.png
-%%DATADIR%%/LuaUI/Models/colors.lua
-%%DATADIR%%/LuaUI/Models/colors.mtl
-%%DATADIR%%/LuaUI/Models/colors.obj
-%%DATADIR%%/LuaUI/NEWS.txt
-%%DATADIR%%/LuaUI/README.txt
-%%DATADIR%%/LuaUI/Sounds/README.txt
-%%DATADIR%%/LuaUI/Sounds/bounce.wav
-%%DATADIR%%/LuaUI/Sounds/flag_grab.wav
-%%DATADIR%%/LuaUI/Sounds/land.wav
-%%DATADIR%%/LuaUI/Sounds/message_admin.wav
-%%DATADIR%%/LuaUI/Sounds/message_private.wav
-%%DATADIR%%/LuaUI/Sounds/message_team.wav
-%%DATADIR%%/LuaUI/Sounds/pop.wav
-%%DATADIR%%/LuaUI/Sounds/teamgrab.wav
-%%DATADIR%%/LuaUI/Widgets/camera_shake.lua
-%%DATADIR%%/LuaUI/Widgets/camera_smooth_move.lua
-%%DATADIR%%/LuaUI/Widgets/gui_buildspacing.lua
-%%DATADIR%%/LuaUI/Widgets/gui_comm_ends.lua
-%%DATADIR%%/LuaUI/Widgets/gui_hilight_unit.lua
-%%DATADIR%%/LuaUI/Widgets/gui_selbuttons.lua
-%%DATADIR%%/LuaUI/Widgets/gui_team_platter.lua
-%%DATADIR%%/LuaUI/Widgets/gui_xray_shader.lua
-%%DATADIR%%/LuaUI/Widgets/headless_setup.lua
-%%DATADIR%%/LuaUI/Widgets/ingame_lobby.example.lua
-%%DATADIR%%/LuaUI/Widgets/minimap_relative.lua
-%%DATADIR%%/LuaUI/Widgets/minimap_startbox.lua
-%%DATADIR%%/LuaUI/Widgets/unit_factory_guard.lua
-%%DATADIR%%/LuaUI/Widgets/unit_immobile_buider.lua
-%%DATADIR%%/LuaUI/Widgets/unit_metal_maker.lua
-%%DATADIR%%/LuaUI/Widgets/unit_stockpile.lua
-%%DATADIR%%/LuaUI/actions.lua
-%%DATADIR%%/LuaUI/callins.lua
-%%DATADIR%%/LuaUI/ctrlpanel.txt
-%%DATADIR%%/LuaUI/debug.lua
-%%DATADIR%%/LuaUI/flags.lua
-%%DATADIR%%/LuaUI/fonts.lua
-%%DATADIR%%/LuaUI/layout.lua
-%%DATADIR%%/LuaUI/loadmodel.lua
-%%DATADIR%%/LuaUI/main.lua
-%%DATADIR%%/LuaUI/savetable.lua
-%%DATADIR%%/LuaUI/selector.lua
-%%DATADIR%%/LuaUI/setupdefs.lua
-%%DATADIR%%/LuaUI/system.lua
-%%DATADIR%%/LuaUI/tweakmode.lua
-%%DATADIR%%/LuaUI/utils.lua
-%%DATADIR%%/LuaUI/widgets.lua
-%%DATADIR%%/Makefile
-%%DATADIR%%/PALETTE.PAL
-%%DATADIR%%/base/cursors.sdz
-%%DATADIR%%/base/maphelper.sdz
-%%DATADIR%%/base/spring/bitmaps.sdz
-%%DATADIR%%/base/springcontent.sdz
-%%DATADIR%%/cmake_install.cmake
-%%DATADIR%%/cmdcolors.txt
-%%DATADIR%%/ctrlpanel.txt
-%%DATADIR%%/fonts/AUTHORS
-%%DATADIR%%/fonts/COPYING
-%%DATADIR%%/fonts/CREDITS
-%%DATADIR%%/fonts/FreeSansBold.otf
-%%DATADIR%%/fonts/README
-%%DATADIR%%/luaui.lua
-%%DATADIR%%/selectkeys.txt
-%%DATADIR%%/springrc-template-headless.txt
-%%DATADIR%%/teamcolors.lua
-%%DATADIR%%/uikeys.txt
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/base/spring
-@dirrm %%DATADIR%%/base
-@dirrm %%DATADIR%%/LuaUI/Widgets
-@dirrm %%DATADIR%%/LuaUI/Sounds
-@dirrm %%DATADIR%%/LuaUI/Models
-@dirrm %%DATADIR%%/LuaUI/Images
-@dirrm %%DATADIR%%/LuaUI/Icons
-@dirrm %%DATADIR%%/LuaUI/Headers
-@dirrm %%DATADIR%%/LuaUI/Fonts
-@dirrm %%DATADIR%%/LuaUI/Config
-@dirrm %%DATADIR%%/LuaUI
-@dirrm %%DATADIR%%/CMakeFiles/gamedata.dir
-@dirrm %%DATADIR%%/CMakeFiles
-@dirrm %%DATADIR%%/AI/Skirmish/RAI/0.601
-@dirrm %%DATADIR%%/AI/Skirmish/RAI
-@dirrm %%DATADIR%%/AI/Skirmish/NullAI/0.1
-@dirrm %%DATADIR%%/AI/Skirmish/NullAI
-@dirrm %%DATADIR%%/AI/Skirmish/KAIK/0.13
-@dirrm %%DATADIR%%/AI/Skirmish/KAIK
-@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.22.3/configs
-@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.22.3
-@dirrm %%DATADIR%%/AI/Skirmish/E323AI
-@dirrm %%DATADIR%%/AI/Skirmish/CppTestAI/0.1
-@dirrm %%DATADIR%%/AI/Skirmish/CppTestAI
-@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod
-@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help
-@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg
-@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9
-@dirrm %%DATADIR%%/AI/Skirmish/AAI
-@dirrm %%DATADIR%%/AI/Skirmish
-@dirrm %%DATADIR%%/AI/Interfaces/C/0.1
-@dirrm %%DATADIR%%/AI/Interfaces/C
-@dirrm %%DATADIR%%/AI/Interfaces
-@dirrm %%DATADIR%%/AI
-@dirrm %%DATADIR%%
@dirrmtry share/mime/packages
@dirrmtry share/mime
@dirrmtry share/applications
--- patch-spring-0.82.7.1 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4d923622.0a13e70a.382c.06ed>