Update to 3.20110431. From the changelog:

   * Danish translation update. Closes: #625721
   * Danish underlay translation update. Closes: #625765
     (Thanks, Jonas Smedegaard)
   * Support YAML::XS by not passing decoded unicode to Load. Closes: #625713
   * openid, aggregate, pinger: Use Net::INET6Glue if available to
     support making ipv6 connections. (Note that if LWPx::ParanoidAgent
     is installed, it defeats this for openid.)
   * Add additional directive quoting styles, to better support nested
     directives. Both triple-single-quote and heredoc quotes can be used.
     (Thanks, Timo Paulssen)
   * Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
   * po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
     Closes: #627844
   * po: Make po4a warn, not error on a malformed document. (intrigeri)
   * Support the Hiawatha web server which sets HTTPS=off rather than not
     setting it. (There does not seem to be a standard here.)

pkgsrc changes:
* Adjust local modifications to improve our upstream chances.
* Quell pkglint.
* Indent consistently.

1 files changed, 43 insertions, 50 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 2ddaa042ccf..7306abd99d3 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,71 +1,63 @@
-# $NetBSD: Makefile,v 1.77 2011/05/01 03:12:52 schmonz Exp $
+# $NetBSD: Makefile,v 1.78 2011/06/04 15:23:35 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20110430
-PKGNAME=	${DISTNAME:S/_/-/}
-CATEGORIES=	www textproc
-MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
+DISTNAME=		ikiwiki_3.20110431
+PKGNAME=		${DISTNAME:S/_/-/}
+CATEGORIES=		www textproc
+MASTER_SITES=		${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
 
-MAINTAINER=	schmonz@NetBSD.org
-HOMEPAGE=	http://ikiwiki.info/
-COMMENT=	Wiki compiler
-LICENSE=	gnu-gpl-v2
+MAINTAINER=		schmonz@NetBSD.org
+HOMEPAGE=		http://ikiwiki.info/
+COMMENT=		Wiki compiler
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
-DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
-DEPENDS+=	p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
-DEPENDS+=	p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
-DEPENDS+=	p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
-DEPENDS+=	p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
-DEPENDS+=	p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
-DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
-DEPENDS+=	p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
-DEPENDS+=	p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
-DEPENDS+=	p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
-DEPENDS+=	p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
-DEPENDS+=	p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
-DEPENDS+=	p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
-DEPENDS+=	p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
-DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
-DEPENDS+=	p5-YAML-[0-9]*:../../textproc/p5-YAML
-#DEPENDS+=	po4a-[0-9]*:../../textproc/po4a
+DEPENDS+=		p5-Text-Markdown-[0-9]*:../../textproc/p5-Text-Markdown
+DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
+DEPENDS+=		p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
+DEPENDS+=		p5-CGI-Session-[0-9]*:../../www/p5-CGI-Session
+DEPENDS+=		p5-CGI-FormBuilder>=3.05:../../www/p5-CGI-FormBuilder
+DEPENDS+=		p5-Mail-Sendmail-[0-9]*:../../mail/p5-Mail-Sendmail
+DEPENDS+=		p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
+DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
+DEPENDS+=		p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
+DEPENDS+=		p5-RPC-XML-[0-9]*:../../net/p5-RPC-XML
+DEPENDS+=		p5-XML-Atom-[0-9]*:../../textproc/p5-XML-Atom
+DEPENDS+=		p5-XML-Feed-[0-9]*:../../textproc/p5-XML-Feed
+DEPENDS+=		p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple
+DEPENDS+=		p5-XML-RSS-[0-9]*:../../textproc/p5-XML-RSS
+DEPENDS+=		p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo
+DEPENDS+=		p5-gettext-[0-9]*:../../devel/p5-gettext
+DEPENDS+=		p5-YAML-[0-9]*:../../textproc/p5-YAML
+#DEPENDS+=		po4a-[0-9]*:../../textproc/po4a
 
 WRKSRC=			${WRKDIR}/${PKGBASE}
 PERL5_PACKLIST=		auto/IkiWiki/.packlist
 USE_LANGUAGES=		# none
 USE_TOOLS+=		gmake msgfmt perl:run xgettext
 
-REPLACE_PERL+=	ikiwiki-calendar.in ikiwiki-mass-rebuild
-REPLACE_PERL+=	ikiwiki-transition.in ikiwiki-update-wikilist
-REPLACE_PERL+=	ikiwiki-w3m.cgi ikiwiki.in gitremotes mdwn2man pm_filter
-REPLACE_PERL+=	*.pm IkiWiki/*.pm IkiWiki/*/*.pm* *.setup */*.setup */*/*.setup
-REPLACE_PERL+=	po/po2wiki t/*.t
-REPLACE_PERL+=	plugins/externaldemo	# XXX not installed
-
-REPLACE_PYTHON+=plugins/proxy.py plugins/pythondemo plugins/rst
-
-SUBST_CLASSES+=		sysconfdir
-SUBST_STAGE.sysconfdir=	pre-configure
-SUBST_FILES.sysconfdir=	ikiwiki-mass-rebuild ikiwiki-update-wikilist
-SUBST_SED.sysconfdir+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-
-SUBST_CLASSES+=		perlpath
-SUBST_STAGE.perlpath=	pre-configure
-SUBST_FILES.perlpath=	IkiWiki/Setup/Standard.pm
-SUBST_SED.perlpath+=	-e 's,@PERL5@,${PERL5},g'
+REPLACE_PERL+=		Makefile.PL *.in *.cgi *.pm* */*.pm* */*/*.pm* */*.t
+REPLACE_PERL+=		*.setup */*.setup */*/*.setup
+REPLACE_PERL+=		ikiwiki-mass-rebuild ikiwiki-update-wikilist
+REPLACE_PERL+=		gitremotes mdwn2man pm_filter po/po2wiki
+REPLACE_PERL+=		plugins/externaldemo	# XXX not installed
+# find . -type f -print | \
+# perl -ne 'open(F, "<$_"); $l=<F>; print if $l =~ m|^#!/usr/bin/perl|'
+REPLACE_PYTHON+=	plugins/proxy.py plugins/pythondemo plugins/rst
 
 MAKE_FLAGS+=		W3M_CGI_BIN=${PREFIX:Q}/libexec/w3m/cgi-bin
-MAKE_FLAGS+=		CONFIGDIR=${EGDIR:Q}
+MAKE_FLAGS+=		SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 MAKE_FLAGS+=		MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
+INSTALL_MAKE_FLAGS+=	SYSCONFDIR=${EGDIR:Q}
+
 PKG_SYSCONFSUBDIR=	${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+=		${EGDIR}/auto.setup ${PKG_SYSCONFDIR}/auto.setup
-CONF_FILES+=		${EGDIR}/auto-blog.setup ${PKG_SYSCONFDIR}/auto-blog.setup
-CONF_FILES+=		${EGDIR}/wikilist ${PKG_SYSCONFDIR}/wikilist
+.for f in auto.setup auto-blog.setup wikilist
+CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
 
 .include "options.mk"
 
@@ -73,4 +65,5 @@ pre-configure:
 	find ${WRKSRC} -type f -name '*.orig' -print | xargs rm -f
 
 .include "../../lang/perl5/module.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"