From farrokhi@royalway.propagation.net  Wed Apr 12 21:43:59 2006
Return-Path: <farrokhi@royalway.propagation.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1129A16A406
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 21:43:59 +0000 (UTC)
	(envelope-from farrokhi@royalway.propagation.net)
Received: from royalway.propagation.net (royalway.propagation.net [66.221.228.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3F243D58
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 21:43:58 +0000 (GMT)
	(envelope-from farrokhi@royalway.propagation.net)
Received: from localhost (localhost [127.0.0.1])
	by royalway.propagation.net (Postfix) with ESMTP id B81F156424
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Apr 2006 16:43:58 -0500 (CDT)
Received: from royalway.propagation.net ([127.0.0.1])
	by localhost (royalway.propagation.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id G1eIN1H0at2k for <FreeBSD-gnats-submit@freebsd.org>;
	Wed, 12 Apr 2006 16:43:55 -0500 (CDT)
Received: by royalway.propagation.net (Postfix, from userid 1002)
	id C6E4356423; Wed, 12 Apr 2006 16:43:55 -0500 (CDT)
Message-Id: <20060412214355.C6E4356423@royalway.propagation.net>
Date: Wed, 12 Apr 2006 16:43:55 -0500 (CDT)
From: Babak Farrokhi <babak@farrokhi.net>
Reply-To: Babak Farrokhi <babak@farrokhi.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Maintainer Update] port www/pmwiki to 2.1.5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95667
>Category:       ports
>Synopsis:       [Maintainer Update] port www/pmwiki to 2.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 12 21:50:10 GMT 2006
>Closed-Date:    Wed Apr 12 23:29:14 GMT 2006
>Last-Modified:  Wed Apr 12 23:29:14 GMT 2006
>Originator:     Babak Farrokhi
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD royalway.propagation.net 5.4-STABLE FreeBSD 5.4-STABLE #6: Thu Jun 30 05:11:17 CDT 2005 root@royalway.propagation.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

--- pmwiki.patch begins here ---
diff -ruN pmwiki.orig/Makefile pmwiki/Makefile
--- pmwiki.orig/Makefile	Thu Apr 13 00:49:19 2006
+++ pmwiki/Makefile	Thu Apr 13 00:50:06 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pmwiki
-PORTVERSION=	2.0.13
-PORTREVISION=	1
+PORTVERSION=	2.1.5
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff -ruN pmwiki.orig/distinfo pmwiki/distinfo
--- pmwiki.orig/distinfo	Thu Apr 13 00:49:19 2006
+++ pmwiki/distinfo	Thu Apr 13 00:50:36 2006
@@ -1,3 +1,3 @@
-MD5 (pmwiki-2.0.13.tgz) = adc48139d18126bd91013ae143304793
-SHA256 (pmwiki-2.0.13.tgz) = e688fb94d66646f16e97c82d7d6a30571bcacf11a9509576b43b31966cee9212
-SIZE (pmwiki-2.0.13.tgz) = 233589
+MD5 (pmwiki-2.1.5.tgz) = cb7411cc74ce441a455cf0c538410a21
+SHA256 (pmwiki-2.1.5.tgz) = 6ef44c61d71690efa7b614c073851a7eca40a93cbf59fd2864f3b506176c0818
+SIZE (pmwiki-2.1.5.tgz) = 278767
diff -ruN pmwiki.orig/pkg-plist pmwiki/pkg-plist
--- pmwiki.orig/pkg-plist	Thu Apr 13 00:49:19 2006
+++ pmwiki/pkg-plist	Thu Apr 13 02:08:37 2006
@@ -1,11 +1,17 @@
-%%PMWIKIDIR%%/COPYING
-%%PMWIKIDIR%%/cookbook/.cvsignore
+%%PMWIKIDIR%%/README.txt
 %%PMWIKIDIR%%/cookbook/.htaccess
+%%PMWIKIDIR%%/docs/.htaccess
+%%PMWIKIDIR%%/docs/COPYING.txt
+%%PMWIKIDIR%%/docs/DOCUMENTATION.txt
+%%PMWIKIDIR%%/docs/INSTALL.txt
+%%PMWIKIDIR%%/docs/UPGRADE.txt
+%%PMWIKIDIR%%/docs/sample-config.php
 %%PMWIKIDIR%%/local/.htaccess
 %%PMWIKIDIR%%/pmwiki.php
 %%PMWIKIDIR%%/pub/guiedit/README
 %%PMWIKIDIR%%/pub/guiedit/attach.gif
 %%PMWIKIDIR%%/pub/guiedit/big.gif
+%%PMWIKIDIR%%/pub/guiedit/blank.gif
 %%PMWIKIDIR%%/pub/guiedit/center.gif
 %%PMWIKIDIR%%/pub/guiedit/em.gif
 %%PMWIKIDIR%%/pub/guiedit/extlink.gif
@@ -16,11 +22,14 @@
 %%PMWIKIDIR%%/pub/guiedit/h3.gif
 %%PMWIKIDIR%%/pub/guiedit/hr.gif
 %%PMWIKIDIR%%/pub/guiedit/indent.gif
+%%PMWIKIDIR%%/pub/guiedit/left.gif
 %%PMWIKIDIR%%/pub/guiedit/math.gif
 %%PMWIKIDIR%%/pub/guiedit/ol.gif
 %%PMWIKIDIR%%/pub/guiedit/outdent.gif
 %%PMWIKIDIR%%/pub/guiedit/pagelink.gif
+%%PMWIKIDIR%%/pub/guiedit/preview.gif
 %%PMWIKIDIR%%/pub/guiedit/right.gif
+%%PMWIKIDIR%%/pub/guiedit/save.gif
 %%PMWIKIDIR%%/pub/guiedit/small.gif
 %%PMWIKIDIR%%/pub/guiedit/spellcheck.gif
 %%PMWIKIDIR%%/pub/guiedit/strong.gif
@@ -37,12 +46,15 @@
 %%PMWIKIDIR%%/pub/skins/print/print.css
 %%PMWIKIDIR%%/pub/skins/print/print.php
 %%PMWIKIDIR%%/pub/skins/print/print.tmpl
-%%PMWIKIDIR%%/sample-config.php
+%%PMWIKIDIR%%/scripts/.htaccess
 %%PMWIKIDIR%%/scripts/author.php
 %%PMWIKIDIR%%/scripts/authuser.php
+%%PMWIKIDIR%%/scripts/caches.php
 %%PMWIKIDIR%%/scripts/compat1x.php
 %%PMWIKIDIR%%/scripts/crypt.php
 %%PMWIKIDIR%%/scripts/diag.php
+%%PMWIKIDIR%%/scripts/draft.php
+%%PMWIKIDIR%%/scripts/feeds.php
 %%PMWIKIDIR%%/scripts/forms.php
 %%PMWIKIDIR%%/scripts/guiedit.php
 %%PMWIKIDIR%%/scripts/httpauth.php
@@ -54,7 +66,7 @@
 %%PMWIKIDIR%%/scripts/phpdiff.php
 %%PMWIKIDIR%%/scripts/prefs.php
 %%PMWIKIDIR%%/scripts/refcount.php
-%%PMWIKIDIR%%/scripts/rss.php
+%%PMWIKIDIR%%/scripts/robots.php
 %%PMWIKIDIR%%/scripts/simuledit.php
 %%PMWIKIDIR%%/scripts/skins.php
 %%PMWIKIDIR%%/scripts/stdconfig.php
@@ -67,12 +79,13 @@
 %%PMWIKIDIR%%/scripts/version.php
 %%PMWIKIDIR%%/scripts/wikistyles.php
 %%PMWIKIDIR%%/scripts/xlpage-utf-8.php
-%%PMWIKIDIR%%/wikilib.d/Main.GroupAttributes
 %%PMWIKIDIR%%/wikilib.d/Main.HomePage
 %%PMWIKIDIR%%/wikilib.d/Main.WikiSandbox
-%%PMWIKIDIR%%/wikilib.d/PmWiki.AdvancedTables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.AccessKeys
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Audiences
+%%PMWIKIDIR%%/wikilib.d/PmWiki.AuthUser
 %%PMWIKIDIR%%/wikilib.d/PmWiki.AvailableActions
+%%PMWIKIDIR%%/wikilib.d/PmWiki.BackupAndRestore
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicEditing
 %%PMWIKIDIR%%/wikilib.d/PmWiki.BasicVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Categories
@@ -88,13 +101,11 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DesignNotes
 %%PMWIKIDIR%%/wikilib.d/PmWiki.DocumentationIndex
 %%PMWIKIDIR%%/wikilib.d/PmWiki.EditVariables
-%%PMWIKIDIR%%/wikilib.d/PmWiki.ErrorMessages
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FAQ
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FilePermissions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.FmtPageName
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Functions
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Glossary
-%%PMWIKIDIR%%/wikilib.d/PmWiki.GroupAttributes
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeader
 %%PMWIKIDIR%%/wikilib.d/PmWiki.GroupHeaders
 %%PMWIKIDIR%%/wikilib.d/PmWiki.I18nVariables
@@ -111,11 +122,13 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MailPosts
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MailingLists
 %%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupMasterIndex
-%%PMWIKIDIR%%/wikilib.d/PmWiki.MarkupVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.OtherVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageDirectives
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageFileFormat
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PageHistory
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageLists
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PageVariables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.PagelistVariables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Passwords
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PasswordsAdmin
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PathVariables
@@ -123,16 +136,17 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PerGroupCustomizations
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PmWiki
 %%PMWIKIDIR%%/wikilib.d/PmWiki.PmWikiPhilosophy
-%%PMWIKIDIR%%/wikilib.d/PmWiki.RSS
 %%PMWIKIDIR%%/wikilib.d/PmWiki.RefCount
 %%PMWIKIDIR%%/wikilib.d/PmWiki.ReleaseNotes
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Requirements
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Security
-%%PMWIKIDIR%%/wikilib.d/PmWiki.SimpleTables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SimultaneousEdits
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SitePreferences
 %%PMWIKIDIR%%/wikilib.d/PmWiki.SkinTemplates
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Skins
+%%PMWIKIDIR%%/wikilib.d/PmWiki.SpecialCharacters
+%%PMWIKIDIR%%/wikilib.d/PmWiki.TableDirectives
+%%PMWIKIDIR%%/wikilib.d/PmWiki.Tables
 %%PMWIKIDIR%%/wikilib.d/PmWiki.TextFormattingRules
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Troubleshooting
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Upgrades
@@ -142,7 +156,9 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UploadsAdmin
 %%PMWIKIDIR%%/wikilib.d/PmWiki.UrlApprovals
 %%PMWIKIDIR%%/wikilib.d/PmWiki.Variables
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WebFeeds
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiAdministrator
+%%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarmTerminology
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiFarms
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroup
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiGroups
@@ -155,10 +171,13 @@
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWikiWeb
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWord
 %%PMWIKIDIR%%/wikilib.d/PmWiki.WikiWords
+%%PMWIKIDIR%%/wikilib.d/Site.AuthForm
+%%PMWIKIDIR%%/wikilib.d/Site.AuthUser
 %%PMWIKIDIR%%/wikilib.d/Site.EditForm
 %%PMWIKIDIR%%/wikilib.d/Site.EditQuickReference
 %%PMWIKIDIR%%/wikilib.d/Site.GroupAttributes
 %%PMWIKIDIR%%/wikilib.d/Site.PageActions
+%%PMWIKIDIR%%/wikilib.d/Site.PageListTemplates
 %%PMWIKIDIR%%/wikilib.d/Site.PageNotFound
 %%PMWIKIDIR%%/wikilib.d/Site.Preferences
 %%PMWIKIDIR%%/wikilib.d/Site.Search
@@ -172,7 +191,9 @@
 @dirrm %%PMWIKIDIR%%/pub/skins/pmwiki
 @dirrm %%PMWIKIDIR%%/pub/skins
 @dirrm %%PMWIKIDIR%%/pub/guiedit
+@dirrm %%PMWIKIDIR%%/pub/css
 @dirrm %%PMWIKIDIR%%/pub
 @dirrm %%PMWIKIDIR%%/local
+@dirrm %%PMWIKIDIR%%/docs
 @dirrm %%PMWIKIDIR%%/cookbook
 @dirrmtry %%PMWIKIDIR%%
--- pmwiki.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Wed Apr 12 22:55:38 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95667 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Wed Apr 12 23:29:12 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95667 
>Unformatted:
