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

5 files changed, 67 insertions, 128 deletions

diff --git a/doc/CHANGES-2007 b/doc/CHANGES-2007
index 25db4fd73cf..72d8e4d5f97 100644
--- a/doc/CHANGES-2007
+++ b/doc/CHANGES-2007
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.2574 2007/12/04 02:29:54 jnemeth Exp $
+$NetBSD: CHANGES-2007,v 1.2575 2007/12/05 04:09:53 reed Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -4698,3 +4698,4 @@ Changes to the packages collection and infrastructure in 2007:
 	Updated sysutils/xentools3-hvm to 3.1.2 [bouyer 2007-12-03]
 	Added databases/php-oci8 version 5.2.5 [grant 2007-12-04]
 	Updated textproc/diction to 1.11 [bjs 2007-12-04]
+	Updated www/ikiwiki to 2.15 [reed 2007-12-05]
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index c325c351fea..d084ab4343b 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/10/06 00:09:39 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/05 04:09:53 reed Exp $
 #
 
-DISTNAME=	ikiwiki_2.6.1
+DISTNAME=	ikiwiki_2.15
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	1
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
@@ -12,7 +11,7 @@ HOMEPAGE=	http://ikiwiki.info/
 COMMENT=	Wiki compiler
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ikiwiki
-PKG_SUPPORTED_OPTIONS=	svn w3m
+PKG_SUPPORTED_OPTIONS=	imagemagick svn w3m
 PKG_SUGGESTED_OPTIONS=	# none on by default
 
 .include "../../mk/bsd.prefs.mk"
@@ -38,7 +37,10 @@ DEPENDS+=	p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
 DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
 
 # for img plugin
+.if !empty(PKG_OPTIONS:Mimagemagick)
+# the plugin uses the ImageMagick tools via PerlMagic
 DEPENDS+=	p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick
+.endif
 
 .if !empty(PKG_OPTIONS:Msvn)
 DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
@@ -47,59 +49,38 @@ DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
 .if !empty(PKG_OPTIONS:Mw3m)
 DEPENDS+=	w3m-[0-9]*:../../www/w3m
 PLIST_SUBST+=	W3M=""
+SUBST_SED.makefile+=	-e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,'
+INSTALLATION_DIRS+=	share/doc/ikiwiki/w3mmode
 .else
 PLIST_SUBST+=	W3M="@comment "
+SUBST_SED.makefile+=	-e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,'
 .endif
 
-
+INSTALLATION_DIRS+=	share/doc/ikiwiki
 WRKSRC=		${WRKDIR}/ikiwiki
 PERL5_PACKLIST=	auto/IkiWiki/.packlist
 USE_LANGUAGES=	# none
-USE_TOOLS=	gmake xgettext
+USE_TOOLS=	gmake perl:run xgettext
 
+# TODO: check these
 REPLACE_PERL+=	IkiWiki.pm ikiwiki-w3m.cgi mdwn2man pm_filter
-REPLACE_PERL+=	ikiwiki.in ikiwiki-mass-rebuild
+REPLACE_PERL+=	ikiwiki.in ikiwiki-mass-rebuild ikiwiki-update-wikilist
 REPLACE_PERL+=	t/*.t IkiWiki/*.pm IkiWiki/*/*.pm
 REPLACE_PERL+=	doc/ikiwiki.setup doc/w3mmode/ikiwiki.setup
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8
-
-post-extract:
-	cd ${WRKSRC} && ${CHMOD} a+r IkiWiki/Rcs/git.pm \
-		basewiki/favicon.ico doc/logo/ikiwiki_large.png \
-		doc/logo/ikiwiki.svgz templates/atomitem.tmpl
+SUBST_CLASSES+=	makefile
+SUBST_STAGE.makefile=	post-patch
+SUBST_FILES.makefile=	Makefile.PL
+SUBST_SED.makefile+=	-e 's,share/man/man,${PKGMANDIR}/man,g'
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ikiwiki
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ikiwiki/templates
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ikiwiki/basewiki
-	cd ${WRKSRC} && pax -rwLvpp templates basewiki ${PREFIX}/share/ikiwiki/
-
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ikiwiki
-# This is the ikiwiki website with near 600 files and near 2MB;
-# using pax -L above to copy the symlink targets for the needed doc
-#	cd ${WRKSRC}/html && pax -rwvpp . ${PREFIX}/share/doc/ikiwiki/
-
-# copy select files from docs
-	${INSTALL_DATA} ${WRKSRC}/doc/ikiwiki.setup \
-		${PREFIX}/share/doc/ikiwiki/ikiwiki.setup
-
-	${INSTALL_MAN} ${WRKSRC}/ikiwiki.man ${PREFIX}/${PKGMANDIR}/man1/ikiwiki.1
-	${INSTALL_MAN} ${WRKSRC}/ikiwiki-mass-rebuild.man ${PREFIX}/${PKGMANDIR}/man8/ikiwiki-mass-rebuild.8
-
-	${INSTALL_SCRIPT} ${WRKSRC}/ikiwiki-mass-rebuild ${PREFIX}/sbin
-
-	${INSTALL_SCRIPT} ${WRKSRC}/ikiwiki.out ${PREFIX}/bin/ikiwiki
-
-	${GMAKE} -C ${WRKSRC}/po install PREFIX=${PREFIX}
+	${INSTALL_DATA} ${WRKSRC}/html/ikiwiki.setup \
+		${PREFIX}/share/doc/ikiwiki/
 .if !empty(PKG_OPTIONS:Mw3m)
-	${INSTALL_SCRIPT} ${WRKSRC}/ikiwiki-w3m.cgi ${PREFIX}/libexec/w3m/cgi-bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ikiwiki/w3mmode
 	${INSTALL_DATA} ${WRKSRC}/html/w3mmode.html \
 		${PREFIX}/share/doc/ikiwiki/
 	${INSTALL_DATA} ${WRKSRC}/doc/w3mmode/ikiwiki.setup \
 		${PREFIX}/share/doc/ikiwiki/w3mmode/ikiwiki.setup
-
 .endif
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 68e247148da..b978073784e 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,13 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/20 23:49:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/12/05 04:09:53 reed Exp $
 bin/ikiwiki
-${W3M}lib/w3m/cgi-bin/ikiwiki-w3m.cgi
+bin/ikiwiki-makerepo
+bin/ikiwiki-update-wikilist
+lib/ikiwiki/plugins/externaldemo
+lib/ikiwiki/plugins/rst
+${W3M}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi
+man/man1/ikiwiki-makerepo.1
+man/man1/ikiwiki-update-wikilist.1
 man/man1/ikiwiki.1
 man/man8/ikiwiki-mass-rebuild.8
 sbin/ikiwiki-mass-rebuild
 share/doc/ikiwiki/ikiwiki.setup
 ${W3M}share/doc/ikiwiki/w3mmode.html
 ${W3M}share/doc/ikiwiki/w3mmode/ikiwiki.setup
-@comment find share/ikiwiki -type f | sort
 share/ikiwiki/basewiki/blog.mdwn
 share/ikiwiki/basewiki/favicon.ico
 share/ikiwiki/basewiki/helponformatting.mdwn
@@ -19,34 +24,6 @@ share/ikiwiki/basewiki/pagespec.mdwn
 share/ikiwiki/basewiki/preprocessordirective.mdwn
 share/ikiwiki/basewiki/sandbox.mdwn
 share/ikiwiki/basewiki/shortcuts.mdwn
-share/ikiwiki/basewiki/smileys.mdwn
-share/ikiwiki/basewiki/smileys/alert.png
-share/ikiwiki/basewiki/smileys/angry.png
-share/ikiwiki/basewiki/smileys/attention.png
-share/ikiwiki/basewiki/smileys/biggrin.png
-share/ikiwiki/basewiki/smileys/checkmark.png
-share/ikiwiki/basewiki/smileys/devil.png
-share/ikiwiki/basewiki/smileys/frown.png
-share/ikiwiki/basewiki/smileys/icon-error.png
-share/ikiwiki/basewiki/smileys/icon-info.png
-share/ikiwiki/basewiki/smileys/idea.png
-share/ikiwiki/basewiki/smileys/neutral.png
-share/ikiwiki/basewiki/smileys/ohwell.png
-share/ikiwiki/basewiki/smileys/prio1.png
-share/ikiwiki/basewiki/smileys/prio2.png
-share/ikiwiki/basewiki/smileys/prio3.png
-share/ikiwiki/basewiki/smileys/question.png
-share/ikiwiki/basewiki/smileys/redface.png
-share/ikiwiki/basewiki/smileys/sad.png
-share/ikiwiki/basewiki/smileys/smile.png
-share/ikiwiki/basewiki/smileys/smile2.png
-share/ikiwiki/basewiki/smileys/smile3.png
-share/ikiwiki/basewiki/smileys/smile4.png
-share/ikiwiki/basewiki/smileys/star_off.png
-share/ikiwiki/basewiki/smileys/star_on.png
-share/ikiwiki/basewiki/smileys/thumbs-up.png
-share/ikiwiki/basewiki/smileys/tired.png
-share/ikiwiki/basewiki/smileys/tongue.png
 share/ikiwiki/basewiki/style.css
 share/ikiwiki/basewiki/subpage.mdwn
 share/ikiwiki/basewiki/subpage/linkingrules.mdwn
@@ -56,6 +33,34 @@ share/ikiwiki/basewiki/templates/popup.mdwn
 share/ikiwiki/basewiki/wikiicons/diff.png
 share/ikiwiki/basewiki/wikiicons/openidlogin-bg.gif
 share/ikiwiki/basewiki/wikilink.mdwn
+share/ikiwiki/smiley/smileys.mdwn
+share/ikiwiki/smiley/smileys/alert.png
+share/ikiwiki/smiley/smileys/angry.png
+share/ikiwiki/smiley/smileys/attention.png
+share/ikiwiki/smiley/smileys/biggrin.png
+share/ikiwiki/smiley/smileys/checkmark.png
+share/ikiwiki/smiley/smileys/devil.png
+share/ikiwiki/smiley/smileys/frown.png
+share/ikiwiki/smiley/smileys/icon-error.png
+share/ikiwiki/smiley/smileys/icon-info.png
+share/ikiwiki/smiley/smileys/idea.png
+share/ikiwiki/smiley/smileys/neutral.png
+share/ikiwiki/smiley/smileys/ohwell.png
+share/ikiwiki/smiley/smileys/prio1.png
+share/ikiwiki/smiley/smileys/prio2.png
+share/ikiwiki/smiley/smileys/prio3.png
+share/ikiwiki/smiley/smileys/question.png
+share/ikiwiki/smiley/smileys/redface.png
+share/ikiwiki/smiley/smileys/sad.png
+share/ikiwiki/smiley/smileys/smile.png
+share/ikiwiki/smiley/smileys/smile2.png
+share/ikiwiki/smiley/smileys/smile3.png
+share/ikiwiki/smiley/smileys/smile4.png
+share/ikiwiki/smiley/smileys/star_off.png
+share/ikiwiki/smiley/smileys/star_on.png
+share/ikiwiki/smiley/smileys/thumbs-up.png
+share/ikiwiki/smiley/smileys/tired.png
+share/ikiwiki/smiley/smileys/tongue.png
 share/ikiwiki/templates/aggregatepost.tmpl
 share/ikiwiki/templates/archivepage.tmpl
 share/ikiwiki/templates/atomitem.tmpl
@@ -76,20 +81,23 @@ share/ikiwiki/templates/searchform.tmpl
 share/ikiwiki/templates/titlepage.tmpl
 share/locale/bg/LC_MESSAGES/ikiwiki.mo
 share/locale/cs/LC_MESSAGES/ikiwiki.mo
+share/locale/da/LC_MESSAGES/ikiwiki.mo
 share/locale/es/LC_MESSAGES/ikiwiki.mo
 share/locale/fr/LC_MESSAGES/ikiwiki.mo
 share/locale/gu/LC_MESSAGES/ikiwiki.mo
 share/locale/pl/LC_MESSAGES/ikiwiki.mo
 share/locale/sv/LC_MESSAGES/ikiwiki.mo
 share/locale/vi/LC_MESSAGES/ikiwiki.mo
-@comment find share/ikiwiki -type d | sort -r | sed -e 's/^/@dirrm /'
 @dirrm share/ikiwiki/templates
+@dirrm share/ikiwiki/smiley/smileys
+@dirrm share/ikiwiki/smiley
 @dirrm share/ikiwiki/basewiki/wikiicons
 @dirrm share/ikiwiki/basewiki/templates
 @dirrm share/ikiwiki/basewiki/subpage
-@dirrm share/ikiwiki/basewiki/smileys
 @dirrm share/ikiwiki/basewiki
 @dirrm share/ikiwiki
 ${W3M}@dirrm share/doc/ikiwiki/w3mmode
 @dirrm share/doc/ikiwiki
-@comment @dirrm libexec/w3m/cgi-bin
+${W3M}@dirrm libexec/w3m/cgi-bin
+@dirrm lib/ikiwiki/plugins
+@dirrm lib/ikiwiki
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index 754e26ae4e9..4a5780acc32 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/09/20 23:49:21 wiz Exp $
+$NetBSD: distinfo,v 1.3 2007/12/05 04:09:53 reed Exp $
 
-SHA1 (ikiwiki_2.6.1.tar.gz) = 5a425b1c18a84d0516024ff40d15bb768a6ad2ad
-RMD160 (ikiwiki_2.6.1.tar.gz) = 61b92ce47ebcd70ba47381996b3cce63ce16f993
-Size (ikiwiki_2.6.1.tar.gz) = 524410 bytes
-SHA1 (patch-aa) = ef5aad7c7217f968398a76185d3fe5724cf78bb3
+SHA1 (ikiwiki_2.15.tar.gz) = adc8c69ab3390a0131a96f5eafe20a9c2ce5997d
+RMD160 (ikiwiki_2.15.tar.gz) = 7a2f1604bbadc08c421eed3393aeaaece6f8ef0d
+Size (ikiwiki_2.15.tar.gz) = 592461 bytes
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)
- }
- }
-