diff options
| -rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
| -rw-r--r-- | www/ikiwiki/PLIST | 67 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 12 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 14 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-ab | 20 |
5 files changed, 91 insertions, 26 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index a2c286187b2..327859c6782 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.47 2010/03/13 20:20:08 schmonz Exp $ +# $NetBSD: Makefile,v 1.48 2010/04/04 17:23:29 schmonz Exp $ # -DISTNAME= ikiwiki_3.20100312 +DISTNAME= ikiwiki_3.20100403 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index f6b52fdcd52..8f69dde20e3 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2009/12/22 23:23:27 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.22 2010/04/04 17:23:29 schmonz Exp $ bin/ikiwiki bin/ikiwiki-calendar bin/ikiwiki-makerepo @@ -199,6 +199,71 @@ share/ikiwiki/po/da/directives/ikiwiki/directive/toggle.da.po share/ikiwiki/po/da/directives/ikiwiki/directive/toggleable.da.po share/ikiwiki/po/da/directives/ikiwiki/directive/version.da.po share/ikiwiki/po/da/smiley/smileys.da.po +share/ikiwiki/po/de/basewiki/ikiwiki.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/directive.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/formatting.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/markdown.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/openid.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/pagespec.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/pagespec/attachment.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/pagespec/po.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/pagespec/sorting.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/searching.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/subpage.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/subpage/linkingrules.de.po +share/ikiwiki/po/de/basewiki/ikiwiki/wikilink.de.po +share/ikiwiki/po/de/basewiki/index.de.po +share/ikiwiki/po/de/basewiki/recentchanges.de.po +share/ikiwiki/po/de/basewiki/sandbox.de.po +share/ikiwiki/po/de/basewiki/shortcuts.de.po +share/ikiwiki/po/de/basewiki/templates.de.po +share/ikiwiki/po/de/basewiki/templates/note.de.po +share/ikiwiki/po/de/basewiki/templates/popup.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/aggregate.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/brokenlinks.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/calendar.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/color.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/comment.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/copy.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/cut.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/cutpaste.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/date.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/edittemplate.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/format.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/fortune.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/graph.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/haiku.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/if.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/img.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/inline.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/linkmap.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/listdirectives.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/map.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/meta.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/more.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/orphans.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/pagecount.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/pagestats.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/pagetemplate.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/paste.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/ping.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/poll.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/polygen.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/postsparkline.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/progress.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/shortcut.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/sparkline.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/table.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/tag.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/taglink.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/template.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/testpagespec.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/teximg.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/toc.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/toggle.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/toggleable.de.po +share/ikiwiki/po/de/directives/ikiwiki/directive/version.de.po +share/ikiwiki/po/de/smiley/smileys.de.po share/ikiwiki/po/es/basewiki/ikiwiki.es.po share/ikiwiki/po/es/basewiki/ikiwiki/directive.es.po share/ikiwiki/po/es/basewiki/ikiwiki/formatting.es.po diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index bfb00de5621..eac0bb610bf 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.34 2010/03/13 20:20:09 schmonz Exp $ +$NetBSD: distinfo,v 1.35 2010/04/04 17:23:30 schmonz Exp $ -SHA1 (ikiwiki_3.20100312.tar.gz) = eb66b33fe6960b9545c6465e5cc3a3ab6f25bae2 -RMD160 (ikiwiki_3.20100312.tar.gz) = 54b67f848d7cba2ccdc048035bc331af6014b514 -Size (ikiwiki_3.20100312.tar.gz) = 1585379 bytes -SHA1 (patch-aa) = b64322fe609b8a9c8286f68e5b1bf81f3993914e -SHA1 (patch-ab) = dd2a1a1bf33ddba89f5ecad3bccc1e470134a404 +SHA1 (ikiwiki_3.20100403.tar.gz) = e3e9102b43f73afd186b1780762c83da45244893 +RMD160 (ikiwiki_3.20100403.tar.gz) = 8e89f568d731f3dc2f33035e54dea74f63dcb73c +Size (ikiwiki_3.20100403.tar.gz) = 1672835 bytes +SHA1 (patch-aa) = 443db0d2b109d26a05ea15a0a75a51000d9ea5e5 +SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d SHA1 (patch-ae) = b23e2c81e0dba9bc88fd2bdc88de5e60eb74e16f diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa index f17d6a8300c..16c6d70e2bc 100644 --- a/www/ikiwiki/patches/patch-aa +++ b/www/ikiwiki/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ +$NetBSD: patch-aa,v 1.16 2010/04/04 17:23:30 schmonz Exp $ ---- Makefile.PL.orig 2009-11-13 15:06:57.000000000 -0500 +--- Makefile.PL.orig 2010-04-03 18:29:02.000000000 +0000 +++ Makefile.PL @@ -25,6 +25,8 @@ PROBABLE_INST_LIB=$(shell \\ @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) -@@ -44,7 +46,7 @@ extra_build: ikiwiki.out ikiwiki.setup d +@@ -46,7 +48,7 @@ extra_build: $(outprogs) ikiwiki.setup d ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man $(MAKE) -C po @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ rm -f ikiwiki.spec.bkp docwiki: ikiwiki.out -@@ -60,7 +62,7 @@ underlay_install: +@@ -62,7 +64,7 @@ underlay_install: for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \ @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done -@@ -79,7 +81,7 @@ extra_install: underlay_install +@@ -81,7 +83,7 @@ extra_install: underlay_install install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \ @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done -@@ -98,15 +100,15 @@ extra_install: underlay_install +@@ -100,15 +102,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done @@ -62,7 +62,7 @@ $NetBSD: patch-aa,v 1.15 2009/11/23 02:36:39 schmonz Exp $ install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin -@@ -122,10 +124,10 @@ extra_install: underlay_install +@@ -125,10 +127,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. diff --git a/www/ikiwiki/patches/patch-ab b/www/ikiwiki/patches/patch-ab index 3d928fc621c..35119d56c72 100644 --- a/www/ikiwiki/patches/patch-ab +++ b/www/ikiwiki/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2010/02/13 05:53:36 schmonz Exp $ +$NetBSD: patch-ab,v 1.5 2010/04/04 17:23:30 schmonz Exp $ ---- IkiWiki/Setup/Standard.pm.orig 2010-02-12 09:09:53.000000000 +0000 +--- IkiWiki/Setup/Standard.pm.orig 2010-03-19 19:44:10.000000000 +0000 +++ IkiWiki/Setup/Standard.pm -@@ -117,7 +117,7 @@ sub gendump ($) { - } +@@ -14,7 +14,7 @@ sub import { + sub gendump ($@) { + my $class=shift; - unshift @ret, -- "#!/usr/bin/perl", -+ "#!@PERL5@", - "# $description", - "#", - "# Passing this to ikiwiki --setup will make ikiwiki generate", +- "#!/usr/bin/perl", ++ "#!@PERL5@", + "#", + (map { "# $_" } @_), + "use IkiWiki::Setup::Standard {", |