Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -7848,3 +7848,4 @@
 print/ghostscript9-nox11|print/ghostscript9-base|2015-08-22|Integrated into print/ghostscript9-base
 print/ghostscript9-agpl|print/ghostscript9-agpl-base|2015-08-22|Split into print/ghostscript9-agpl-base and print/ghostscript9-agpl-x11
 print/ghostscript9-agpl-nox11|print/ghostscript9-agpl-base|2015-08-22|Integrated into print/ghostscript9-agpl-base
+www/pelican|www/py-pelican|2015-08-29|Rename to match Python naming conventions
Index: head/www/Makefile
===================================================================
--- head/www/Makefile
+++ head/www/Makefile
@@ -1434,7 +1434,6 @@
     SUBDIR += pecl-yaf
     SUBDIR += pecl-yar
     SUBDIR += pecl-zendopcache
-    SUBDIR += pelican
     SUBDIR += perlbal
     SUBDIR += pglogd
     SUBDIR += phalcon
@@ -1618,6 +1617,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: head/www/pelican/Makefile
===================================================================
--- head/www/pelican/Makefile
+++ head/www/pelican/Makefile
@@ -1,42 +0,0 @@
-# Created by: Julien Laffaye <jlaffaye@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	pelican
-PORTVERSION=	3.6.3
-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
-
-.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: head/www/pelican/distinfo
===================================================================
--- head/www/pelican/distinfo
+++ head/www/pelican/distinfo
@@ -1,2 +0,0 @@
-SHA256 (pelican-3.6.3.tar.gz) = 13b9c41ea3342b7eb0fd7f74078b5a8d5035632f05d8680266f50f4c5626c9c2
-SIZE (pelican-3.6.3.tar.gz) = 264389
Index: head/www/pelican/pkg-descr
===================================================================
--- head/www/pelican/pkg-descr
+++ head/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: head/www/py-pelican/Makefile
===================================================================
--- head/www/py-pelican/Makefile
+++ head/www/py-pelican/Makefile
@@ -0,0 +1,45 @@
+# Created by: Julien Laffaye <jlaffaye@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	pelican
+PORTVERSION=	3.6.3
+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}Jinja2>=2.7:${PORTSDIR}/devel/py-Jinja2 \
+		${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
+
+USES=		python
+USE_GITHUB=	yes
+USE_PYTHON=	autoplist distutils
+
+GH_ACCOUNT=	getpelican
+
+OPTIONS_DEFINE=		MARKDOWN SYNTAX TESTS
+OPTIONS_DEFAULT=	MARKDOWN SYNTAX
+
+MARKDOWN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:${PORTSDIR}/textproc/py-markdown
+
+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} ${PYDISTUTILS_SETUP} test
+
+.include <bsd.port.mk>
Index: head/www/py-pelican/distinfo
===================================================================
--- head/www/py-pelican/distinfo
+++ head/www/py-pelican/distinfo
@@ -0,0 +1,2 @@
+SHA256 (getpelican-pelican-3.6.3_GH0.tar.gz) = d19bc7df61afc5b68eba028f0cf0832ee2a12a04a01d7fe11bdfdd847ddd417b
+SIZE (getpelican-pelican-3.6.3_GH0.tar.gz) = 775060
Index: head/www/py-pelican/pkg-descr
===================================================================
--- head/www/py-pelican/pkg-descr
+++ head/www/py-pelican/pkg-descr
@@ -0,0 +1,9 @@
+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/