4 files changed, 24 insertions, 21 deletions

diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index 8fc0783b7e10..8ad476d75f18 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -6,30 +6,33 @@
 #
 
 PORTNAME=	pivotx
-PORTVERSION=	2.2.6
+PORTVERSION=	2.3.0
 CATEGORIES=	www
-MASTER_SITES=	SF/pivot-weblog/PivotX http://pivotx.net/files/ http://pivotx.net/files/archived/
-DISTNAME=	pivotx_226
+MASTER_SITES=	SF/pivot-weblog/PivotX \
+		http://pivotx.net/files/ \
+		http://pivotx.net/files/archived/
+DISTNAME=	pivotx_2.3.0
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fumifumi@abacustech.jp
 COMMENT=	Software to help you maintain dynamic sites such as weblogs
 
-DOCS=	LICENSE.txt README.txt example.htaccess
-DOCS_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-${PORTREVISION}-docs
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${DOCS_WRKSRC}/LICENSE.txt
 
+DOCS=		LICENSE.txt README.txt example.htaccess
+DOCS_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-${PORTREVISION}-docs
+
 # Requirements:
 # http://book.pivotx.net/index.php?page=app-e#anchor-determining-if-your-server-meets-pivotxs-requirements
 
 OPTIONS=	MYSQL	"Use MySQL instead of flat files" off
+
 .include <bsd.port.options.mk>
 
 WANT_PHP_WEB=	yes
 IGNORE_WITH_PHP=4
-USE_PHP=	session gettext xml gd pcre
+USE_PHP=	session gettext xml gd pcre tokenizer
 USE_GETTEXT=	yes
 
 .if exists(${PHPBASE}/lib/php/${PHP_EXT_DIR}/simplexml.so) || !exists(${PHPBASE}/lib/php/${PHP_EXT_DIR}/dom.so)
diff --git a/www/pivotx/distinfo b/www/pivotx/distinfo
index ecbea9310270..1a602c4c07ca 100644
--- a/www/pivotx/distinfo
+++ b/www/pivotx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pivotx_226.tgz) = c3583f750afcce884aa106c7833ab79cd59013524bbeb05967eb35738ebe5400
-SIZE (pivotx_226.tgz) = 2330203
+SHA256 (pivotx_2.3.0.tgz) = 93248ceea6cc8b1654386a14175c1a3d4035bf63dca99b0e46b8fa6bba84df64
+SIZE (pivotx_2.3.0.tgz) = 2345261
diff --git a/www/pivotx/files/patch-pivotx-data.php b/www/pivotx/files/patch-pivotx-data.php
index f3493e989361..2141834f7145 100644
--- a/www/pivotx/files/patch-pivotx-data.php
+++ b/www/pivotx/files/patch-pivotx-data.php
@@ -1,6 +1,6 @@
---- pivotx/data.php.orig	2010-11-02 05:17:24.000000000 +0900
-+++ pivotx/data.php	2011-01-05 16:04:08.000000000 +0900
-@@ -609,9 +609,11 @@
+--- pivotx/data.php.orig	2011-08-05 02:40:39.000000000 +0900
++++ pivotx/data.php	2011-08-16 10:55:32.000000000 +0900
+@@ -616,6 +616,7 @@
          'allow_comments' => '1',
          'allow_paragraphs' => '0',
          'chmod' => '0644',
@@ -8,7 +8,3 @@
          'cookie_length' => '1814400',
          'db_version' => $dbversion,
          'debug' => 0,
-+        //'debug_visible' => 1,
-         'default_category' => 'default',
-         'diffdate_format' => '%ordday% %monname% \'%ye% - ',
-         'emoticons' => '1',
diff --git a/www/pivotx/pkg-plist b/www/pivotx/pkg-plist
index ebc5c26c48f4..7ee3587732cd 100644
--- a/www/pivotx/pkg-plist
+++ b/www/pivotx/pkg-plist
@@ -177,9 +177,11 @@
 %%WWWDIR%%/pivotx/extensions/lifestream/twitter.png
 %%WWWDIR%%/pivotx/extensions/lifestream/widget_lifestream.php
 %%WWWDIR%%/pivotx/extensions/slideshow/docs/index.markdown
-%%WWWDIR%%/pivotx/extensions/slideshow/jquery.easing.1.2.js
-%%WWWDIR%%/pivotx/extensions/slideshow/jquery.slideviewer.1.1.js
+%%WWWDIR%%/pivotx/extensions/slideshow/jquery.easing.1.3.js
+%%WWWDIR%%/pivotx/extensions/slideshow/jquery.slideviewer.1.2.js
 %%WWWDIR%%/pivotx/extensions/slideshow/slideshow.css
+%%WWWDIR%%/pivotx/extensions/slideshow/slideshow_skinny.css
+%%WWWDIR%%/pivotx/extensions/slideshow/slideviewer.css
 %%WWWDIR%%/pivotx/extensions/slideshow/spinner.gif
 %%WWWDIR%%/pivotx/extensions/slideshow/widget_slideshow.php
 %%WWWDIR%%/pivotx/fileupload.php
@@ -242,9 +244,9 @@
 %%WWWDIR%%/pivotx/includes/index.html
 %%WWWDIR%%/pivotx/includes/js/bookmarklet.js
 %%WWWDIR%%/pivotx/includes/js/index.html
-%%WWWDIR%%/pivotx/includes/js/jquery-1.5.2.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-1.6.2.min.js
 %%WWWDIR%%/pivotx/includes/js/jquery-plugins.js
-%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.8.11.custom.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.8.15.custom.min.js
 %%WWWDIR%%/pivotx/includes/js/jquery.Jcrop.min.js
 %%WWWDIR%%/pivotx/includes/js/m_pivotx.js
 %%WWWDIR%%/pivotx/includes/js/pivotx.js
@@ -533,6 +535,7 @@
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.debug_print_var.php
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.default.php
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.escape.php
+%%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.explode.php
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.hyphenize.php
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.indent.php
 %%WWWDIR%%/pivotx/modules/smarty/plugins/modifier.lower.php
@@ -834,6 +837,7 @@
 %%WWWDIR%%/pivotx/templates_internal/mobile/inc_header.tpl
 %%WWWDIR%%/pivotx/templates_internal/mobile/pages.tpl
 %%WWWDIR%%/pivotx/templates_internal/modal.tpl
+%%WWWDIR%%/pivotx/templates_internal/moderatecomments.tpl
 %%WWWDIR%%/pivotx/templates_internal/pages.tpl
 %%WWWDIR%%/pivotx/templates_internal/placeholder.tpl
 %%WWWDIR%%/pivotx/templates_internal/trackbacks.tpl
@@ -851,7 +855,7 @@
 %%WWWDIR%%/pivotx/templates_internal/ui-theme/images/ui-icons_454545_256x240.png
 %%WWWDIR%%/pivotx/templates_internal/ui-theme/images/ui-icons_888888_256x240.png
 %%WWWDIR%%/pivotx/templates_internal/ui-theme/images/ui-icons_cd0a0a_256x240.png
-%%WWWDIR%%/pivotx/templates_internal/ui-theme/jquery-ui-1.8.11.custom.css
+%%WWWDIR%%/pivotx/templates_internal/ui-theme/jquery-ui-1.8.15.custom.css
 %%WWWDIR%%/pivotx/templates_internal/users.tpl
 %%WWWDIR%%/pivotx/templates_internal/visitors.tpl
 %%WWWDIR%%/pivotx/templates_internal/weblog.tpl