diff options
| author | schmonz <schmonz@pkgsrc.org> | 2014-08-23 13:02:37 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2014-08-23 13:02:37 +0000 |
| commit | 3aed40bdd227a805db65f155d7a526fd0f4b57d3 (patch) | |
| tree | 080ea89164152236d5a62243eb5fc952bb00e158 | |
| parent | 224b8aa08a6f5c16825347d4facdca952779f067 (diff) | |
| download | pkgsrc-3aed40bdd227a805db65f155d7a526fd0f4b57d3.tar.gz | |
Squelch commit warning with wiki.n.o's unusual (scheme-less) $config{url}.
Bump PKGREVISION.
| -rw-r--r-- | www/ikiwiki/Makefile | 3 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 3 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki.pm | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index ba06a83f18b..18e0a2a48b9 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.121 2014/08/18 01:37:35 schmonz Exp $ +# $NetBSD: Makefile,v 1.122 2014/08/23 13:02:37 schmonz Exp $ # DISTNAME= ikiwiki_3.20140815 PKGNAME= ${DISTNAME:S/_/-/} +PKGREVISION= 1 CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index f416d74d324..af3a5f3ddac 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.98 2014/08/18 01:37:35 schmonz Exp $ +$NetBSD: distinfo,v 1.99 2014/08/23 13:02:37 schmonz Exp $ SHA1 (ikiwiki_3.20140815.tar.gz) = 069b14c8cc22ef7db1a4f162763312c54379042d RMD160 (ikiwiki_3.20140815.tar.gz) = 2e7b2c0e6fb1513157b2d152bc5d3afe9018871f Size (ikiwiki_3.20140815.tar.gz) = 3261039 bytes +SHA1 (patch-IkiWiki.pm) = 5f82b1ebbe3ff11e8b18a167eec97de571b1980a diff --git a/www/ikiwiki/patches/patch-IkiWiki.pm b/www/ikiwiki/patches/patch-IkiWiki.pm new file mode 100644 index 00000000000..fa0e7722a8e --- /dev/null +++ b/www/ikiwiki/patches/patch-IkiWiki.pm @@ -0,0 +1,16 @@ +$NetBSD: patch-IkiWiki.pm,v 1.1 2014/08/23 13:02:37 schmonz Exp $ + +Squelch commit warning with wiki.n.o's unusual (scheme-less) $config{url}. + +--- IkiWiki.pm.orig 2014-07-02 19:45:57.000000000 +0000 ++++ IkiWiki.pm +@@ -607,7 +607,8 @@ sub checkconfig () { + + $local_cgiurl = $cgiurl->path; + +- if ($cgiurl->scheme ne $baseurl->scheme or ++ if (!defined $baseurl->scheme or ++ $cgiurl->scheme ne $baseurl->scheme or + $cgiurl->authority ne $baseurl->authority) { + # too far apart, fall back to absolute URLs + $local_url = "$config{url}/"; |