3 files changed, 17 insertions, 10 deletions

diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index d893344141b2..92a4cdc23246 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	pmwiki
-PORTVERSION=	2.1.27
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	SF
+MASTER_SITES=	http://pmwiki.org/pub/pmwiki/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	farrokhi@FreeBSD.org
+MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A WikiWikiWeb clone using PHP
 
 USE_PHP=	mbstring session
diff --git a/www/pmwiki/distinfo b/www/pmwiki/distinfo
index c0e1fd01bf3c..d49c363afb9d 100644
--- a/www/pmwiki/distinfo
+++ b/www/pmwiki/distinfo
@@ -1,3 +1,3 @@
-MD5 (pmwiki-2.1.27.tgz) = 49645be61d77b604cf8a7bc43ebdd0f3
-SHA256 (pmwiki-2.1.27.tgz) = f819670fe7c8e11186e71b8b64176389ce5a0eed592a6b5a77138e80c042ac52
-SIZE (pmwiki-2.1.27.tgz) = 309536
+MD5 (pmwiki-2.2.0.tgz) = a1f180fc9bb218e2d40309b04b5c67bf
+SHA256 (pmwiki-2.2.0.tgz) = 34cbf2820bf7619a411cf7bfa9af9fc8ac4eff71e00e1e3b66a76f467f4671fa
+SIZE (pmwiki-2.2.0.tgz) = 348591
diff --git a/www/pmwiki/pkg-plist b/www/pmwiki/pkg-plist
index bbf6ebf4ac9a..29b96fea8b37 100644
--- a/www/pmwiki/pkg-plist
+++ b/www/pmwiki/pkg-plist
@@ -49,8 +49,9 @@
 %%PMWIKIDIR%%/scripts/.htaccess
 %%PMWIKIDIR%%/scripts/author.php
 %%PMWIKIDIR%%/scripts/authuser.php
+%%PMWIKIDIR%%/scripts/blocklist.php
 %%PMWIKIDIR%%/scripts/caches.php
-%%PMWIKIDIR%%/scripts/compat1x.php
+%%PMWIKIDIR%%/scripts/creole.php
 %%PMWIKIDIR%%/scripts/crypt.php
 %%PMWIKIDIR%%/scripts/diag.php
 %%PMWIKIDIR%%/scripts/draft.php
@@ -59,7 +60,7 @@
 %%PMWIKIDIR%%/scripts/guiedit.php
 %%PMWIKIDIR%%/scripts/httpauth.php
 %%PMWIKIDIR%%/scripts/intermap.txt
-%%PMWIKIDIR%%/scripts/mailposts.php
+%%PMWIKIDIR%%/scripts/markupexpr.php
 %%PMWIKIDIR%%/scripts/notify.php
 %%PMWIKIDIR%%/scripts/pagelist.php
 %%PMWIKIDIR%%/scripts/pagerev.php
@@ -74,11 +75,13 @@
 %%PMWIKIDIR%%/scripts/stdmarkup.php
 %%PMWIKIDIR%%/scripts/trails.php
 %%PMWIKIDIR%%/scripts/transition.php
+%%PMWIKIDIR%%/scripts/upgrades.php
 %%PMWIKIDIR%%/scripts/upload.php
 %%PMWIKIDIR%%/scripts/urlapprove.php
 %%PMWIKIDIR%%/scripts/vardoc.php
 %%PMWIKIDIR%%/scripts/version.php
 %%PMWIKIDIR%%/scripts/wikistyles.php
+%%PMWIKIDIR%%/scripts/wikiwords.php
 %%PMWIKIDIR%%/scripts/xlpage-utf-8.php
 %%PMWIKIDIR%%/wikilib.d/Main.HomePage
 %%PMWIKIDIR%%/wikilib.d/Main.WikiSandbox
@@ -89,9 +92,9 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BackupAndRestore
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicEditing
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Blocklist
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Categories
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ChangeLog
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ChangesFromPmWiki1
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ConditionalMarkup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Contributors
 %%PMWIKIDIR%%/wikilib.d/PmWiki.CreatingNewPages
@@ -123,6 +126,7 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.LocalCustomizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MailPosts
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MailingLists
+%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupExpressions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupMasterIndex
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Notify
 %%PMWIKIDIR%%/wikilib.d/PmWiki.OtherVariables
@@ -188,6 +192,10 @@
 %%PMWIKIDIR%%/wikilib.d/Site.SideBar
 %%PMWIKIDIR%%/wikilib.d/Site.Site
 %%PMWIKIDIR%%/wikilib.d/Site.UploadQuickReference
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthList
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.AuthUser
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.GroupAttributes
+%%PMWIKIDIR%%/wikilib.d/SiteAdmin.Status
 @dirrm %%PMWIKIDIR%%/wikilib.d
 @dirrm %%PMWIKIDIR%%/wiki.d
 @dirrm %%PMWIKIDIR%%/scripts