diff options
| author | schmonz <schmonz@pkgsrc.org> | 2013-01-15 23:10:57 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2013-01-15 23:10:57 +0000 |
| commit | 25b454b09c1152eab12e5a71fe0100f2a02ddfe5 (patch) | |
| tree | 49cd0c7155d77ce239b9e278619bb9c707701f4a /www/ikiwiki | |
| parent | 190184702e3fb46246ccece841981cafb8195bb1 (diff) | |
| download | pkgsrc-25b454b09c1152eab12e5a71fe0100f2a02ddfe5.tar.gz | |
Pull in 12c9219 to squelch warnings with git on newer Perls. Bump
PKGREVISION.
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/Makefile | 3 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 3 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm | 23 |
3 files changed, 27 insertions, 2 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index c7d995cb4da..f3a8c0a918c 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.101 2012/12/12 02:08:11 schmonz Exp $ +# $NetBSD: Makefile,v 1.102 2013/01/15 23:10:57 schmonz Exp $ # DISTNAME= ikiwiki_3.20121212 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 dedcd7cbb6e..91c28fa517d 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.83 2012/12/12 02:08:11 schmonz Exp $ +$NetBSD: distinfo,v 1.84 2013/01/15 23:10:57 schmonz Exp $ SHA1 (ikiwiki_3.20121212.tar.gz) = 1c9815502e90a25c5bd7b5cdf198034e6833c3ff RMD160 (ikiwiki_3.20121212.tar.gz) = a5439279166dc0d6ed1f4f5f7a71a680b08465cc Size (ikiwiki_3.20121212.tar.gz) = 2917372 bytes +SHA1 (patch-IkiWiki_Plugin_git.pm) = e854ea61afd3968a9dd06f1c70ab2cea993d6a1f diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm new file mode 100644 index 00000000000..332827e5290 --- /dev/null +++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_git.pm @@ -0,0 +1,23 @@ +$NetBSD: patch-IkiWiki_Plugin_git.pm,v 1.1 2013/01/15 23:10:57 schmonz Exp $ + +commit 12c9219d671c672fedcf9e9ab7f9187b23b8f7f4 +Author: Shlomi Fish <shlomif@shlomifish.org> +Date: Mon Dec 17 22:44:54 2012 +0200 + + Fix some warnigns in recent perls. + + All existing tests pass. + +--- IkiWiki/Plugin/git.pm.orig 2012-08-25 15:12:13.000000000 +0000 ++++ IkiWiki/Plugin/git.pm +@@ -341,8 +341,8 @@ sub parse_diff_tree ($) { + my $dt_ref = shift; + + # End of stream? +- return if !defined @{ $dt_ref } || +- !defined @{ $dt_ref }[0] || !length @{ $dt_ref }[0]; ++ return if ! @{ $dt_ref } || ++ !defined $dt_ref->[0] || !length $dt_ref->[0]; + + my %ci; + # Header line. |