X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bd36e1fb1340dd67ee779cb936cf66927c711c99..b91a74721d7a73c95baaeb81976ec9bd2a78098d:/doc/tips/ikiwiki_on_mac_os_x.mdwn

diff --git a/doc/tips/ikiwiki_on_mac_os_x.mdwn b/doc/tips/ikiwiki_on_mac_os_x.mdwn
index aa65baea4..6c7487a98 100644
--- a/doc/tips/ikiwiki_on_mac_os_x.mdwn
+++ b/doc/tips/ikiwiki_on_mac_os_x.mdwn
@@ -1,8 +1,27 @@
 [[!toc]]
+[[!meta date="2011-06-24 17:35:14 -0400"]]
+
+# pkgsrc
+
+The easiest way of installing an up-to-date ikiwiki on any version of Mac OS X is via
+[pkgsrc](http://www.pkgsrc.org/).
+
+## From source:
+
+7. [Bootstrap pkgsrc](http://www.netbsd.org/docs/pkgsrc/platforms.html#bootstrapping-pkgsrc)
+7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
+
+## From binary packages:
+
+7. [install binary packages (OSX)](http://www.pkgsrc.org/#index1h1)
+
+{OK} As of 2014/10/14, the [version of ikiwiki in pkgsrc](http://pkgsrc.se/www/ikiwiki) is 3.20140916.
+
+-----
 
 # MacPorts
 
-The easiest way of installing ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
+Another way to install ikiwiki on Mac OS X [Snow] Leopard and Tiger is via MacPorts: <http://www.macports.org/>
 
 This project ports Open Source software into Mac OS X platform.
 It's very easy to install ikiwiki via MacPorts:
@@ -21,19 +40,7 @@ enjoy
 
 Enrique Castilla
 
-[!] As of 2013/09/14, the [version of ikiwiki in MacPorts](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) is 3.20110608.
-
------
-
-# pkgsrc
-
-The other easiest way of installing ikiwiki on any version of Mac OS X is via
-[pkgsrc](http://www.pkgsrc.org/).
-
-7. Bootstrap pkgsrc
-7. Run `cd .../pkgsrc/www/ikiwiki && make install clean`
-
-{OK} As of 2013/09/14, the [version of ikiwiki in pkgsrc](http://pkgsrc.se/www/ikiwiki) is 3.20130904.1.
+[!] As of 2014/10/14, the [version of ikiwiki in MacPorts](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) is 3.20110608.
 
 -----
 
@@ -179,7 +186,7 @@ it installed without issue so I'm baffled why it didn't install from command lin
     _ This setup file causes ikiwiki to create a wiki, check it into revision
     _ control, generate a setup file for the new wiki, and set everything up.
     
-    _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup
+    _ Just run: ikiwiki --setup /etc/ikiwiki/auto.setup
     
     _By default, it asks a few questions, and confines itself to the user's home
     _directory. You can edit it to change what it asks questions about, or to