3 files changed, 19 insertions, 25 deletions

diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index 506f33208c79..7ebfc8cf6908 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	pivotx
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.2
 CATEGORIES=	www
 MASTER_SITES=	SF/pivot-weblog/PivotX \
 		http://pivotx.net/files/ \
 		http://pivotx.net/files/archived/
-DISTNAME=	pivotx_2.3.0
+DISTNAME=	pivotx_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	fumifumi@abacustech.jp
@@ -26,23 +26,24 @@ 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
+OPTIONS=	MYSQL	"Use MySQL instead of flat files" off \
+		PHPDOM	"Use PHP:DOM instead of SimpleXML" off
 
 .include <bsd.port.options.mk>
 
 WANT_PHP_WEB=	yes
 IGNORE_WITH_PHP=4
-USE_PHP=	session gettext xml gd pcre tokenizer
+USE_PHP=	session gettext xml tokenizer gd pcre
 USE_GETTEXT=	yes
 
-.if exists(${PHPBASE}/lib/php/${PHP_EXT_DIR}/simplexml.so) || !exists(${PHPBASE}/lib/php/${PHP_EXT_DIR}/dom.so)
-USE_PHP+=	simplexml
-.else
+.if defined(WITH_PHPDOM)
 USE_PHP+=	dom
+.else
+USE_PHP+=	simplexml
 .endif
 
 .if defined(WITH_MYSQL)
-USE_MYSQL=	yes
+USE_MYSQL=	client
 USE_PHP+=	mysql
 .endif
 
@@ -102,7 +103,7 @@ do-install:
 	@${MKDIR} '${WWWDIR}'
 	@cd '${WRKSRC}' && ${COPYTREE_SHARE} . '${WWWDIR}'
 .for DIR in ${WRITABLEDIRS}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} '${WWWDIR}/${DIR}'
+	@${CHOWN} -R '${WWWOWN}:${WWWGRP}' '${WWWDIR}/${DIR}'
 	@${FIND} '${WWWDIR}/${DIR}' -type d -print0 | ${XARGS} -0 ${CHMOD} u=rwx,go=rx
 	@${FIND} '${WWWDIR}/${DIR}' -type f -print0 | ${XARGS} -0 ${CHMOD} u=rw,go=r
 .endfor
diff --git a/www/pivotx/distinfo b/www/pivotx/distinfo
index 1a602c4c07ca..1fd0ae0c6f19 100644
--- a/www/pivotx/distinfo
+++ b/www/pivotx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pivotx_2.3.0.tgz) = 93248ceea6cc8b1654386a14175c1a3d4035bf63dca99b0e46b8fa6bba84df64
-SIZE (pivotx_2.3.0.tgz) = 2345261
+SHA256 (pivotx_2.3.2.tgz) = 5fb4e8665774ca6f314053eabea6644ad0c3e10eb3f6247b2f6addb9f73cf1e3
+SIZE (pivotx_2.3.2.tgz) = 2387895
diff --git a/www/pivotx/pkg-plist b/www/pivotx/pkg-plist
index 7ee3587732cd..6e5b3b70a94f 100644
--- a/www/pivotx/pkg-plist
+++ b/www/pivotx/pkg-plist
@@ -8,8 +8,6 @@
 %%WWWDIR%%/pivotx/data.php
 @exec   rm -f  %B/db/cache/*
 @unexec rm -rf %B/db/cache 2>/dev/null || true
-%%WWWDIR%%/pivotx/db/blocked_ips.txt.php
-%%WWWDIR%%/pivotx/db/ignored_domains.txt.php
 %%WWWDIR%%/pivotx/db/index.html
 %%WWWDIR%%/pivotx/db/refkeys/index.html
 %%WWWDIR%%/pivotx/db/rsscache/index.html
@@ -22,16 +20,8 @@
 %%WWWDIR%%/pivotx/editor_wysi/plugins/contextmenu/editor_plugin.js
 %%WWWDIR%%/pivotx/editor_wysi/plugins/fullscreen/editor_plugin.js
 %%WWWDIR%%/pivotx/editor_wysi/plugins/fullscreen/fullscreen.htm
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/css/content.css
 %%WWWDIR%%/pivotx/editor_wysi/plugins/media/css/media.css
 %%WWWDIR%%/pivotx/editor_wysi/plugins/media/editor_plugin.js
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/flash.gif
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/flv_player.swf
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/quicktime.gif
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/realmedia.gif
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/shockwave.gif
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/trans.gif
-%%WWWDIR%%/pivotx/editor_wysi/plugins/media/img/windowsmedia.gif
 %%WWWDIR%%/pivotx/editor_wysi/plugins/media/js/embed.js
 %%WWWDIR%%/pivotx/editor_wysi/plugins/media/js/media.js
 %%WWWDIR%%/pivotx/editor_wysi/plugins/media/langs/en_dlg.js
@@ -111,6 +101,7 @@
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/langs/en.js
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/langs/en_dlg.js
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/link.htm
+%%WWWDIR%%/pivotx/editor_wysi/themes/advanced/shortcuts.htm
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/skins/default/content.css
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/skins/default/dialog.css
 %%WWWDIR%%/pivotx/editor_wysi/themes/advanced/skins/default/img/buttons.png
@@ -244,9 +235,9 @@
 %%WWWDIR%%/pivotx/includes/index.html
 %%WWWDIR%%/pivotx/includes/js/bookmarklet.js
 %%WWWDIR%%/pivotx/includes/js/index.html
-%%WWWDIR%%/pivotx/includes/js/jquery-1.6.2.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-1.7.1.min.js
 %%WWWDIR%%/pivotx/includes/js/jquery-plugins.js
-%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.8.15.custom.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.8.17.custom.min.js
 %%WWWDIR%%/pivotx/includes/js/jquery.Jcrop.min.js
 %%WWWDIR%%/pivotx/includes/js/m_pivotx.js
 %%WWWDIR%%/pivotx/includes/js/pivotx.js
@@ -377,6 +368,9 @@
 %%WWWDIR%%/pivotx/includes/textile/help.html
 %%WWWDIR%%/pivotx/includes/textile/index.html
 %%WWWDIR%%/pivotx/includes/textile/overview.html
+%%WWWDIR%%/pivotx/includes/timthumb-config.php
+%%WWWDIR%%/pivotx/includes/timthumb-error.jpg
+%%WWWDIR%%/pivotx/includes/timthumb-notfnd.jpg
 %%WWWDIR%%/pivotx/includes/timthumb.php
 %%WWWDIR%%/pivotx/includes/timwrapper.php
 %%WWWDIR%%/pivotx/includes/xmlrpc/compat/array_key_exists.php
@@ -855,7 +849,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.15.custom.css
+%%WWWDIR%%/pivotx/templates_internal/ui-theme/jquery-ui-1.8.17.custom.css
 %%WWWDIR%%/pivotx/templates_internal/users.tpl
 %%WWWDIR%%/pivotx/templates_internal/visitors.tpl
 %%WWWDIR%%/pivotx/templates_internal/weblog.tpl
@@ -949,7 +943,6 @@
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/nonbreaking
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/media/langs
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/media/js
-@dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/media/img
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/media/css
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/media
 @dirrm %%WWWDIR%%/pivotx/editor_wysi/plugins/fullscreen