Commit Graph

752 Commits

Author SHA1 Message Date
Ingo Weinhold
f0273200d4 devel packages for mandatory packages must be in system as well 2013-07-05 14:09:09 +02:00
Ingo Weinhold
98c6dfa41e Switch build system from optional package to repositories
* Build libsolv and the dependency solver part of the package kit for
  the build platform.
* Add build tool get_package_dependencies. Given a list of package files
  and a list of repository files it determines the additional packages
  that need to be retrieved from the repositories and prints their URLs.
* Add rules to work with external repositories in the build system
  (build/jam/RepositoryRules):
  - PackageRepository declares an external repository with all its
    packages. The URL of the repository file isn't specified. It is
    computed from a given base URL and the SHA256 hash of the list of
    package files.
  - GeneratedRepositoryPackageList generates a file containing the file
    names of all packages in a repository.
  - IsPackageAvailable returns whether a package is available in any
    repository.
  - PackageURL returns the URL for a package.
* Declare the HaikuPorts repository for x86_gcc2
  (build/jam/repositories/HaikuPorts/x86_gcc2).
* Add rule AddHaikuImagePackages to add a package to the image and rule
  IsHaikuImagePackageAdded to determine whether a package has been
  added.
* OptionalPackages: Remove all entries that just downloaded and
  installed an external package. AddHaikuImagePackages can be used
  instead and is used in the remaining entries. Also move the remaining
  optional package dependency declarations from
  OptionalPackageDependencies here.
* ExtractBuildFeatureArchives: Instead of the URL parameter a package
  name must be specified now. This allows to simplify BuildFeatures
  significantly, since there's no dealing with URLs anymore. "if" out
  the entries that aren't supported yet.
* build_haiku_image: For the packages installed in system and common
  resolve their dependencies and download and install them as well.
2013-07-05 10:51:42 +02:00
Ingo Weinhold
301f4b463a Expander: also read rules from data directories
* ExpanderSettings: Use a settings directory "expander" and rename
  settings file to "settings".
* ExpanderRules: Read expander rules from "rules" files in the settings
  directory, then from files in expander/rules subdirectories of the
  installation location data directories, and finally add the built-in
  rules. This allows packages to provide expander rules (as already
  done by the p7zip package).
* OptionalPackages: Remove AddExpanderRuleToHaikuImage invocations.
* ImageRules: Remove Expander rule file related rules.
2013-06-30 13:29:48 +02:00
Ingo Weinhold
94307089f9 Update packages ffmpeg, openssh, p7zip 2013-06-30 11:49:40 +02:00
Ingo Weinhold
26ea70667a Deskbar: use a virtual directory for the user-configurable menu
* Deskbar now uses ~/config/settings/deskbar/menu_entries for its menu,
  falling back to /system/data/deskbar/menu_entries, when the former
  doesn't exist. The latter always exists and is a virtual directory
  merging the deskbar/menu subdirectories of ~/config/settings/ and
  <any installation location>/data/. So, if a package provides a
  deskbar menu symlink, it is added automatically when the package is
  activated. The user can add own menu items by putting stuff into
  ~/config/settings/deskbar/menu/, only use their own organization by
  symlinking it to menu_entries, or do fun stuff by making menu_entries
  a customized virtual directory.
* HaikuImage: No longer create any deskbar menu symlinks in the user's
  settings directory. Instead add them to the Haiku package.
* OptionalPackages: At least for the optional packages that do have
  hpkgs, no longer create deskbar menu symlinks in the user's settings
  directory.
* Move all Deskbar settings files to ~/config/settings/deskbar/ and
  drop the "Deskbar_" prefix.
2013-06-29 14:58:52 +02:00
Ingo Weinhold
2551c12bec Update wonderbrush package 2013-06-19 05:07:27 +02:00
Ingo Weinhold
b6163fd2ae Update openssh package 2013-06-18 11:57:29 +02:00
Ingo Weinhold
01293f6a5d OptionalPackages: fix syntax errors 2013-06-18 11:40:12 +02:00
Ingo Weinhold
56c3ef1d73 Disable xz-utils optional package for gcc 2 2013-06-18 11:32:23 +02:00
Ingo Weinhold
7f453e3b5f Update packages vision, wpa_supplicant, wqy_microhei, yasm 2013-06-18 11:29:00 +02:00
Ingo Weinhold
e31d588184 Update several packages
* neon
* openssh
* p7zip
* pe
* subversion
* tar
* timgmsoundfont
* wonderbrush
2013-06-18 05:06:54 +02:00
Ingo Weinhold
676cc5aafe Update packages mercurial, mkdepend 2013-06-17 21:22:28 +02:00
Ingo Weinhold
98c399b8c8 Update packages keymapswitcher, libedit, libxml2, libpcre 2013-06-17 21:06:31 +02:00
Ingo Weinhold
0ac19e7d42 Update several packages
* bzip2
* ca_root_certificates
* cdrtools
* cmake
* ctags
* curl
* cvs
* doxygen
* freetype
* git
* groff
* libsolv
* man
* nano
* readline
* sqlite
* python
2013-06-17 19:18:05 +02:00
Ingo Weinhold
8d1a9545a9 Update apr[_util], be_book, bepdf, jam packages 2013-06-16 03:54:50 +02:00
Ingo Weinhold
46792e5997 Update basic development packages 2013-06-15 23:03:59 +02:00
Ingo Weinhold
12629b106e Update expat package 2013-06-14 00:48:13 +02:00
Ingo Weinhold
a20eb7f497 Update libsolv package
Also make use of new build feature rules.
2013-06-14 00:48:12 +02:00
Ingo Weinhold
1d14716b9f Some renaming of zlib related jam variables 2013-06-14 00:48:12 +02:00
Ingo Weinhold
e4bd005daf Update jpeg package
* Also make use of new build feature rules.
* Since the hacky long_jump_buffer field has been removed from the
  jpeg_error_mgr struct in the new package, the structure is now
  wrapped in the JPEGTranslator code to achieve the same behavior.
2013-06-14 00:48:11 +02:00
Ingo Weinhold
e9f440fdfd Update libpng package
Also make use of new build feature rules
2013-06-14 00:48:11 +02:00
Ingo Weinhold
29f8805f6c Update freetype package
Also use the new build feature rules
2013-06-14 00:48:10 +02:00
Ingo Weinhold
14d5e307b4 Update ffmpeg package and its requirements
Also make use of new build feature rules.
2013-06-14 00:48:09 +02:00
Ingo Weinhold
e97e4b74a0 Update glu and mesa package
Also use the new build feature rules.
2013-06-14 00:48:08 +02:00
Ingo Weinhold
178da21ad1 Update icu package
Also use the new build feature rules.
2013-06-13 18:42:44 +02:00
Ingo Weinhold
ebb78dd9b7 Update openssl package
Also use the new build feature rules
2013-06-13 16:43:40 +02:00
Ingo Weinhold
c46f5969b7 Update zlib, gettext, libiconv, ncurses packages 2013-06-13 15:13:12 +02:00
Ingo Weinhold
a532c57308 Remove /boot/{apps,preferences} symlinks
And adjust all remained occurrence in the tree accordingly (->
/boot/common/{apps,preferences}).
2013-06-04 23:36:46 +02:00
Ingo Weinhold
badd403c5e Update grep package 2013-05-27 04:27:26 +02:00
Ingo Weinhold
7e7232aca8 Update cmake and libsolv packages 2013-05-20 18:21:41 +02:00
Ingo Weinhold
0bfcf7312a Move deskbar menu directory to ~/config/settings/deskbar/menu
Also remove the "be" symlink in ~/config/settings.
2013-05-11 09:57:58 +02:00
Ingo Weinhold
3271dcd7f6 Update be_book and vision packages 2013-05-09 21:36:31 +02:00
Ingo Weinhold
fa5dff5529 Replace various boolean rule parameters by flags
Instead of the boolean alwaysUpdate, isCDPackage, and stripDebugSymbols
parameters use a uniform flags parameter which can contain any of the
respectively supported flags (alwaysUpdate, cdPackage,
stripDebugSymbols, !stripDebugSymbols).
2013-05-07 04:43:50 +02:00
Ingo Weinhold
7c6bff1734 Complete outsourcing of zlib
* Add optional packages Zlib and Zlib-devel.
* Simplify the build feature section for zlib and also extract the
  source package.
* Replace all remaining references to the zlib instance in the tree and
  remove it.
2013-05-06 04:37:18 +02:00
Ingo Weinhold
b923a5072e Fix merge defect in ICU optional package declaration 2013-05-05 22:11:55 +02:00
Ingo Weinhold
25a7b01d15 Merge branch 'master' into package-management
Additional changes:
* Add src/system/kernel/lib/zlib, which builds a kernel version of zlib,
  needed by packagefs.
* BuildFeatures: Add a build feature "gcc2" to allow for easier checks.
* Referenceable.cpp: Include <OS.h> instead of <debugger.h>. The latter
  is not needed and prevents building for the build platform.
* zlib/zutil.h: Fix gcc 2 build. We really should use the external
  package instead.

Conflicts:
	.gitignore
	build/jam/BuildSetup
	build/jam/FileRules
	build/jam/FloppyBootImage
	build/jam/HaikuImage
	build/jam/ImageRules
	build/jam/KernelRules
	build/jam/NetBootArchive
	build/jam/OptionalBuildFeatures
	build/jam/OptionalLibPackages
	build/jam/OptionalPackageDependencies
	build/jam/OptionalPackages
	build/scripts/build_haiku_image
	configure
	data/bin/installoptionalpackage
	data/system/boot/Bootscript
	headers/os/app/Message.h
	headers/os/package/PackageInfo.h
	headers/os/package/PackageInfoAttributes.h
	headers/os/package/PackageInfoSet.h
	headers/os/package/PackageRoster.h
	headers/os/package/PackageVersion.h
	headers/os/package/hpkg/PackageInfoAttributeValue.h
	headers/os/storage/FindDirectory.h
	headers/os/storage/Node.h
	headers/os/support/StringList.h
	headers/private/system/directories.h
	src/add-ons/kernel/drivers/audio/ac97/es1370/Jamfile
	src/add-ons/kernel/file_systems/packagefs/AttributeIndex.cpp
	src/add-ons/kernel/file_systems/packagefs/Jamfile
	src/add-ons/kernel/file_systems/packagefs/Package.cpp
	src/add-ons/kernel/file_systems/packagefs/Package.h
	src/add-ons/kernel/file_systems/packagefs/PackageDomain.cpp
	src/add-ons/kernel/file_systems/packagefs/PackageDomain.h
	src/add-ons/kernel/file_systems/packagefs/PackageFSRoot.cpp
	src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp
	src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.h
	src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.cpp
	src/add-ons/kernel/file_systems/packagefs/PackageLinkSymlink.h
	src/add-ons/kernel/file_systems/packagefs/PackageLinksDirectory.cpp
	src/add-ons/kernel/file_systems/packagefs/PackageNode.h
	src/add-ons/kernel/file_systems/packagefs/ResolvableFamily.cpp
	src/add-ons/kernel/file_systems/packagefs/Version.cpp
	src/add-ons/kernel/file_systems/packagefs/Version.h
	src/add-ons/kernel/file_systems/packagefs/Volume.cpp
	src/add-ons/kernel/file_systems/packagefs/Volume.h
	src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
	src/add-ons/kernel/file_systems/userlandfs/shared/driver_settings.c
	src/apps/deskbar/BarApp.cpp
	src/apps/deskbar/BarMenuBar.cpp
	src/apps/deskbar/BarMenuBar.h
	src/apps/deskbar/BarView.cpp
	src/apps/deskbar/BarView.h
	src/apps/deskbar/BarWindow.cpp
	src/apps/deskbar/BarWindow.h
	src/apps/deskbar/DeskbarMenu.cpp
	src/apps/deskbar/DeskbarMenu.h
	src/apps/deskbar/DeskbarUtils.cpp
	src/apps/deskbar/DeskbarUtils.h
	src/apps/deskbar/ExpandoMenuBar.cpp
	src/apps/deskbar/ExpandoMenuBar.h
	src/apps/deskbar/TeamMenu.cpp
	src/apps/processcontroller/ProcessController.cpp
	src/apps/remotedesktop/RemoteDesktop.cpp
	src/bin/bash/config-top.h
	src/bin/finddir.c
	src/bin/package/Jamfile
	src/bin/package/command_add.cpp
	src/bin/package/command_create.cpp
	src/bin/package/command_list.cpp
	src/bin/package_repo/command_list.cpp
	src/bin/pkgman/command_refresh.cpp
	src/build/libbe/support/Jamfile
	src/build/libpackage/Jamfile
	src/build/libroot/Jamfile
	src/build/libroot/fs.cpp
	src/build/libroot/remapped_functions.h
	src/kits/locale/MutableLocaleRoster.cpp
	src/kits/opengl/GLRendererRoster.cpp
	src/kits/package/PackageInfo.cpp
	src/kits/package/PackageInfoSet.cpp
	src/kits/package/PackageRoster.cpp
	src/kits/package/PackageVersion.cpp
	src/kits/package/RepositoryCache.cpp
	src/kits/package/hpkg/PackageWriterImpl.cpp
	src/kits/package/hpkg/ReaderImplBase.cpp
	src/kits/package/hpkg/WriterImplBase.cpp
	src/kits/print/PrintTransport.cpp
	src/kits/print/Printer.cpp
	src/kits/screensaver/ScreenSaverRunner.cpp
	src/kits/support/StringList.cpp
	src/kits/tracker/ContainerWindow.cpp
	src/kits/tracker/DeskWindow.cpp
	src/kits/tracker/PoseView.cpp
	src/libs/print/libprint/Transport.cpp
	src/preferences/printers/AddPrinterDialog.cpp
	src/preferences/screensaver/ScreenSaverWindow.cpp
	src/servers/debug/DebugServer.cpp
	src/servers/input/AddOnManager.cpp
	src/servers/media_addon/MediaAddonServer.cpp
	src/system/boot/Jamfile
	src/system/boot/loader/Jamfile
	src/system/boot/loader/loader.cpp
	src/system/boot/loader/vfs.cpp
	src/system/kernel/fs/vfs.cpp
	src/system/kernel/fs/vfs_boot.cpp
	src/system/libroot/os/find_directory.cpp
	src/system/runtime_loader/runtime_loader.cpp
	src/tools/package/Jamfile
2013-05-05 15:03:26 +02:00
Ingo Weinhold
0d6e950639 Update mercurial and python packages 2013-05-04 01:02:44 +02:00
Ingo Weinhold
6b1789577a Update/add packages for readline, cvs, doxygen, python,
... and timgmsoundfont.
2013-05-03 15:47:11 +02:00
Ingo Weinhold
a82e49aeb0 Update cdrtools and keymapswitcher packages 2013-05-02 17:18:12 +02:00
Ingo Weinhold
7cbdf4f023 Update packages for several ports
* apr
* apr_util
* curl
* expat
* libxml2
* ncurses
* neon
* pcre
* subversion

This corrects the use of develop/lib paths and a few other things.
2013-04-30 22:50:18 +02:00
Ingo Weinhold
c476e9a368 Update openssh package 2013-04-30 00:40:09 +02:00
Ingo Weinhold
4fd280ddfa Simplify use of InstallOptionalHaikuImagePackage
When invoked for a hpkg only the installation location (i.e. "common"
or "system") has to be specified now and "common" is the default. The
rule uses AddPackageFilesToHaikuImage now.
2013-04-29 17:28:18 +02:00
Ingo Weinhold
5d41bc9af9 Add AddPackageFilesToHaikuImage rule 2013-04-29 16:13:03 +02:00
Ingo Weinhold
e17463fed2 Update gettext package 2013-04-29 11:44:34 +02:00
Ingo Weinhold
0302ce8180 Update bzip2 package 2013-04-29 01:43:01 +02:00
Ingo Weinhold
bd3c533887 Update openssh package 2013-04-29 01:03:50 +02:00
Oliver Tappe
d287414628 Update BeBook package and fix URL of BePDF package. 2013-04-28 23:50:46 +02:00
Oliver Tappe
3cd00599c8 Update packages for CARootCertificates, curl, BePDF 2013-04-28 19:58:29 +02:00
Ingo Weinhold
49da4a2d47 Update cmake and libsolv packages 2013-04-28 19:21:46 +02:00
Oliver Tappe
4521d4c6c7 Updated package for Pe (lpe symlink was borked). 2013-04-28 14:11:17 +02:00
Oliver Tappe
8aa0b0d792 Update packages apr, apr_util, curl, flex, jam, libpcre and Pe. 2013-04-28 02:40:43 +02:00
Ingo Weinhold
c704b139ee Update packages libtool, texinfo, sed, tar 2013-04-28 02:25:01 +02:00
Matt Madia
db6fcc4952 Fixed typo in variable use. 2013-04-27 08:20:53 -04:00
Ingo Weinhold
abfcf6aa3f Fix copy and paste error in NCurses optional package section 2013-04-27 03:13:37 +02:00
Ingo Weinhold
6ff8ef530d Add libedit package 2013-04-27 03:12:50 +02:00
Ingo Weinhold
b87aa11726 Update ncurses package
It now includes both the wchar and the non-wchar libraries.
2013-04-27 02:57:17 +02:00
Ingo Weinhold
d26ca29d75 Update mkdepend package 2013-04-27 00:19:18 +02:00
Ingo Weinhold
4e8a27c90f Update libxml2 package 2013-04-26 16:33:07 +02:00
Ingo Weinhold
4d6fe712e0 Update sqlite package (fix pkgconfig) 2013-04-26 01:40:34 +02:00
Ingo Weinhold
13321f4d4b Update sqlite package 2013-04-26 00:03:31 +02:00
Ingo Weinhold
8e452bcfc7 Update gcc, ncurses, and nano packages 2013-04-25 17:59:02 +02:00
Ingo Weinhold
db88e4417b Add ncurses optional package 2013-04-25 03:39:09 +02:00
Ingo Weinhold
4b42e1a6be Update man optional package to hpkg 2013-04-24 16:05:39 +02:00
Ingo Weinhold
e49c7394ef Update groff optional package to hpkg 2013-04-23 23:07:34 +02:00
Ingo Weinhold
f3b11fcb9d Update p7zip package 2013-04-23 20:49:06 +02:00
Ingo Weinhold
0d452c8f34 Remove the TrackerNewTemplates optional package
Instead add the files to the tree and generate the resulting files on
the fly. This also avoids the undesired attributes the files in the
package had.
2013-04-23 19:53:25 +02:00
Ingo Weinhold
15565a06d4 Repackaged WonderBrush zip as HPKG 2013-04-22 23:57:28 +02:00
Ingo Weinhold
60ac56d3fa Update wpa_supplicant package 2013-04-22 22:52:03 +02:00
Ingo Weinhold
dbcaf9ee61 Update WQY-MicroHei package 2013-04-22 20:35:41 +02:00
Ingo Weinhold
ef40a60ae8 Update Vision package 2013-04-22 19:10:06 +02:00
Ingo Weinhold
5be84d5f00 Update yasm package 2013-04-22 13:50:44 +02:00
Oliver Tappe
86b3c7a416 Drop symlink common/develop/tools/current
* drop the symlink itself (system development tools are now symlinked
  from /boot/common/bin directly)
* remove that symlink from PATH
2013-04-22 00:56:02 +02:00
Oliver Tappe
4b303759d2 Update prerequired packages with current versions. 2013-04-22 00:50:01 +02:00
Oliver Tappe
bab6caf3e0 Another lap of updating base packages:
* binutils has now been split off gcc
* adjusted other packages to new naming scheme
2013-04-20 15:32:19 +02:00
Ingo Weinhold
7b2d062147 Enforce current package rules for packages built from tree
* Replace '-' in package name by '_'.
* Use new '[...]' notation for pre-release version component.
2013-04-18 14:44:44 +02:00
Ingo Weinhold
88f22c9768 InstallOptionalHaikuImagePackage: Remove first parameter
Instead deduce the file name from the URL. A long overdue change. Avoids
unnecessary name duplication, which only led to errors.
2013-04-16 14:39:31 +02:00
Ingo Weinhold
6185f6e7cc Fix libtool file name 2013-04-16 13:45:33 +02:00
Oliver Tappe
e7563b87c7 Updated several base packages 2013-04-16 11:18:44 +02:00
Ingo Weinhold
19a268a459 Update libiconv and sqlite packages
The new package files haven't been rebuilt, just repackaged. Only small
details in the package-info changed.
2013-04-09 20:07:46 +02:00
Ingo Weinhold
1add554a83 Make LibSolv a mandatory package
... so it is actually installed on the image.
2013-04-03 21:04:55 +02:00
Michael Lotz
93c2c2aa6b Update wpa_supplicant to version 2.0 and bring in improvements.
* Updated to version 2.0 of vendor code.
* Reliability improvements in controlling the underlying devices.
* Implement leaving networks.
* Better timeout handling.
* Usability enhancements like cancel on escape, ok button being the
  default and the password field having focus on start.
* Storing of the password using BKeyStore.
2013-03-31 03:01:08 +02:00
Ingo Weinhold
3f986502fd Rebuilt packages for subversion and its dependencies 2013-03-29 02:09:20 +00:00
Ingo Weinhold
dd60d4eef6 OptionalPackages: Fix CVS URL
Due to a copy'n'paste error the curl package was used. While at it,
use the rebuilt package.
2013-03-28 12:16:41 +00:00
Ingo Weinhold
90692f47f7 Rebuilt packages required for bootstrapping 2013-03-28 00:20:23 +00:00
Ingo Weinhold
4e87ae1bbe Repackaged xz-utils package
It is now declared with architecture x86_gcc2, though it probably
has been built with gcc4. That issue has to be solved for real
eventually, since the package resolver won't allow mixing of gcc2
and gcc4 packages.
2013-03-27 21:17:41 +00:00
Humdinger
21406bd896 Added optional package System-sounds.
Added the optional package for system sounds that
were collected for GCI 2012. Also added the demo
packges to the "contents" at the top of OptionalPackages.
2013-03-12 18:47:08 +01:00
Alex Smith
7f562d441c Added xz-utils for x86_64 and updated to 5.0.4 (from scottmc). 2013-02-21 20:58:50 +00:00
Scott McCreary
22828f94b0 Updated autoconf and automake 2013-02-16 23:45:24 -08:00
Siarzhuk Zharski
44e22d214f Vim, KeymapSwitcher and UnRAR packages updated
* Version of Vim package for x86_64 added;
* Version of KeymapSwitcher package for x86_64 added;
* KeymapSwitcher package fixed to preserve Cmd <-> Ctrl swap settings on
  keymaps switch. Fixes #9142;
* UnRAR updated from 3.7.8 to 4.2.4, fixed for multibyte characters
  support and build for x86_64. Partially fixes #4879;
2013-01-22 09:38:48 +01:00
Matt Madia
10e65baba8 Disabled "Application flags" in liblayout.so
Repackaged the optional packages, BePDF and Wonderbrush to
disable the Application flags setting in their Filetype window.

Fixes #8821.
2013-01-02 08:24:15 +00:00
Alex Smith
622506c485 Added OpenSSH and Git optional packages for x86_64.
This commit is the first done from Haiku x86_64! Uncovered a few
networking bugs so hopefully this'll push OK... :)
2012-12-29 12:44:20 +00:00
Gleb Posobin
9d2f78ca74 Added Grep utility to the OptionalPackages
Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>
2012-12-28 19:58:34 +01:00
Rene Gollent
132b08d8ea WebKit package is now also available, missed this on previous commit. 2012-12-22 16:42:56 -05:00
Rene Gollent
4fd9bbbc8d Add x86-64 WebKit package. Makes Web+ available on x86-64. 2012-12-22 16:24:16 -05:00
Alex Smith
85a609cf7c More x86_64 optional packages from scottmc. 2012-12-22 18:43:25 +00:00
Alex Smith
c8d82cf6db Started adding x86_64 support to Debugger.
Stack tracing doesn't work yet, nor does single stepping (somehow
manages to completely freeze the system).
2012-12-19 19:54:20 +00:00
Rene Gollent
bbdb605224 Switch over to using Debugger as the primary system debugger.
- When a crash occurs that requires using consoled, use Debugger
  in CLI mode.

- Closes #1078.
2012-12-18 23:55:49 -05:00
Alex Smith
6e5f42ccc9 Added OpenSSL for x86_64. 2012-12-18 14:47:02 +00:00
Alex Smith
fbcad4e5e5 Added some more x86_64 optional packages from scottmc. 2012-12-14 17:20:03 +00:00
Alex Smith
abe053eb03 Added missing libbsd.so and a bunch of optional packages for x86_64 from scottmc. 2012-12-08 12:49:15 +00:00