From c9211f16e08859e689a0f5449d4f1b478423686c Mon Sep 17 00:00:00 2001
From: danj <danj@openbsd.org>
Date: Sun, 25 Nov 2018 19:57:14 +0000
Subject: [PATCH] Update to pelican-4.0.0

Based on a diff from Edward Lopez-Acosta, maintainer timeout
---
 www/pelican/Makefile                          |  6 +++---
 www/pelican/distinfo                          |  4 ++--
 .../patch-pelican_tests_test_pelican_py       |  9 ++++----
 www/pelican/pkg/PLIST                         | 21 +++++++++++++------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/www/pelican/Makefile b/www/pelican/Makefile
index 6c15a673a21..56f9a325bf1 100644
--- a/www/pelican/Makefile
+++ b/www/pelican/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2018/05/01 13:43:51 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2018/11/25 19:57:14 danj Exp $
 
 COMMENT =		static site generator written in Python
 
@@ -7,11 +7,11 @@ DISTNAME =		pelican-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =		getpelican
 GH_PROJECT =		pelican
-GH_TAGNAME =		3.7.1
+GH_TAGNAME =		4.0.0
 
 CATEGORIES =		www
 
-HOMEPAGE =		http://blog.getpelican.com/
+HOMEPAGE =		https://blog.getpelican.com/
 
 MAINTAINER =		Vladimir Seleznev <vseleznv@cs.msu.ru>
 
diff --git a/www/pelican/distinfo b/www/pelican/distinfo
index 29115eb013b..fd5f82ff5a6 100644
--- a/www/pelican/distinfo
+++ b/www/pelican/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pelican-3.7.1.tar.gz) = geHISS1kkbemN1Je2moIQO420s4RxUIzQZs2Yc5NXIA=
-SIZE (pelican-3.7.1.tar.gz) = 784605
+SHA256 (pelican-4.0.0.tar.gz) = jHYxpF+cYJxvrwdd409gxazk0MAHd2mmm0U3E6rsKBw=
+SIZE (pelican-4.0.0.tar.gz) = 1314626
diff --git a/www/pelican/patches/patch-pelican_tests_test_pelican_py b/www/pelican/patches/patch-pelican_tests_test_pelican_py
index d1dd1db8af2..c430123775f 100644
--- a/www/pelican/patches/patch-pelican_tests_test_pelican_py
+++ b/www/pelican/patches/patch-pelican_tests_test_pelican_py
@@ -1,7 +1,8 @@
-$OpenBSD: patch-pelican_tests_test_pelican_py,v 1.2 2017/02/19 23:28:43 danj Exp $
---- pelican/tests/test_pelican.py.orig	Tue Jan 10 16:34:09 2017
-+++ pelican/tests/test_pelican.py	Sun Jan 29 12:03:14 2017
-@@ -59,7 +59,7 @@ class TestPelican(LoggedTestCase):
+$OpenBSD: patch-pelican_tests_test_pelican_py,v 1.3 2018/11/25 19:57:14 danj Exp $
+Index: pelican/tests/test_pelican.py
+--- pelican/tests/test_pelican.py.orig
++++ pelican/tests/test_pelican.py
+@@ -62,7 +62,7 @@ class TestPelican(LoggedTestCase):
  
      def assertDirsEqual(self, left_path, right_path):
          out, err = subprocess.Popen(
diff --git a/www/pelican/pkg/PLIST b/www/pelican/pkg/PLIST
index b0434dae5ae..88975358216 100644
--- a/www/pelican/pkg/PLIST
+++ b/www/pelican/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2017/02/19 23:28:43 danj Exp $
+@comment $OpenBSD: PLIST,v 1.5 2018/11/25 19:57:14 danj Exp $
 bin/pelican
 bin/pelican-import
 bin/pelican-quickstart
@@ -42,12 +42,22 @@ lib/python${MODPY_VERSION}/site-packages/pelican/themes/
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/
+@mode
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/fonts.css
 @mode 644
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/main.css
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/pygment.css
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/reset.css
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/typogrify.css
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/css/wide.css
+@mode
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.eot
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.svg
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.ttf
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/Yanone_Kaffeesatz_400.woff2
+lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/fonts/font.css
 @mode 755
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/images/
 lib/python${MODPY_VERSION}/site-packages/pelican/themes/notmyidea/static/images/icons/
@@ -125,11 +135,10 @@ lib/python${MODPY_VERSION}/site-packages/pelican/tools/pelican_import.py
 lib/python${MODPY_VERSION}/site-packages/pelican/tools/pelican_quickstart.py
 lib/python${MODPY_VERSION}/site-packages/pelican/tools/pelican_themes.py
 lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/
-lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/Makefile.in
-lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/develop_server.sh.in
-lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/fabfile.py.in
-lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/pelicanconf.py.in
-lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/publishconf.py.in
+lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/Makefile.jinja2
+lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/pelicanconf.py.jinja2
+lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/publishconf.py.jinja2
+lib/python${MODPY_VERSION}/site-packages/pelican/tools/templates/tasks.py.jinja2
 lib/python${MODPY_VERSION}/site-packages/pelican/urlwrappers.py
 lib/python${MODPY_VERSION}/site-packages/pelican/utils.py
 lib/python${MODPY_VERSION}/site-packages/pelican/writers.py