On Sun, Jun 15, 2014 at 10:38:51AM -0400, Brian Callahan wrote: > > On 06/15/14 07:14, Jonathan Gray wrote: > >The following diff updates openxcom to 1.0.0. > >Requires the previously posted yaml-cpp update. > > > >Uses MODGCC4 as it requires cpuid.h which isn't > >provided in base gcc and going by experience with > >Mesa the clang version is incompatible with gcc. > > Again, just an eye test. You need to bump EPOCH here for package > upgrades to work.
Index: Makefile =================================================================== RCS file: /cvs/ports/games/openxcom/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 25 Nov 2013 19:54:03 -0000 1.7 +++ Makefile 16 Jun 2014 06:21:56 -0000 @@ -2,26 +2,30 @@ BROKEN-alpha = OOM on XcomRuleset.cpp COMMENT = open source reimplementation of the original X-Com -DISTNAME = openxcom-20120217 -REVISION = 0 +DISTNAME = openxcom-1.0.0 +EPOCH = 0 CATEGORIES = games x11 -HOMEPAGE = http://openxcom.ninex.info/ +HOMEPAGE = http://openxcom.org MAINTAINER = Antti Harri <i...@openbsd.fi> # GPLv3 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = SDL SDL_gfx SDL_mixer c m pthread stdc++ yaml-cpp +WANTLIB = GL SDL SDL_gfx SDL_image SDL_mixer c m pthread yaml-cpp -MASTER_SITES = http://openbsd.fi/dist/ +MASTER_SITES = ${HOMEPAGE}/wp-content/uploads/downloads/2014/06/ -MODULES = devel/cmake +# needs cpuid.h from newer gcc +MODULES = devel/cmake gcc4 +MODGCC4_LANGS = c++ +MODGCC4_ARCHS = * RUN_DEPENDS = audio/timidity LIB_DEPENDS = devel/sdl-gfx \ + devel/sdl-image \ devel/sdl-mixer \ - devel/yaml-cpp + devel/yaml-cpp>=0.5.1 CONFIGURE_ARGS = -DDEV_BUILD=Off @@ -29,10 +33,6 @@ NO_TEST = Yes pre-configure: ${SUBST_CMD} ${WRKSRC}/src/Engine/CrossPlatform.cpp - -post-patch: - find "${WRKSRC}" \( -name '*.h' -o -name '*.cpp' \) -print0 | \ - xargs -0r perl -pi -e 's,yaml.h,yaml-cpp/yaml.h,' post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/openxcom Index: distinfo =================================================================== RCS file: /cvs/ports/games/openxcom/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 29 Feb 2012 08:25:32 -0000 1.3 +++ distinfo 15 Jun 2014 09:16:27 -0000 @@ -1,5 +1,2 @@ -MD5 (openxcom-20120217.tar.gz) = WKSqCfA1H+qa5f1HKZpPnQ== -RMD160 (openxcom-20120217.tar.gz) = 1YyeawdWv4ZtoMxVbOzxCoTHoUA= -SHA1 (openxcom-20120217.tar.gz) = rM7YTjcHdmyUujbU0VdRd58240o= -SHA256 (openxcom-20120217.tar.gz) = 6w+v4FL2wSHVolPJpo19nX8wV1lIhsy52faasM+WbfA= -SIZE (openxcom-20120217.tar.gz) = 778431 +SHA256 (openxcom-1.0.0.tar.gz) = ZgMS05TNOe+FVnXgX2w8lzRW3tpe67UmM8htOi0Ir+Y= +SIZE (openxcom-1.0.0.tar.gz) = 2809124 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/openxcom/patches/patch-CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 29 Feb 2012 08:25:32 -0000 1.1 +++ patches/patch-CMakeLists_txt 15 Jun 2014 09:23:33 -0000 @@ -1,10 +1,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 2012/02/29 08:25:32 ajacoutot Exp $ ---- CMakeLists.txt.orig Thu Feb 16 17:24:58 2012 -+++ CMakeLists.txt Sat Feb 18 21:07:47 2012 -@@ -125,5 +125,4 @@ if ( BUILD_PACKAGE ) +--- CMakeLists.txt.orig Sat Jun 14 05:35:59 2014 ++++ CMakeLists.txt Sun Jun 15 19:18:55 2014 +@@ -144,5 +144,4 @@ if ( BUILD_PACKAGE ) ) endif() -add_subdirectory ( docs ) add_subdirectory ( src ) -\ No newline at end of file Index: patches/patch-src_CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/openxcom/patches/patch-src_CMakeLists_txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_CMakeLists_txt --- patches/patch-src_CMakeLists_txt 29 Feb 2012 08:25:32 -0000 1.1 +++ patches/patch-src_CMakeLists_txt 15 Jun 2014 09:23:30 -0000 @@ -1,18 +1,18 @@ $OpenBSD: patch-src_CMakeLists_txt,v 1.1 2012/02/29 08:25:32 ajacoutot Exp $ ---- src/CMakeLists.txt.orig Thu Feb 16 17:24:58 2012 -+++ src/CMakeLists.txt Fri Feb 17 20:54:58 2012 -@@ -530,10 +530,10 @@ if ( WIN32 ) +--- src/CMakeLists.txt.orig Sat Jun 14 05:35:59 2014 ++++ src/CMakeLists.txt Sun Jun 15 19:20:26 2014 +@@ -716,10 +716,10 @@ if ( WIN32 ) endif () - target_link_libraries ( openxcom ${system_libs} ${SDLMIXER_LIBRARY} ${SDLGFX_LIBRARY} ${SDL_LIBRARY} ${YAMLCPP_LIBRARY} ) + target_link_libraries ( openxcom ${system_libs} ${SDLIMAGE_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLGFX_LIBRARY} ${SDL_LIBRARY} ${YAMLCPP_LIBRARY} ${OPENGL_gl_LIBRARY} ) -add_custom_command ( TARGET openxcom - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/data ${EXECUTABLE_OUTPUT_PATH}/data ) --install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION bin ) +-install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION ${data_install_dir} ) +#add_custom_command ( TARGET openxcom +# POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/data ${EXECUTABLE_OUTPUT_PATH}/data ) -+#install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION bin ) ++#install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/data DESTINATION ${data_install_dir} ) - # Copy Windows DLL to bin folder + # Copy Windows DLLs to bin folder if ( WIN32 ) Index: patches/patch-src_Engine_CrossPlatform_cpp =================================================================== RCS file: /cvs/ports/games/openxcom/patches/patch-src_Engine_CrossPlatform_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_Engine_CrossPlatform_cpp --- patches/patch-src_Engine_CrossPlatform_cpp 29 Feb 2012 08:25:32 -0000 1.1 +++ patches/patch-src_Engine_CrossPlatform_cpp 15 Jun 2014 09:24:59 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Engine_CrossPlatform_cpp,v 1.1 2012/02/29 08:25:32 ajacoutot Exp $ ---- src/Engine/CrossPlatform.cpp.orig Thu Feb 16 17:24:58 2012 -+++ src/Engine/CrossPlatform.cpp Fri Feb 17 21:17:42 2012 -@@ -145,6 +145,11 @@ std::vector<std::string> findDataFolders() +--- src/Engine/CrossPlatform.cpp.orig Sat Jun 14 05:35:59 2014 ++++ src/Engine/CrossPlatform.cpp Sun Jun 15 19:24:51 2014 +@@ -159,6 +159,11 @@ std::vector<std::string> findDataFolders() snprintf(path, MAXPATHLEN, "%s/Library/Application Support/OpenXcom/data/", home); #else snprintf(path, MAXPATHLEN, "%s/.local/share/openxcom/data/", home); @@ -13,15 +13,17 @@ $OpenBSD: patch-src_Engine_CrossPlatform #endif } list.push_back(path); -@@ -166,8 +171,9 @@ std::vector<std::string> findDataFolders() - snprintf(path, MAXPATHLEN, "%s/Users/Shared/OpenXcom/data/", home); - list.push_back(path); +@@ -178,10 +183,9 @@ std::vector<std::string> findDataFolders() + snprintf(path, MAXPATHLEN, "%s/Users/Shared/OpenXcom/data/", home); + list.push_back(path); #else -- list.push_back("/usr/local/share/openxcom/data/"); -- list.push_back("/usr/share/openxcom/data/"); -+ list.push_back("${PREFIX}/share/openxcom/"); -+ list.push_back("${PREFIX}/share/openxcom/data/"); -+ list.push_back("${PREFIX}/share/openxcom/DATA/"); - #endif - } - +- list.push_back("/usr/local/share/openxcom/data/"); +-#ifndef __FreeBSD__ +- list.push_back("/usr/share/openxcom/data/"); +-#endif ++ list.push_back("${PREFIX}/share/openxcom/"); ++ list.push_back("${PREFIX}/share/openxcom/data/"); ++ list.push_back("${PREFIX}/share/openxcom/DATA/"); + #ifdef DATADIR + snprintf(path, MAXPATHLEN, "%s/data/", DATADIR); + list.push_back(path); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/openxcom/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 29 Feb 2012 08:25:32 -0000 1.3 +++ pkg/PLIST 15 Jun 2014 10:22:41 -0000 @@ -3,31 +3,124 @@ share/doc/pkg-readmes/${FULLPKGNAME} share/openxcom/ share/openxcom/Language/ -share/openxcom/Language/Big.fnt -share/openxcom/Language/Czech.lng -share/openxcom/Language/English.lng -share/openxcom/Language/EnglishUk.lng share/openxcom/Language/Font.dat -share/openxcom/Language/French.geo -share/openxcom/Language/French.lng -share/openxcom/Language/German.geo -share/openxcom/Language/German.lng -share/openxcom/Language/Italian.geo -share/openxcom/Language/Italian.lng -share/openxcom/Language/Polish.geo -share/openxcom/Language/Polish.lng -share/openxcom/Language/Romanian.lng -share/openxcom/Language/Russian.geo -share/openxcom/Language/Russian.lng -share/openxcom/Language/Small.fnt -share/openxcom/Language/Spanish.geo -share/openxcom/Language/Spanish.lng +share/openxcom/Language/FontBig.png +share/openxcom/Language/FontGeoBig.png +share/openxcom/Language/FontGeoSmall.png +share/openxcom/Language/FontSmall.png +share/openxcom/Language/bg-BG.yml +share/openxcom/Language/cs-CZ.yml +share/openxcom/Language/da.yml +share/openxcom/Language/de.yml +share/openxcom/Language/en-GB.yml +share/openxcom/Language/en-US.yml +share/openxcom/Language/es-419.yml +share/openxcom/Language/es.yml +share/openxcom/Language/fi.yml +share/openxcom/Language/fr.yml +share/openxcom/Language/grk.yml +share/openxcom/Language/hu-HU.yml +share/openxcom/Language/it.yml +share/openxcom/Language/nl.yml +share/openxcom/Language/no.yml +share/openxcom/Language/pl-PL.yml +share/openxcom/Language/pt-BR.yml +share/openxcom/Language/pt-PT.yml +share/openxcom/Language/ro.yml +share/openxcom/Language/ru.yml +share/openxcom/Language/sk-SK.yml +share/openxcom/Language/sv.yml +share/openxcom/Language/tr-TR.yml +share/openxcom/Language/uk.yml +share/openxcom/MAPS/ +share/openxcom/MAPS/FIRES.MAP +share/openxcom/MAPS/INTERC.MAP share/openxcom/README.txt +share/openxcom/ROUTES/ +share/openxcom/ROUTES/FIRES.RMP +share/openxcom/ROUTES/INTERC.RMP +share/openxcom/Resources/ +share/openxcom/Resources/BulletSprites/ +share/openxcom/Resources/BulletSprites/BulletSprites.png +share/openxcom/Resources/BulletSprites/TFTD-LAND.png +share/openxcom/Resources/BulletSprites/TFTD-UNDERWATER.png +share/openxcom/Resources/Pathfinding/ +share/openxcom/Resources/Pathfinding/Pathfinding.png +share/openxcom/Resources/UI/ +share/openxcom/Resources/UI/reserve.png +share/openxcom/Resources/Weapons/ +share/openxcom/Resources/Weapons/Terror.png +share/openxcom/Resources/Weapons/license.txt +share/openxcom/Ruleset/ +share/openxcom/Ruleset/Aliens_Pick_Up_Weapons.rul +share/openxcom/Ruleset/UFOextender_Gun_Melee.rul +share/openxcom/Ruleset/UFOextender_Psionic_Line_Of_Fire.rul +share/openxcom/Ruleset/UFOextender_Starting_Avalanches.rul +share/openxcom/Ruleset/Xcom1Ruleset.rul +share/openxcom/Ruleset/XcomUtil_Always_Daytime.rul +share/openxcom/Ruleset/XcomUtil_Always_Nighttime.rul +share/openxcom/Ruleset/XcomUtil_Fighter_Transports.rul +share/openxcom/Ruleset/XcomUtil_High_Explosive_Damage.rul +share/openxcom/Ruleset/XcomUtil_Improved_Ground_Tanks.rul +share/openxcom/Ruleset/XcomUtil_Improved_Heavy_Laser.rul +share/openxcom/Ruleset/XcomUtil_No_Psionics.rul +share/openxcom/Ruleset/XcomUtil_Pistol_Auto_Shot.rul +share/openxcom/Ruleset/XcomUtil_Skyranger_Weapon_Slot.rul +share/openxcom/Ruleset/XcomUtil_Starting_Defensive_Base.rul +share/openxcom/Ruleset/XcomUtil_Starting_Defensive_Improved_Base.rul +share/openxcom/Ruleset/XcomUtil_Starting_Improved_Base.rul +share/openxcom/Ruleset/XcomUtil_Statstrings.rul +share/openxcom/Shaders/ +share/openxcom/Shaders/CRT-interlaced.OpenGL.shader +share/openxcom/Shaders/CRT-simple.OpenGL.shader +share/openxcom/Shaders/CRT.OpenGL.shader +share/openxcom/Shaders/Curvature.OpenGL.shader +share/openxcom/Shaders/HQ2x.OpenGL.shader +share/openxcom/Shaders/Openxcom.OpenGL.shader +share/openxcom/Shaders/Phosphor-simple.OpenGL.shader +share/openxcom/Shaders/Pixellate.OpenGL.shader +share/openxcom/Shaders/Quilez.OpenGL.shader +share/openxcom/Shaders/Raw.OpenGL.shader +share/openxcom/Shaders/SABR-XCOMified.OpenGL.shader +share/openxcom/Shaders/SABR.OpenGL.shader +share/openxcom/Shaders/Scale4xHQ.OpenGL.shader +share/openxcom/Shaders/dot_n_bloom.OpenGL.shader +share/openxcom/Shaders/heavybloom.OpenGL.shader +share/openxcom/Shaders/simplebloom.OpenGL.shader share/openxcom/SoldierName/ share/openxcom/SoldierName/American.nam +share/openxcom/SoldierName/Arabic.nam +share/openxcom/SoldierName/Belgium.nam share/openxcom/SoldierName/British.nam +share/openxcom/SoldierName/Chinese.nam +share/openxcom/SoldierName/Congolese.nam +share/openxcom/SoldierName/Czech.nam +share/openxcom/SoldierName/Danish.nam +share/openxcom/SoldierName/Dutch.nam +share/openxcom/SoldierName/Ethiopian.nam +share/openxcom/SoldierName/Finnish.nam share/openxcom/SoldierName/French.nam share/openxcom/SoldierName/German.nam +share/openxcom/SoldierName/Greek.nam +share/openxcom/SoldierName/Hindi.nam +share/openxcom/SoldierName/Hungarian.nam +share/openxcom/SoldierName/Irish.nam +share/openxcom/SoldierName/Italian.nam share/openxcom/SoldierName/Japanese.nam +share/openxcom/SoldierName/Kenyan.nam +share/openxcom/SoldierName/Korean.nam +share/openxcom/SoldierName/Nigerian.nam +share/openxcom/SoldierName/Norwegian.nam +share/openxcom/SoldierName/Polish.nam +share/openxcom/SoldierName/Polynesia.nam +share/openxcom/SoldierName/Portuguese.nam +share/openxcom/SoldierName/Romanian.nam share/openxcom/SoldierName/Russian.nam -share/openxcom/research.dat +share/openxcom/SoldierName/Slovak.nam +share/openxcom/SoldierName/Spanish.nam +share/openxcom/SoldierName/Swedish.nam +share/openxcom/SoldierName/Turkish.nam +share/openxcom/TERRAIN/ +share/openxcom/TERRAIN/FIRES.MCD +share/openxcom/TERRAIN/INTERC.MCD +share/openxcom/openxcom.png
