diff options
| -rw-r--r-- | www/ikiwiki/Makefile | 7 | ||||
| -rw-r--r-- | www/ikiwiki/PLIST | 19 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 9 | ||||
| -rw-r--r-- | www/ikiwiki/patches/patch-aa | 15 |
4 files changed, 25 insertions, 25 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 89c34f58fe5..97840fbb52c 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.91 2012/03/15 11:53:44 obache Exp $ +# $NetBSD: Makefile,v 1.92 2012/03/20 12:01:09 schmonz Exp $ # -DISTNAME= ikiwiki_3.20120202 +DISTNAME= ikiwiki_3.20120203 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} @@ -31,7 +30,7 @@ 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+= p5-YAML-LibYAML-[0-9]*:../../textproc/p5-YAML-LibYAML #DEPENDS+= po4a-[0-9]*:../../textproc/po4a WRKSRC= ${WRKDIR}/${PKGBASE} diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index a7d55cc8e76..533c82cc8c4 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.34 2012/02/03 12:38:01 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.35 2012/03/20 12:01:15 schmonz Exp $ bin/ikiwiki bin/ikiwiki-calendar bin/ikiwiki-makerepo @@ -20,11 +20,19 @@ share/examples/ikiwiki/auto-blog.setup share/examples/ikiwiki/auto.setup share/examples/ikiwiki/wikilist share/ikiwiki/attachment/ikiwiki/images/pbar-ani.gif +share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_0_aaaaaa_40x100.png share/ikiwiki/attachment/ikiwiki/images/ui-bg_flat_75_ffffff_40x100.png +share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_55_fbf9ee_1x400.png +share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_65_ffffff_1x400.png +share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_75_dadada_1x400.png share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_75_e6e6e6_1x400.png +share/ikiwiki/attachment/ikiwiki/images/ui-bg_glass_95_fef1ec_1x400.png share/ikiwiki/attachment/ikiwiki/images/ui-bg_highlight-soft_75_cccccc_1x100.png share/ikiwiki/attachment/ikiwiki/images/ui-icons_222222_256x240.png +share/ikiwiki/attachment/ikiwiki/images/ui-icons_2e83ff_256x240.png +share/ikiwiki/attachment/ikiwiki/images/ui-icons_454545_256x240.png share/ikiwiki/attachment/ikiwiki/images/ui-icons_888888_256x240.png +share/ikiwiki/attachment/ikiwiki/images/ui-icons_cd0a0a_256x240.png share/ikiwiki/attachment/ikiwiki/jquery-ui.min.css share/ikiwiki/attachment/ikiwiki/jquery-ui.min.js share/ikiwiki/attachment/ikiwiki/jquery.fileupload-ui.js @@ -83,6 +91,7 @@ share/ikiwiki/directives/ikiwiki/directive/map.mdwn share/ikiwiki/directives/ikiwiki/directive/meta.mdwn share/ikiwiki/directives/ikiwiki/directive/more.mdwn share/ikiwiki/directives/ikiwiki/directive/orphans.mdwn +share/ikiwiki/directives/ikiwiki/directive/osm.mdwn share/ikiwiki/directives/ikiwiki/directive/pagecount.mdwn share/ikiwiki/directives/ikiwiki/directive/pagestats.mdwn share/ikiwiki/directives/ikiwiki/directive/pagetemplate.mdwn @@ -104,7 +113,12 @@ share/ikiwiki/directives/ikiwiki/directive/teximg.mdwn share/ikiwiki/directives/ikiwiki/directive/toc.mdwn share/ikiwiki/directives/ikiwiki/directive/toggle.mdwn share/ikiwiki/directives/ikiwiki/directive/toggleable.mdwn +share/ikiwiki/directives/ikiwiki/directive/trailitem.mdwn +share/ikiwiki/directives/ikiwiki/directive/trailitems.mdwn +share/ikiwiki/directives/ikiwiki/directive/traillink.mdwn +share/ikiwiki/directives/ikiwiki/directive/trailoptions.mdwn share/ikiwiki/directives/ikiwiki/directive/version.mdwn +share/ikiwiki/directives/ikiwiki/directive/waypoint.mdwn share/ikiwiki/examples/blog.mdwn share/ikiwiki/examples/blog/archives.mdwn share/ikiwiki/examples/blog/comments.mdwn @@ -134,6 +148,8 @@ share/ikiwiki/javascript/ikiwiki/relativedate.js share/ikiwiki/javascript/ikiwiki/toggle.js share/ikiwiki/jquery/ikiwiki/jquery.min.js share/ikiwiki/openid-selector/ikiwiki/openid/openid-jquery.js +share/ikiwiki/osm/ikiwiki/images/osm.png +share/ikiwiki/osm/ikiwiki/osm.js share/ikiwiki/po/cs/basewiki/ikiwiki.cs.po share/ikiwiki/po/cs/basewiki/ikiwiki/directive.cs.po share/ikiwiki/po/cs/basewiki/ikiwiki/formatting.cs.po @@ -425,6 +441,7 @@ share/ikiwiki/templates/rsspage.tmpl share/ikiwiki/templates/searchform.tmpl share/ikiwiki/templates/searchquery.tmpl share/ikiwiki/templates/titlepage.tmpl +share/ikiwiki/templates/trails.tmpl share/ikiwiki/themes/actiontabs/style.css share/ikiwiki/themes/blueview/background_darkness.png share/ikiwiki/themes/blueview/header_background.png diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 8d668769d9e..704bed2d60b 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.75 2012/02/03 12:38:01 schmonz Exp $ +$NetBSD: distinfo,v 1.76 2012/03/20 12:01:16 schmonz Exp $ -SHA1 (ikiwiki_3.20120202.tar.gz) = 09c787f7609defa475416a648affc82505bcddc0 -RMD160 (ikiwiki_3.20120202.tar.gz) = 4ff6ac78a0de6d56ee0d8e997a6bd5535188fffc -Size (ikiwiki_3.20120202.tar.gz) = 2761253 bytes -SHA1 (patch-aa) = 998c23d0df8aa18797221b3a310f78880baa689e +SHA1 (ikiwiki_3.20120203.tar.gz) = 7b3b8085e4df55be8aeda650065798947412952b +RMD160 (ikiwiki_3.20120203.tar.gz) = 3c080f0554e43579ad8757a9106acf41c0785f3c +Size (ikiwiki_3.20120203.tar.gz) = 2807717 bytes diff --git a/www/ikiwiki/patches/patch-aa b/www/ikiwiki/patches/patch-aa deleted file mode 100644 index a758f41acb8..00000000000 --- a/www/ikiwiki/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.26 2012/02/03 12:38:01 schmonz Exp $ - -Avoid a GNUism in find(1). - ---- Makefile.PL.orig 2012-01-30 19:20:54.000000000 +0000 -+++ Makefile.PL -@@ -75,7 +75,7 @@ underlay_install: - install -d $(DESTDIR)$(PREFIX)/share/ikiwiki - for dir in `cd underlays && $(FIND) . -follow -type d`; do \ - install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ -- for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ -+ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name \\*.full.js ! -name \\*.full.css`; do \ - cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ - install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ - done; \ |