From ebf4369cd008c7d0d3125a45992041a1a457df51 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Mon, 2 Apr 2007 08:54:48 +0200
Subject: [PATCH] pmwiki: update to 2.1.27

---
 pmwiki/.footprint          |  4 ++--
 pmwiki/.md5sum             |  3 +--
 pmwiki/Pkgfile             | 10 ++++------
 pmwiki/pmwiki-2.1.26.patch | 15 ---------------
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 pmwiki/pmwiki-2.1.26.patch

diff --git a/pmwiki/.footprint b/pmwiki/.footprint
index 88400915f..b1a5a8afe 100644
--- a/pmwiki/.footprint
+++ b/pmwiki/.footprint
@@ -83,8 +83,8 @@ drwxr-xr-x	root/root	var/www/pmwiki/scripts/
 -rw-r--r--	root/root	var/www/pmwiki/scripts/version.php
 -rw-r--r--	root/root	var/www/pmwiki/scripts/wikistyles.php
 -rw-r--r--	root/root	var/www/pmwiki/scripts/xlpage-utf-8.php
-drwx------	nobody/root	var/www/pmwiki/uploads/
-drwx------	nobody/root	var/www/pmwiki/wiki.d/
+drwx------	www/root	var/www/pmwiki/uploads/
+drwx------	www/root	var/www/pmwiki/wiki.d/
 drwxr-xr-x	root/root	var/www/pmwiki/wikilib.d/
 -rw-r--r--	root/root	var/www/pmwiki/wikilib.d/Main.HomePage
 -rw-r--r--	root/root	var/www/pmwiki/wikilib.d/Main.WikiSandbox
diff --git a/pmwiki/.md5sum b/pmwiki/.md5sum
index c1a6cde1d..00305c9d7 100644
--- a/pmwiki/.md5sum
+++ b/pmwiki/.md5sum
@@ -1,2 +1 @@
-909ecbce81827aa9b153161ca8a960b6  pmwiki-2.1.26.patch
-5bc04e195628f5c5f634b482f6c68c5a  pmwiki-2.1.26.tgz
+49645be61d77b604cf8a7bc43ebdd0f3  pmwiki-2.1.27.tgz
diff --git a/pmwiki/Pkgfile b/pmwiki/Pkgfile
index 4087f82c7..6a369dbaa 100644
--- a/pmwiki/Pkgfile
+++ b/pmwiki/Pkgfile
@@ -4,15 +4,13 @@
 # Depends on:  mod_php
 
 name=pmwiki
-version=2.1.26
-release=2
-source=(http://www.pmwiki.org/pub/$name/$name-$version.tgz \
-        $name-$version.patch)
+version=2.1.27
+release=1
+source=(http://www.pmwiki.org/pub/$name/$name-$version.tgz)
 
 build () {
-    (cd $name-$version; patch -p1 -i $SRC/$name-$version.patch)
     install -d $PKG/var/www/$name
-    install -d -o nobody -m 700 $PKG/var/www/$name/{wiki.d,uploads}
+    install -d -o www -m 700 $PKG/var/www/$name/{wiki.d,uploads}
     cp -R $name-$version/* $PKG/var/www/$name
     mv $PKG/var/www/$name/{docs/sample-config.php,local/config.php.sample}
     rm -r $PKG/var/www/$name/docs
diff --git a/pmwiki/pmwiki-2.1.26.patch b/pmwiki/pmwiki-2.1.26.patch
deleted file mode 100644
index c076bcdbb..000000000
--- a/pmwiki/pmwiki-2.1.26.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru pmwiki-2.1.26.orig/pmwiki.php pmwiki-2.1.26/pmwiki.php
---- pmwiki-2.1.26.orig/pmwiki.php	2006-11-04 10:56:15.000000000 +0100
-+++ pmwiki-2.1.26/pmwiki.php	2006-11-04 10:55:42.000000000 +0100
-@@ -1097,7 +1097,10 @@
-   if ($t=='caption') return "<:table,1>$y";
-   if (@$MarkupFrame[0]['cs'][0] != 'table') $rowcount = 0; else $rowcount++;
-   $FmtV['$TableRowCount'] = $rowcount + 1;
--  $FmtV['$TableRowIndex'] = ($rowcount % $TableRowIndexMax) + 1;
-+  if ($TableRowIndexMax > 0)
-+    $FmtV['$TableRowIndex'] = ($rowcount % $TableRowIndexMax) + 1;
-+  else
-+    $FmtV['$TableRowIndex'] = $rowcount + 1;
-   $trattr = FmtPageName($TableRowAttrFmt, '');
-   return "<:table,1><tr $trattr>$y</tr>";
- }