diff options
| author | schmonz <schmonz> | 2014-08-18 01:37:35 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2014-08-18 01:37:35 +0000 |
| commit | 5d06078ce68b353fc55bddec06888ebb83d1d806 (patch) | |
| tree | f46223677ee39159a367810f2d8d9390c0e0e3a0 /www/ikiwiki | |
| parent | 2b2aa3eecff89c8ef0fc1b166bd8ef17c9544e32 (diff) | |
| download | pkgsrc-5d06078ce68b353fc55bddec06888ebb83d1d806.tar.gz | |
Update to 3.20140815. From the changelog:
* Add google back to openid selector. Apparently this has gotten a stay
of execution until April 2015. (It may continue to work until 2017.)
* highlight: Add compatibility with highlight 3.18, while still supporting
3.9+. Closes: #757679
Thanks, David Bremner
* highlight: Add support for multiple language definition directories
Closes: #757680
Thanks, David Bremner
pkgsrc changes:
* Add ikiwiki-highlight option that pulls in textproc/p5-highlight,
for syntax highlighting code blocks (or entire source files).
Diffstat (limited to 'www/ikiwiki')
| -rw-r--r-- | www/ikiwiki/Makefile | 4 | ||||
| -rw-r--r-- | www/ikiwiki/distinfo | 8 | ||||
| -rw-r--r-- | www/ikiwiki/options.mk | 19 |
3 files changed, 18 insertions, 13 deletions
diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 8b4c3a7bce0..ba06a83f18b 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.120 2014/06/13 21:51:41 schmonz Exp $ +# $NetBSD: Makefile,v 1.121 2014/08/18 01:37:35 schmonz Exp $ # -DISTNAME= ikiwiki_3.20140613 +DISTNAME= ikiwiki_3.20140815 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= www textproc MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/} diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo index 9ee1f9ef0db..f416d74d324 100644 --- a/www/ikiwiki/distinfo +++ b/www/ikiwiki/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.97 2014/06/13 21:51:41 schmonz Exp $ +$NetBSD: distinfo,v 1.98 2014/08/18 01:37:35 schmonz Exp $ -SHA1 (ikiwiki_3.20140613.tar.gz) = 3faefd05f795987a31457582bcc1b709afac47fd -RMD160 (ikiwiki_3.20140613.tar.gz) = 9503f96a48775b6955c4eb6c9c7291b99c081b3e -Size (ikiwiki_3.20140613.tar.gz) = 3236529 bytes +SHA1 (ikiwiki_3.20140815.tar.gz) = 069b14c8cc22ef7db1a4f162763312c54379042d +RMD160 (ikiwiki_3.20140815.tar.gz) = 2e7b2c0e6fb1513157b2d152bc5d3afe9018871f +Size (ikiwiki_3.20140815.tar.gz) = 3261039 bytes diff --git a/www/ikiwiki/options.mk b/www/ikiwiki/options.mk index 8265f990c6d..d2b914005e0 100644 --- a/www/ikiwiki/options.mk +++ b/www/ikiwiki/options.mk @@ -1,7 +1,8 @@ -# $NetBSD: options.mk,v 1.14 2013/05/10 20:07:34 riastradh Exp $ +# $NetBSD: options.mk,v 1.15 2014/08/18 01:37:35 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ikiwiki -PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 ikiwiki-search +PKG_SUPPORTED_OPTIONS= cvs ikiwiki-amazon-s3 +PKG_SUPPORTED_OPTIONS+= ikiwiki-highlight ikiwiki-search PKG_SUPPORTED_OPTIONS+= imagemagick python svn w3m .include "../../mk/bsd.options.mk" @@ -16,16 +17,20 @@ DEPENDS+= p5-File-chdir-[0-9]*:../../devel/p5-File-chdir DEPENDS+= p5-File-ReadBackwards-[0-9]*:../../textproc/p5-File-ReadBackwards .endif -.if !empty(PKG_OPTIONS:Mikiwiki-search) -DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian -DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega -.endif - .if !empty(PKG_OPTIONS:Mikiwiki-amazon-s3) DEPENDS+= p5-Net-Amazon-S3-[0-9]*:../../net/p5-Net-Amazon-S3 DEPENDS+= p5-File-MimeInfo-[0-9]*:../../devel/p5-File-MimeInfo .endif +.if !empty(PKG_OPTIONS:Mikiwiki-highlight) +DEPENDS+= p5-highlight-[0-9]*:../../textproc/p5-highlight +.endif + +.if !empty(PKG_OPTIONS:Mikiwiki-search) +DEPENDS+= p5-Search-Xapian-[0-9]*:../../textproc/p5-Search-Xapian +DEPENDS+= xapian-omega-[0-9]*:../../textproc/xapian-omega +.endif + .if !empty(PKG_OPTIONS:Mimagemagick) DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick .endif |