[pkgsrc/trunk]: pkgsrc/www/py-blosxom In the readmore plugin, use the current...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58dee61bc739
branches:  trunk
changeset: 652028:58dee61bc739
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Fri May 22 14:01:16 2015 +0000

description:
In the readmore plugin, use the current flavour before the default
one, if available.

diffstat:

 www/py-blosxom/Makefile                                    |   4 +-
 www/py-blosxom/distinfo                                    |   3 +-
 www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py |  19 ++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r cfb2dc0e7124 -r 58dee61bc739 www/py-blosxom/Makefile
--- a/www/py-blosxom/Makefile   Fri May 22 13:40:45 2015 +0000
+++ b/www/py-blosxom/Makefile   Fri May 22 14:01:16 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2015/05/22 13:40:45 hauke Exp $
+# $NetBSD: Makefile,v 1.18 2015/05/22 14:01:16 hauke Exp $
 
 PYBLOXSOMVERS= 1.5.3
 DISTNAME=      pyblosxom-${PYBLOXSOMVERS}
 PKGNAME=       ${PYPKGPREFIX}-blosxom-${PYBLOXSOMVERS}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://pyblosxom.github.com/download/
 
diff -r cfb2dc0e7124 -r 58dee61bc739 www/py-blosxom/distinfo
--- a/www/py-blosxom/distinfo   Fri May 22 13:40:45 2015 +0000
+++ b/www/py-blosxom/distinfo   Fri May 22 14:01:16 2015 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2013/07/31 10:20:27 hauke Exp $
+$NetBSD: distinfo,v 1.7 2015/05/22 14:01:16 hauke Exp $
 
 SHA1 (pyblosxom-1.5.3/pyblosxom-1.5.3.tar.gz) = 62c7b178a5aa3a9df660bf6c357e0336ff473b9d
 RMD160 (pyblosxom-1.5.3/pyblosxom-1.5.3.tar.gz) = fcf6be7c8d9c9fa1ec4e59d34b11afe173ced382
 Size (pyblosxom-1.5.3/pyblosxom-1.5.3.tar.gz) = 210669 bytes
+SHA1 (patch-Pyblosxom_plugins_readmore.py) = 48fd8c87b983a0b35b00697ad41c1e1f966f422a
diff -r cfb2dc0e7124 -r 58dee61bc739 www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py        Fri May 22 14:01:16 2015 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-Pyblosxom_plugins_readmore.py,v 1.1 2015/05/22 14:01:16 hauke Exp $
+
+Use the current flavour before the default one, if available.
+
+--- Pyblosxom/plugins/readmore.py.orig 2013-07-31 00:53:58.000000000 +0000
++++ Pyblosxom/plugins/readmore.py
+@@ -209,7 +209,11 @@ def cb_story(args):
+     # otherwise we replace the breakpoint with the template
+     base_url = config["base_url"]
+     file_path = entry["file_path"]
+-    flavour = config.get("default_flavour", "html")
++
++    # Set and use current (or default) flavour for full entry
++    flavour = data.get(
++        "flavour", config.get("default_flavour", "html"))
++    
+     url = '%s/%s.%s' % (base_url, file_path, flavour)
+ 
+     link = (template % {"url": url,