Merge commit 'jrollins/master'

diff --git a/website/download.mdwn b/website/download.mdwn
index 0a891db58345a349558939cc4f468d294d49b862..9fba263dc2c8b72e821a9dd7d2ca5395c966a9d4 100644 (file)
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -18,15 +18,15 @@ Monkeysphere relies on:
 ## Debian ##
 
 If you are running a [Debian](http://www.debian.org/) system, the
-[monkeysphere is now available in the Debian unstable ("sid")
+[monkeysphere is available in the Debian unstable ("sid")
 distribution](http://packages.debian.org/sid/monkeysphere).
 
 You can also install the Monkeysphere directly from the Monkeysphere
 Debian archive.  You can add this archive to your system by putting
 the following lines in `/etc/apt/sources.list.d/monkeysphere.list`:
 
-       deb http://archive.monkeysphere.info/debian experimental monkeysphere
-       deb-src http://archive.monkeysphere.info/debian experimental monkeysphere
+    deb http://archive.monkeysphere.info/debian experimental monkeysphere
+    deb-src http://archive.monkeysphere.info/debian experimental monkeysphere
 
 The repository is currently signed by [The Monkeysphere archive
 signing key](/archive-key), key id EB8AF314 (fingerprint: `2E8D D26C
@@ -36,27 +36,16 @@ configuration after verifying its integrity](/archive-key).
 
 ## FreeBSD ##
 
-There is [now a FreeBSD port available](/news/FreeBSD-port-available)
-for the Monkeysphere.
+There is [a FreeBSD port
+available](http://www.freebsd.org/cgi/ports.cgi?query=monkeysphere)
+for the Monkeysphere, built and tested against FreeBSD 7.1.
 
-While the monkeysphere is not officially included in the ports tree
-yet, [a problem
-report](http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/128406) has
-been submitted, and the package itself is functional.
+You should be able to build and install the latest port with:
 
-The latest version of the ports directory can be found in [the git
-repository](/community) under
-`packaging/freebsd/security/monkeysphere`.  Please [let us
-know](/community) if you encounter any problems with it on a FreeBSD
-system.
-
-Until the port is accepted, you should be able to build the latest
-port with:
-
-    git clone git://git.monkeysphere.info/monkeysphere
-    cp -a monkeysphere/packaging/freebsd/security/monkeysphere /usr/ports/security
     cd /usr/ports/security/monkeysphere
-    make && make install
+    make package
+
+Enjoy!
 
 ## Source ##
 

diff --git a/website/news/FreeBSD-0.24-port-accepted.mdwn b/website/news/FreeBSD-0.24-port-accepted.mdwn
new file mode 100644 (file)
index 0000000..bdd5655
--- /dev/null
+++ b/website/news/FreeBSD-0.24-port-accepted.mdwn
@@ -0,0 +1,11 @@
+[[meta title="FreeBSD 0.24 port accepted"]]
+
+FreeBSD's ports tree now contains [a port of the
+Monkeysphere](http://www.freebsd.org/cgi/ports.cgi?query=monkeysphere),
+version 0.24.  If you run FreeBSD, [update your ports
+tree](http://www.freebsd.org/doc/en/books/handbook/ports-using.html),
+and then:
+
+    cd /usr/ports/security/monkeysphere
+    make package
+

diff --git a/website/news/FreeBSD-port-available.mdwn b/website/news/FreeBSD-port-available.mdwn
index a03af4e9779abd1ff19230d667dd9a26e5227752..fde2b47d16a3ec4fb047a4806ceb0a649e42b661 100644 (file)
--- a/website/news/FreeBSD-port-available.mdwn
+++ b/website/news/FreeBSD-port-available.mdwn
@@ -1,5 +1,8 @@
 [[meta title="FreeBSD port available"]]
 
+Update: [FreeBSD's official ports tree now contains monkeysphere
+0.24](FreeBSD-0.24-port-accepted).
+
 There is now a FreeBSD port available for the Monkeysphere.
 
 It has been built and tested (so far) on a FreeBSD 7.1 AMD64 system,