Update ikiwiki to 2.15. This includes latest security fix.

Remove patch -- make changes using SUBST_SED framework.

Add imagemagick as an option (not on by default).

Add perl:run for USE_TOOLS.

Add another script to REPLACE_PERL.

Get rid of most of post-install target and let the ikiwiki Makefile
do the installation.

Too many changes from CHANGELOG to list. Here are the most recent:

ikiwiki (2.15) unstable; urgency=low

  * Add a new ikiwiki-makerepo program, that automates setting up a repo
    and importing existing content for svn, git, and mercurial. This makes
    the setup process much simpler.
  * Reorganised git documentation.
  * Actually install the ikiwiki-update-wikilist program.
  * Improve workaround for perl bug #376329. Rather than double-encoding,
    which has been reported to cause encoding problems (though I haven't
    reproduced them), just catch a failure of markdown, and retry.
    (The crazy perl bug magically disappears on the retry.)
    Closes: #449379
  * Add umask configuration option. Closes: #443329

 -- Joey Hess <joeyh@debian.org>  Sat, 01 Dec 2007 11:44:01 -0500

ikiwiki (2.14) unstable; urgency=high

  * Let CC be used to control what compiler is used to build wrappers.
  * Use 'cc' instead of gcc as the default compiler.
  * Security fix: Ensure that there are no symlinks anywhere in the path
    to the top of the srcdir. In certian unusual configurations, an attacker
    who could commit to one of the parent directories of the srcdir could
    use a symlink attack to cause ikiwiki to publish files elsewhere in the
    filesystem. More details at <http://ikiwiki.info/security/#index29h2>

 -- Joey Hess <joeyh@debian.org>  Mon, 26 Nov 2007 15:26:06 -0500

1 files changed, 0 insertions, 50 deletions

diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa
deleted file mode 100644
index 9494b20f420..00000000000
--- a/www/ikiwiki/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/09/20 23:49:22 wiz Exp $
-
---- Makefile.PL.orig	2007-09-06 13:18:32.000000000 -0500
-+++ Makefile.PL	2007-09-06 13:19:50.000000000 -0500
-@@ -8,8 +8,6 @@
- q{
- all:: extra_build
- clean:: extra_clean
--install:: extra_install
--pure_install:: extra_install
- 
- VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
- 
-@@ -47,36 +45,6 @@
- 	rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
- 	$(MAKE) -C po clean
- 
--extra_install:
--	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
--	for dir in `find basewiki templates -follow -type d ! -regex '.*\.svn.*'`; do \
--		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
--		for file in `find $$dir -follow -maxdepth 1 -type f`; do \
--			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
--		done; \
--	done
--	
--	install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
--	for file in `find plugins -maxdepth 1 -type f`; do \
--		install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
--	done; \
--
--	install -d $(DESTDIR)$(PREFIX)/share/man/man1
--	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1
--	
--	install -d $(DESTDIR)$(PREFIX)/share/man/man8
--	install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8
--	
--	install -d $(DESTDIR)$(PREFIX)/sbin
--	install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin
--
--	install -d $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
--	install ikiwiki-w3m.cgi $(DESTDIR)$(PREFIX)/lib/w3m/cgi-bin
--
--	install -d $(DESTDIR)$(PREFIX)/bin
--	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
--
--	$(MAKE) -C po install PREFIX=$(PREFIX)
- }
- }
-