Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / install.mdwn

diff --git a/doc/install.mdwn b/doc/install.mdwn
index 052fc71dc1faf0fb5d3802b7c489b71bc0c47c89..dafccb99f2799f01799294d68bca4162119f2286 100644 (file)
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -30,7 +30,13 @@ perl modules using this command:
 
        yum install perl-Text-Markdown perl-Mail-Sendmail perl-HTML-Scrubber \
          perl-XML-Simple perl-TimeDate perl-HTML-Template perl-CGI-FormBuilder \
-         perl-CGI-Session perl-File-MimeInfo perl-gettext
+         perl-CGI-Session perl-File-MimeInfo perl-gettext perl-Authen-Passphrase
+
+## macports
+
+IkiWiki can be installed [from macports]
+(http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+by running `sudo port install ikiwiki`.
 
 ## Installing by hand
 
@@ -38,8 +44,8 @@ If you want to install by hand from the tarball, you should make sure that
 all the perl modules are installed. This is one way to install them, using
 CPAN:
 
-       PERL5LIB=. PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
-       PERL5LIB=. PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki::Extras")'
+       PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki")'
+       PERL5LIB=`pwd` PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Bundle::IkiWiki::Extras")'
 
 Then to build and install ikiwiki: