diff options
Diffstat (limited to 'games')
| -rw-r--r-- | games/vdrift-data/Makefile | 12 | ||||
| -rw-r--r-- | games/vdrift-data/distinfo | 6 | ||||
| -rw-r--r-- | games/vdrift/Makefile | 4 | ||||
| -rw-r--r-- | games/vdrift/distinfo | 6 | ||||
| -rw-r--r-- | games/vdrift/files/patch-SConstruct | 44 | ||||
| -rw-r--r-- | games/vdrift/files/patch-include_numprocessors.h | 20 | ||||
| -rw-r--r-- | games/vdrift/files/patch-include_physics.h | 11 | ||||
| -rw-r--r-- | games/vdrift/files/patch-po_SConscript | 11 | ||||
| -rw-r--r-- | games/vdrift/files/patch-src_SConscript | 52 |
9 files changed, 105 insertions, 61 deletions
diff --git a/games/vdrift-data/Makefile b/games/vdrift-data/Makefile index 90293d920d70..0dc333854940 100644 --- a/games/vdrift-data/Makefile +++ b/games/vdrift-data/Makefile @@ -6,28 +6,28 @@ # PORTNAME= data -PORTVERSION= 20080805 +PORTVERSION= 20090215 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= vdrift PKGNAMEPREFIX= vdrift- -DISTNAME= ${PKGNAMEPREFIX}2008-08-05-src +DISTNAME= ${PKGNAMEPREFIX}2009-02-15-src DIST_SUBDIR= vdrift MAINTAINER= acm@FreeBSD.org COMMENT= Vdrift driving simulation data files USE_BZIP2= yes +NO_PACKAGE= Package will be 450MB, set FORCE_PACKAGE if you really want it NO_BUILD= yes DATADIR= ${PREFIX}/share/vdrift PLIST= ${WRKDIR}/pkg-plist -WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}08-05-08 +WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}2009-02-15 post-extract: @cd ${WRKSRC}/data && \ - ${FIND} * -name SConscript -print0 | ${XARGS} -0 ${RM} -.for DIRE in settings/replays settings/screenshots carparts/turbo carparts/transmission \ - carparts/suspension carparts/other carparts/exhaust carparts/engine + ${FIND} * -name "SConscript*" -print0 | ${XARGS} -0 ${RM} +.for DIRE in music @${RMDIR} ${WRKSRC}/data/${DIRE} .endfor diff --git a/games/vdrift-data/distinfo b/games/vdrift-data/distinfo index 203928f92c62..f3ef8d012d38 100644 --- a/games/vdrift-data/distinfo +++ b/games/vdrift-data/distinfo @@ -1,3 +1,3 @@ -MD5 (vdrift/vdrift-2008-08-05-src.tar.bz2) = 9e3e3c91960146354c2a9fb65da3bd97 -SHA256 (vdrift/vdrift-2008-08-05-src.tar.bz2) = 79f91995a5a5b2c07e825d6ed8d3a034cc974b83a181d866347c8e837a1f649e -SIZE (vdrift/vdrift-2008-08-05-src.tar.bz2) = 287073224 +MD5 (vdrift/vdrift-2009-02-15-src.tar.bz2) = 52ff784e2b05f6d022666846b355eb15 +SHA256 (vdrift/vdrift-2009-02-15-src.tar.bz2) = 3a4a66487b476b049004e9e11b0893ade6ad4317979cf11a0613b48f34a5143a +SIZE (vdrift/vdrift-2009-02-15-src.tar.bz2) = 487794929 diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index 4c23649fd942..160639a1c166 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -6,11 +6,11 @@ # PORTNAME= vdrift -PORTVERSION= 20080508 +PORTVERSION= 20090215 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-08-05-08 +DISTNAME= ${PORTNAME}-2009-02-15 DIST_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org diff --git a/games/vdrift/distinfo b/games/vdrift/distinfo index 8ba908d09f7f..9aa73295a568 100644 --- a/games/vdrift/distinfo +++ b/games/vdrift/distinfo @@ -1,3 +1,3 @@ -MD5 (vdrift/vdrift-08-05-08.tar.bz2) = c8460bbec35bee252effac3dd3bf4b36 -SHA256 (vdrift/vdrift-08-05-08.tar.bz2) = 64a8560525892e799592647f941500f6ed1e6f81987abe35a2cb2c5366577bf7 -SIZE (vdrift/vdrift-08-05-08.tar.bz2) = 4935528 +MD5 (vdrift/vdrift-2009-02-15.tar.bz2) = 4e93137388e9f49e059dbeec6b39f0fe +SHA256 (vdrift/vdrift-2009-02-15.tar.bz2) = 1f8b189e23b49e6d4de78f915e3179bd7efb7361e47d653498625395a0b21e7e +SIZE (vdrift/vdrift-2009-02-15.tar.bz2) = 358035 diff --git a/games/vdrift/files/patch-SConstruct b/games/vdrift/files/patch-SConstruct index 79fa2f2c14f2..101fd6e2946b 100644 --- a/games/vdrift/files/patch-SConstruct +++ b/games/vdrift/files/patch-SConstruct @@ -1,14 +1,14 @@ ---- SConstruct 2009-01-15 23:59:59.000000000 -0500 -+++ SConstruct 2009-01-16 00:01:12.000000000 -0500 +--- SConstruct 2009-02-05 12:28:31.000000000 -0500 ++++ SConstruct 2009-05-12 22:37:17.000000000 -0500 @@ -6,26 +6,26 @@ # Build Options # #---------------# -opts = Options('vdrift.conf', ARGUMENTS) -+opts = Variables('vdrift.conf', ARGUMENTS) ++opts = Variables('vdrift.conf', ARGUMENTS) opts.Add('destdir', 'Staging area to install VDrift to. Useful for packagers. ', '') opts.Add('localedir', 'Path suffix were vdrift locales (.mo files) will be installed', "share/locale") - opts.Add('arch', 'Target architecture to compile vdrift for (x86, 686, p4, axp, a64)', 'x86') + opts.Add('arch', 'Target architecture to compile vdrift for (x86, 686, p4, axp, a64, prescott, nocona, core2)', 'x86') -opts.Add(BoolOption('minimal', 'Only install minimal data (3 cars and 2 tracks)', 0)) -opts.Add(BoolOption('cache', 'Cache options in vdrift.conf', 1)) -opts.Add(BoolOption('release', 'Turn off debug option during build', 0)) @@ -20,11 +20,11 @@ -opts.Add(BoolOption('os_cc', 'Set this to 1 if you want to use the operating system\'s C compiler environment variable.', 0)) -opts.Add(BoolOption('os_cxx', 'Set this to 1 if you want to use the operating system\'s C++ compiler environment variable.', 0)) -opts.Add(BoolOption('os_cxxflags', 'Set this to 1 if you want to use the operating system\'s C++ compiler flags environment variable.', 0)) --opts.Add(BoolOption('NLS', 'Set this to 1 to turn on i18n support', 1)) +-opts.Add(BoolOption('NLS', 'Set this to 1 to turn on i18n support', 0)) +-opts.Add(BoolOption('use_distcc', 'Set this to 1 to enable distributed compilacion', 0)) -opts.Add(BoolOption('force_feedback', 'Enable force-feedback support', 0)) -opts.Add(BoolOption('profiling', 'Turn on profiling output', 0)) -opts.Add(BoolOption('efficiency', 'Turn on compile-time efficiency warnings', 0)) --opts.Add(BoolOption('opcode', 'Set this to one if you have ode compiled with opcode', 0)) +opts.Add(BoolVariable('minimal', 'Only install minimal data (3 cars and 2 tracks)', 0)) +opts.Add(BoolVariable('cache', 'Cache options in vdrift.conf', 1)) +opts.Add(BoolVariable('release', 'Turn off debug option during build', 0)) @@ -36,11 +36,39 @@ +opts.Add(BoolVariable('os_cc', 'Set this to 1 if you want to use the operating system\'s C compiler environment variable.', 0)) +opts.Add(BoolVariable('os_cxx', 'Set this to 1 if you want to use the operating system\'s C++ compiler environment variable.', 0)) +opts.Add(BoolVariable('os_cxxflags', 'Set this to 1 if you want to use the operating system\'s C++ compiler flags environment variable.', 0)) -+opts.Add(BoolVariable('NLS', 'Set this to 1 to turn on i18n support', 1)) ++opts.Add(BoolVariable('NLS', 'Set this to 1 to turn on i18n support', 0)) ++opts.Add(BoolVariable('use_distcc', 'Set this to 1 to enable distributed compilacion', 0)) +opts.Add(BoolVariable('force_feedback', 'Enable force-feedback support', 0)) +opts.Add(BoolVariable('profiling', 'Turn on profiling output', 0)) +opts.Add(BoolVariable('efficiency', 'Turn on compile-time efficiency warnings', 0)) -+opts.Add(BoolVariable('opcode', 'Set this to one if you have ode compiled with opcode', 0)) #--------------------------# +@@ -43,7 +43,7 @@ + #---------------# + # FreeBSD build # + #---------------# +-if (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8'): ++if (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8'): + if 'LOCALBASE' in os.environ: + LOCALBASE = os.environ['LOCALBASE'] + else: +@@ -122,7 +122,7 @@ + #---------------# + elif ( 'win32' == sys.platform or 'cygwin' == sys.platform ): + env = Environment(ENV = os.environ, tools = ['mingw'], +- CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameters', '-O2', '-mwindows', '-mno-cygwin'], ++ CCFLAGS = ['-Wall', '-Wextra', '-Wno-unused-parameters', '', '-mwindows', '-mno-cygwin'], + CPPPATH = ['#include', '#tools/win/include', '#bullet-2.73/src'], + LIBPATH = ['#tools/win/dll'], + CPPDEFINES = ['_REENTRANT'], +@@ -387,7 +387,8 @@ + version = strftime("%Y-%m-%d") + if env['release']: + # release build, debugging off, optimizations on +- env.Append(CCFLAGS = ['-O1', '-pipe']) ++ if (sys.platform != 'freebsd6') and (sys.platform == 'freebsd7') and (sys.platform == 'freebsd8'): ++ env.Append(CCFLAGS = ['-O1', '-pipe']) + # version is current build date + #version = strftime("%Y-%m-%d") + else: diff --git a/games/vdrift/files/patch-include_numprocessors.h b/games/vdrift/files/patch-include_numprocessors.h new file mode 100644 index 000000000000..fc3b6da50eb4 --- /dev/null +++ b/games/vdrift/files/patch-include_numprocessors.h @@ -0,0 +1,20 @@ +--- include/numprocessors.h 2009-05-12 21:45:28.000000000 -0500 ++++ include/numprocessors.h 2009-05-12 21:46:26.000000000 -0500 +@@ -9,7 +9,7 @@ + #define QMP_USE_WINDOWS_THREADS + #include <windows.h> + #include <process.h> +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__FreeBSD__) + #include <pthread.h> + + // Required to get number of processors on OS X using sysctlbyname. +@@ -29,7 +29,7 @@ + SYSTEM_INFO systemInfo; + GetSystemInfo(&systemInfo); + return (unsigned int)systemInfo.dwNumberOfProcessors; +-#elif defined (__APPLE__) ++#elif defined (__APPLE__) || defined (__FreeBSD__) + int numProcessors = 0; + size_t size = sizeof(numProcessors); + int returnCode = sysctlbyname("hw.ncpu", &numProcessors, &size, NULL, 0); diff --git a/games/vdrift/files/patch-include_physics.h b/games/vdrift/files/patch-include_physics.h deleted file mode 100644 index 3d203c465be0..000000000000 --- a/games/vdrift/files/patch-include_physics.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/physics.h 2009-01-15 23:50:36.000000000 -0500 -+++ include/physics.h 2009-01-15 23:50:53.000000000 -0500 -@@ -36,7 +36,7 @@ - - list <btCollisionWorld::LocalRayResult> results; - -- virtual btScalar AddSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace) -+ virtual btScalar addSingleResult(btCollisionWorld::LocalRayResult& rayResult,bool normalInWorldSpace) - { - m_closestHitFraction = rayResult.m_hitFraction; - results.push_back(rayResult); diff --git a/games/vdrift/files/patch-po_SConscript b/games/vdrift/files/patch-po_SConscript deleted file mode 100644 index 4662eeaf8dfc..000000000000 --- a/games/vdrift/files/patch-po_SConscript +++ /dev/null @@ -1,11 +0,0 @@ ---- po/SConscript 2009-01-16 00:02:30.000000000 -0500 -+++ po/SConscript 2009-01-16 00:02:38.000000000 -0500 -@@ -164,7 +164,7 @@ - - - --environ = env.Copy() -+environ = env.Clone() - domain = 'VDrift' - environ.Append(PACKAGE=domain) - environ.Append(POTFILE=domain + '.pot') diff --git a/games/vdrift/files/patch-src_SConscript b/games/vdrift/files/patch-src_SConscript index b3b8b7957bcf..5d1aa3120fb9 100644 --- a/games/vdrift/files/patch-src_SConscript +++ b/games/vdrift/files/patch-src_SConscript @@ -1,20 +1,38 @@ ---- src/SConscript 2009-01-16 00:05:24.000000000 -0500 -+++ src/SConscript 2009-01-16 00:06:11.000000000 -0500 -@@ -61,7 +61,7 @@ - #------------------------# - # Copy Build Environment # - #------------------------# --local_env = env.Copy() -+local_env = env.Clone() - SConsignFile() +--- src/SConscript 2009-05-12 21:55:12.000000000 -0500 ++++ src/SConscript 2009-05-12 21:56:45.000000000 -0500 +@@ -11,8 +11,9 @@ + #vamosobjs = SConscript('vamos/SConscript', exports=['env', 'src_dir']) + #guiobjs = SConscript('gui/SConscript', exports=['env', 'src_dir']) + +-def addbulletpath( val ): +- return "../bullet-2.73/src/"+val ++if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8'): ++ def addbulletpath( val ): ++ return "../bullet-2.73/src/"+val - #--------------------------# -@@ -152,7 +152,7 @@ + #---------# + # Sources # +@@ -164,9 +165,10 @@ + BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp + BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp""") - if not ( 'win32' == sys.platform or 'cygwin' == sys.platform ): - #for now this seems to break windows build so disabling for win -- wrapper_build_env = local_env.Copy() -+ wrapper_build_env = local_env.Clone() +-bullet_src = map(addbulletpath, bullet_src) + +-src.extend(bullet_src) ++if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8'): ++ bullet_src = map(addbulletpath, bullet_src) ++ src.extend(bullet_src) + + #------------------------# + # Copy Build Environment # +@@ -181,6 +183,10 @@ + vdrift_install = None + common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'vorbisfile'] - pybase = 'python%s' % sys.version[0:3] - wrapper_build_env.Append(CPPPATH=[os.path.join(sys.prefix, 'include', pybase)], ++if (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8'): ++ common_libs.append('libbulletcollision') ++ common_libs.append('libbulletmath') ++ + #check to see how bullet was built + #if ( FindFile('libLinearMath.a', '#bullet-2.73/src/LinearMath') == None): + # common_libs.append('libbulletcollision') |