summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorhauke <hauke>2015-05-22 14:01:16 +0000
committerhauke <hauke>2015-05-22 14:01:16 +0000
commit62f3d1ab9c0a48a0afcfff512cbc45cf3d9f2176 (patch)
tree2540014938567013b5b4dc5387b8d7923d1ad361 /www
parentd6e5493d42bb39d2d30e2482f890176f1ab7f581 (diff)
downloadpkgsrc-62f3d1ab9c0a48a0afcfff512cbc45cf3d9f2176.tar.gz
In the readmore plugin, use the current flavour before the default
one, if available.
Diffstat (limited to 'www')
-rw-r--r--www/py-blosxom/Makefile4
-rw-r--r--www/py-blosxom/distinfo3
-rw-r--r--www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py19
3 files changed, 23 insertions, 3 deletions
diff --git a/www/py-blosxom/Makefile b/www/py-blosxom/Makefile
index a614039a466..82ec5005796 100644
--- a/www/py-blosxom/Makefile
+++ b/www/py-blosxom/Makefile
@@ -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 --git a/www/py-blosxom/distinfo b/www/py-blosxom/distinfo
index 4c259130dc5..f74f4627116 100644
--- a/www/py-blosxom/distinfo
+++ b/www/py-blosxom/distinfo
@@ -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 --git a/www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py b/www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py
new file mode 100644
index 00000000000..5633b209e6b
--- /dev/null
+++ b/www/py-blosxom/patches/patch-Pyblosxom_plugins_readmore.py
@@ -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,