Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -7817,3 +7817,4 @@
 www/trytond_google_maps||2015-08-05|No more supported upstream, use tryton 2.8 instead
 devel/appdata-tools|devel/appstream-glib|2015-08-05|Replaced by appstream-glib
 textproc/pystemmer|textproc/py-pystemmer|2015-08-06|Rename to match upstream (PyPi) name
+www/pelican|www/py-pelican|2015-08-07|Rename to match Python naming conventions
Index: www/Makefile
===================================================================
--- www/Makefile
+++ www/Makefile
@@ -1428,7 +1428,6 @@
     SUBDIR += pecl-yaf
     SUBDIR += pecl-yar
     SUBDIR += pecl-zendopcache
-    SUBDIR += pelican
     SUBDIR += perlbal
     SUBDIR += pglogd
     SUBDIR += phalcon
@@ -1612,6 +1611,7 @@
     SUBDIR += py-paste
     SUBDIR += py-pastedeploy
     SUBDIR += py-pastescript
+    SUBDIR += py-pelican
     SUBDIR += py-plone.alterego
     SUBDIR += py-plone.app.blob
     SUBDIR += py-plone.app.caching
Index: www/pelican/Makefile
===================================================================
--- www/pelican/Makefile
+++ www/pelican/Makefile
@@ -1,44 +0,0 @@
-# Created by: Julien Laffaye <jlaffaye@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	pelican
-PORTVERSION=	3.5.0
-PORTREVISION=	1
-CATEGORIES=	www textproc
-MASTER_SITES=	CHEESESHOP
-
-MAINTAINER=	jlaffaye@FreeBSD.org
-COMMENT=	Static site generator written in Python
-
-LICENSE=	GPLv3
-
-RUN_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.4:${PORTSDIR}/textproc/py-pygments \
-		${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:${PORTSDIR}/www/py-feedgenerator \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker \
-		${PYTHON_PKGNAMEPREFIX}unidecode>0:${PORTSDIR}/converters/py-unidecode \
-		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
-
-TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
-
-OPTIONS_DEFINE=	TEST
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-.include <bsd.port.options.mk>
-
-USES=python
-USE_PYTHON=autoplist distutils
-
-.if ${PORT_OPTIONS:MTEST}
-BUILD_DEPENDS:=	${TEST_DEPENDS}
-.endif
-
-regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
-
-.include <bsd.port.mk>
Index: www/pelican/distinfo
===================================================================
--- www/pelican/distinfo
+++ www/pelican/distinfo
@@ -1,2 +0,0 @@
-SHA256 (pelican-3.5.0.tar.gz) = b7edaa88e458b99e4412e4a445c84e2d387387ed2ffdf1a88c1108a58d888836
-SIZE (pelican-3.5.0.tar.gz) = 268354
Index: www/pelican/pkg-descr
===================================================================
--- www/pelican/pkg-descr
+++ www/pelican/pkg-descr
@@ -1,9 +0,0 @@
-Pelican is a static site generator, written in Python.
-
- - Write your content directly with your editor of choice (vim!) in
-   reStructuredText, Markdown, or AsciiDoc formats
- - Includes a simple CLI tool to (re)generate your site
- - Easy to interface with distributed version control systems and web hooks
- - Completely static output is easy to host anywhere
-
-WWW: http://docs.getpelican.com/
Index: www/py-pelican/Makefile
===================================================================
--- www/py-pelican/Makefile
+++ www/py-pelican/Makefile
@@ -2,43 +2,43 @@
 # $FreeBSD$
 
 PORTNAME=	pelican
-PORTVERSION=	3.5.0
-PORTREVISION=	1
-CATEGORIES=	www textproc
-MASTER_SITES=	CHEESESHOP
+PORTVERSION=	3.6.2
+CATEGORIES=	www textproc python
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Static site generator written in Python
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rst2html:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.4:${PORTSDIR}/textproc/py-pygments \
 		${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:${PORTSDIR}/www/py-feedgenerator \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}blinker>0:${PORTSDIR}/devel/py-blinker \
 		${PYTHON_PKGNAMEPREFIX}unidecode>0:${PORTSDIR}/converters/py-unidecode \
 		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 
-TEST_DEPENDS:=	${RUN_DEPENDS} \
-		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \
+USES=		python
+USE_GITHUB=	yes
+USE_PYTHON=	autoplist distutils
 
-OPTIONS_DEFINE=	TEST
-OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
+GH_ACCOUNT=	getpelican
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		MARKDOWN SYNTAX TESTS
+OPTIONS_DEFAULT=	MARKDOWN
 
-USES=python
-USE_PYTHON=autoplist distutils
+MARKDOWN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown
 
-.if ${PORT_OPTIONS:MTEST}
-BUILD_DEPENDS:=	${TEST_DEPENDS}
-.endif
+SYNTAX_DESC=		Syntax Highlighting (via pygments)
+SYNTAX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=1.4:${PORTSDIR}/textproc/py-pygments
+TESTS_DESC=		Install test suite requirements
+TESTS_BUILD_DEPENDS=	${TEST_DEPENDS} \
+			${RUN_DEPENDS}
 
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
Index: www/py-pelican/distinfo
===================================================================
--- www/py-pelican/distinfo
+++ www/py-pelican/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pelican-3.5.0.tar.gz) = b7edaa88e458b99e4412e4a445c84e2d387387ed2ffdf1a88c1108a58d888836
-SIZE (pelican-3.5.0.tar.gz) = 268354
+SHA256 (getpelican-pelican-3.6.2_GH0.tar.gz) = 56c19904f95510fd9a9ae68752023ef7f2776f6910b45af814618b3a8bf3d411
+SIZE (getpelican-pelican-3.6.2_GH0.tar.gz) = 775059