diff options
| -rw-r--r-- | INSTALL | 36 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | web/index.txt.in | 11 |
3 files changed, 13 insertions, 36 deletions
@@ -169,27 +169,13 @@ This is an alternative to compiling from source on MacOS X. on MacOS X computers. If you don't already have MacPorts, follow [these instructions for installing it](http://trac.macosforge.org/projects/macports/wiki/InstallingMacPorts). -Note that you'll need OSX 10.4 and the latest version of XCode Tools. -Once you've installed MacPorts, you'll need to create a local ports -repository and copy the [pandoc `Portfile`](Portfile) into it: - - mkdir -p ~/ports/textproc/pandoc - cp Portfile ~/ports/textproc/pandoc/ - -Then (as root) open `/opt/local/etc/macports/sources.conf` in an editor -and insert the line - - file:///Users/yourusername/ports - -before the line beginning `rsync:`, so MacPorts will know about your -local repository. (Replace `yourusername` here with your user name.) - -Now you should be able to install pandoc by typing +Once you've installed MacPorts, you can install pandoc by typing: + sudo port sync # to get the most recent ports sudo port install pandoc -Since pandoc requires GHC to build, the process may take a long time. +Since pandoc depends on GHC, the process may take a long time. Installing the Windows binary ============================= @@ -205,18 +191,14 @@ these, compile from source. Installing pandoc on Debian =========================== -This method will work on Debian linux and derivatives (including Ubuntu). -Download the latest debian package from the [pandoc home page]. -To install it, just type - - sudo dpkg -i pandoc_0.xx_i386.deb - -where `pandoc_0.xx_i386.deb` is the filename of the debian package. -To uninstall later, use +Pandoc is now in the debian unstable archive, and can be installed +using `apt-get` (as root): - sudo apt-get remove pandoc + apt-get install pandoc # the program, shell scripts, and docs + apt-get install libghc6-pandoc-dev # the libraries + apt-get install pandoc-doc # library documentation -[pandoc home page]: http://sophos.berkeley.edu/macfarlane/pandoc/ +Thanks to Recai Oktaş for setting up the debian packages. Installing pandoc on FreeBSD ============================ @@ -343,8 +343,6 @@ $(web_dest) : html $(wildcard $(web_src)/*) changelog \ cp changelog $(web_dest)/ ; \ cp README $(web_dest)/ ; \ cp INSTALL $(web_dest)/ ; \ - cp $(portfile) $(web_dest)/ ; \ - cp ../$(deb_main) $(web_dest)/ ; \ cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \ cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \ ) || { rm -rf $(web_dest); exit 1; } diff --git a/web/index.txt.in b/web/index.txt.in index 3af2f16f9..ae29cca16 100644 --- a/web/index.txt.in +++ b/web/index.txt.in @@ -57,13 +57,11 @@ To see what pandoc can do, see the [demonstration page](examples.html). # Downloads For installation instructions for all architectures, see -[INSTALL](INSTALL.html). +[INSTALL](INSTALL.html). Note that pandoc is in the MacPorts, +[Debian unstable], and [FreeBSD ports] repositories. - [Source tarball] - [Windows binary package] -- [MacPorts Portfile] -- [FreeBSD port] -- [Debian linux package] (thanks to Recai Oktaş) # Code repository @@ -157,9 +155,8 @@ kind. [Source tarball]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.tar.gz "Download source tarball from Pandoc's Google Code site" [MacOS X binary package]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.dmg "Download Mac OS X disk image from Pandoc's Google Code site" [Windows binary package]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.zip "Download Windows zip file from Pandoc's Google Code site" -[MacPorts Portfile]: Portfile -[Debian linux package]: http://packages.debian.org/unstable/text/pandoc -[FreeBSD port]: http://www.freshports.org/textproc/pandoc/ +[Debian unstable]: http://packages.debian.org/unstable/text/pandoc +[FreeBSD ports]: http://www.freshports.org/textproc/pandoc/ [pandoc-announce]: http://groups.google.com/group/pandoc-announce [pandoc-discuss]: http://groups.google.com/group/pandoc-discuss [changelog]: changelog |