Fix Ubuntu 16 test VM, rename directory

Also remove the FreeBSD VM definition, as it basically does not work in
VirtualBox and Vagrant, for whatever reason.

vagrant/freebsd10/.gitignore

@@ -1,2 +0,0 @@
-ssh_config
-.vagrant

vagrant/freebsd10/Vagrantfile

@@ -1,30 +0,0 @@
-#
-# Vagrantfile for FreeBSD 10.2 test environment.
-#
-Vagrant.configure(2) do |config|
-
-  config.ssh.shell = 'sh'
-
-  config.vm.box = 'freebsd/FreeBSD-10.2-RELEASE'
-  config.vm.guest = :freebsd
-
-  # this box needs a MAC address
-  config.vm.base_mac = '0800273E2877'
-
-  # need enough memory to build syntex_syntax crate
-  config.vm.provider 'virtualbox' do |vb|
-    vb.memory = 2048
-  end
-
-  config.vm.synced_folder '.', '/vagrant', disabled: true
-  config.vbguest.auto_update = false
-
-  # bring the system up to date
-  config.vm.provision 'shell', privileged: false, inline: <<-SHELL
-    sudo pkg update -q
-    sudo pkg upgrade -q -y
-    sudo pkg autoremove -y
-    sudo pkg clean -y
-  SHELL
-
-end

vagrant/freebsd10/fabfile.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-# -------------------------------------------------------------------
-#
-# Copyright (c) 2016 Nathan Fiedler
-#
-# This file is provided to you under the Apache License,
-# Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# -------------------------------------------------------------------
-"""Fabric file for installing requirements on FreeBSD."""
-
-import os
-
-from fabric.api import env, run, sudo, task
-
-env.shell = "/bin/sh -c"
-env.hosts = ["default"]
-env.use_ssh_config = True
-if os.path.exists("user_ssh_config"):
-    env.ssh_config_path = "user_ssh_config"
-else:
-    env.ssh_config_path = "ssh_config"
-
-
-@task
-def all():
-    """Install everything needed to build magick-rust."""
-    sudo("pkg install -q -y git")
-    sudo("pkg install -q -y rust")
-    sudo("pkg install -q -y cargo")
-    sudo("pkg install -q -y ImageMagick-nox11")
-    sudo("pkg install -q -y pkgconf")
-    sudo("pkg install -q -y clang-devel")
-    # set LIBCLANG_PATH so rustc can find libclang.so in its hidden place
-    # (using the append operation results in 'Unmatched ".' error)
-    run("echo 'setenv LIBCLANG_PATH /usr/local/llvm-devel/lib' >> .cshrc")

vagrant/ubuntu14/.gitignore

@@ -1,2 +0,0 @@
-ssh_config
-.vagrant

vagrant/ubuntu16/fabfile.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # -------------------------------------------------------------------
 #
-# Copyright (c) 2016 Nathan Fiedler
+# Copyright (c) 2016-2017 Nathan Fiedler
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file
@@ -37,14 +37,14 @@ def all():
     """Install everything needed to build magick-rust."""
     sudo('apt-get -q -y install git')
     sudo('apt-get -q -y install pkg-config')
-    # the rustc and cargo packages are fairly old, so build from source
-    run('wget -q https://static.rust-lang.org/rustup.sh')
-    run('chmod +x rustup.sh')
-    run('./rustup.sh --yes')
-    run('rm -f rustup.sh')
+    # need the latest possible release of rust for bindgen to work
+    run('wget -O rustup-init https://sh.rustup.rs')
+    run('chmod +x rustup-init')
+    run('./rustup-init -y')
+    run('rm -f rustup-init')
     sudo('apt-get -q -y build-dep imagemagick')
-    run('wget -q http://www.imagemagick.org/download/ImageMagick-6.9.5-7.tar.gz')
-    run('tar zxf ImageMagick-6.9.5-7.tar.gz')
+    run('wget -q https://www.imagemagick.org/download/ImageMagick-6.9.8-10.tar.gz')
+    run('tar zxf ImageMagick-6.9.8-10.tar.gz')
     with cd('ImageMagick-*'):
         run('./configure')
         run('make')