3 files changed, 14 insertions, 6 deletions

diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index fb0459f58315..918e2cdbca17 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	moinmoin
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.4
 CATEGORIES=	www python
 MASTER_SITES=	http://static.moinmo.in/files/
 DISTNAME=	moin-${PORTVERSION}
@@ -52,7 +52,6 @@ pre-everything::
 	@${ECHO} "To get correct permissions, please set CGIUSER, CGIGROUP"
 	@${ECHO} "per default it is set to www:www."
 	@${ECHO}
-	@${MKDIR} ${WRKDIR}
 
 post-install:
 #	@${FIND} ${PREFIX}/share/moin/underlay \! -type d | ${SED} -e 's,${PREFIX}/,,' >> ${TMPPLIST}
diff --git a/www/moinmoin/distinfo b/www/moinmoin/distinfo
index 9de0380a72a4..9bf9f166c577 100644
--- a/www/moinmoin/distinfo
+++ b/www/moinmoin/distinfo
@@ -1,3 +1,3 @@
-MD5 (moin-1.8.3.tar.gz) = bba731b8c3390d3344ba9933b1cd6865
-SHA256 (moin-1.8.3.tar.gz) = dc7eb8913a362cde98dda4e76be07620742679f160df6f923654f9c64b62c254
-SIZE (moin-1.8.3.tar.gz) = 5999564
+MD5 (moin-1.8.4.tar.gz) = 6a91a62f5c0dd5379f3c2411c6629496
+SHA256 (moin-1.8.4.tar.gz) = 7e664d96cde9eb5b8d01fddcab58b903760a55e56e7959dd97f2711a5fc3b48c
+SIZE (moin-1.8.4.tar.gz) = 5959517
diff --git a/www/moinmoin/pkg-plist b/www/moinmoin/pkg-plist
index 1dc2931c8e8f..0b2bedff025e 100644
--- a/www/moinmoin/pkg-plist
+++ b/www/moinmoin/pkg-plist
@@ -795,6 +795,9 @@ bin/moin
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080300.py
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080300.pyc
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080300.pyo
+%%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080400.py
+%%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080400.pyc
+%%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/1080400.pyo
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/__init__.py
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/__init__.pyc
 %%PYTHON_SITELIBDIR%%/MoinMoin/script/migration/__init__.pyo
@@ -2197,6 +2200,8 @@ bin/moin
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheOnWin32withDomainAuthentication/revisions/00000001
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheOnWin32withFastCgi/current
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheOnWin32withFastCgi/revisions/00000001
+%%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithCherryPy/current
+%%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithCherryPy/revisions/00000001
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModPython/current
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModPython/revisions/00000001
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModWSGI/current
@@ -2215,6 +2220,7 @@ bin/moin
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TroubleShooting/attachments/is_python_here.sh
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TroubleShooting/current
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TroubleShooting/revisions/00000001
+%%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb/attachments/servicerunner.py
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb/current
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb/revisions/00000001
 %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)WebLogic/current
@@ -2397,7 +2403,7 @@ bin/moin
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/Czech.zip
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/Danish.zip
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/Dutch.zip
-%%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/EuropeanPortuguese.zip
+%%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/BrazilianPortuguese.zip
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/Finnish.zip
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/French.zip
 %%DATADIR%%/underlay/pages/SystemPagesSetup/attachments/German.zip
@@ -2765,6 +2771,7 @@ bin/moin
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)WikiInstanceCreation
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)WebLogic/revisions
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)WebLogic
+@dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb/attachments
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb/revisions
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TwistedWeb
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)TroubleShooting/revisions
@@ -2781,6 +2788,8 @@ bin/moin
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)BasicInstallation/revisions
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)BasicInstallation/attachments
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)BasicInstallation
+@dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithCherryPy/revisions
+@dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithCherryPy
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModWSGI/revisions
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModWSGI
 @dirrm %%DATADIR%%/underlay/pages/HelpOnInstalling(2f)ApacheWithModPython/revisions