git.iko.soy/typeable/pandoc
on master help sign in
Removed local references to Portfile, since pandoc is now in the

MacPorts repository. Updated INSTALL instructions and website. git-svn-id: https://pandoc.googlecode.com/svn/trunk@919 788f1e2b-df1e-0410-8736-df70ead52e1b

commit6bf82d8f2975af72e2617246487977da1b827015 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateMon 27 Aug 2007, 22:18 (19 years ago) parent51c6c0a
3 files changed+13−36
compare with master
unifiedsplit
INSTALL+9−27 Makefile−2 web/index.txt.in+4−7
INSTALL+9−27
@@ -169,27 +169,13 @@ This is an alternative to compiling from source on MacOS X.
169169on MacOS X computers. If you don't already have MacPorts, follow
170170[these instructions for installing
171171it](http://trac.macosforge.org/projects/macports/wiki/InstallingMacPorts).
172−Note that you'll need OSX 10.4 and the latest version of XCode Tools.
173172
174−Once you've installed MacPorts, you'll need to create a local ports
175−repository and copy the [pandoc `Portfile`](Portfile) into it:
176−
177− mkdir -p ~/ports/textproc/pandoc
178− cp Portfile ~/ports/textproc/pandoc/
179−
180−Then (as root) open `/opt/local/etc/macports/sources.conf` in an editor
181−and insert the line
182−
183− file:///Users/yourusername/ports
184−
185−before the line beginning `rsync:`, so MacPorts will know about your
186−local repository. (Replace `yourusername` here with your user name.)
187−
188−Now you should be able to install pandoc by typing
173+Once you've installed MacPorts, you can install pandoc by typing:
189174
175+ sudo port sync # to get the most recent ports
190176 sudo port install pandoc
191177
192−Since pandoc requires GHC to build, the process may take a long time.
178+Since pandoc depends on GHC, the process may take a long time.
193179
194180Installing the Windows binary
195181=============================
@@ -205,18 +191,14 @@ these, compile from source.
205191Installing pandoc on Debian
206192===========================
207193
208−This method will work on Debian linux and derivatives (including Ubuntu).
209−Download the latest debian package from the [pandoc home page].
210−To install it, just type
211−
212− sudo dpkg -i pandoc_0.xx_i386.deb
213−
214−where `pandoc_0.xx_i386.deb` is the filename of the debian package.
215−To uninstall later, use
194+Pandoc is now in the debian unstable archive, and can be installed
195+using `apt-get` (as root):
216196
217− sudo apt-get remove pandoc
197+ apt-get install pandoc # the program, shell scripts, and docs
198+ apt-get install libghc6-pandoc-dev # the libraries
199+ apt-get install pandoc-doc # library documentation
218200
219−[pandoc home page]: http://sophos.berkeley.edu/macfarlane/pandoc/
201+Thanks to Recai Oktaş for setting up the debian packages.
220202
221203Installing pandoc on FreeBSD
222204============================
Makefile−2
@@ -343,8 +343,6 @@ $(web_dest) : html $(wildcard $(web_src)/*) changelog \
343343 cp changelog $(web_dest)/ ; \
344344 cp README $(web_dest)/ ; \
345345 cp INSTALL $(web_dest)/ ; \
346− cp $(portfile) $(web_dest)/ ; \
347− cp ../$(deb_main) $(web_dest)/ ; \
348346 cp $(MANDIR)/man1/pandoc.1.md $(web_dest)/ ; \
349347 cp $(MANDIR)/man1/*.1 $(web_dest)/ ; \
350348 ) || { rm -rf $(web_dest); exit 1; }
web/index.txt.in+4−7
@@ -57,13 +57,11 @@ To see what pandoc can do, see the [demonstration page](examples.html).
5757# Downloads
5858
5959For installation instructions for all architectures, see
60−[INSTALL](INSTALL.html).
60+[INSTALL](INSTALL.html). Note that pandoc is in the MacPorts,
61+[Debian unstable], and [FreeBSD ports] repositories.
6162
6263- [Source tarball]
6364- [Windows binary package]
64−- [MacPorts Portfile]
65−- [FreeBSD port]
66−- [Debian linux package] (thanks to Recai Oktaş)
6765
6866# Code repository
6967
@@ -157,9 +155,8 @@ kind.
157155[Source tarball]: http://code.google.com/p/pandoc/downloads/detail?name=pandoc-@VERSION@.tar.gz "Download source tarball from Pandoc's Google Code site"
158156[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"
159157[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"
160−[MacPorts Portfile]: Portfile
161−[Debian linux package]: http://packages.debian.org/unstable/text/pandoc
162−[FreeBSD port]: http://www.freshports.org/textproc/pandoc/
158+[Debian unstable]: http://packages.debian.org/unstable/text/pandoc
159+[FreeBSD ports]: http://www.freshports.org/textproc/pandoc/
163160[pandoc-announce]: http://groups.google.com/group/pandoc-announce
164161[pandoc-discuss]: http://groups.google.com/group/pandoc-discuss
165162[changelog]: changelog