aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwg <wg@FreeBSD.org>2013-08-13 19:23:29 +0800
committerwg <wg@FreeBSD.org>2013-08-13 19:23:29 +0800
commit36563eeb1a8ad62f1b909515e87687a333562c9e (patch)
tree3a59c511265efe7ec7c467d061d73c1a01b23a4c
parentd3c0873d685075435de0a082f0385f56ef52f2d4 (diff)
downloadfreebsd-ports-gnome-36563eeb1a8ad62f1b909515e87687a333562c9e.tar.gz
freebsd-ports-gnome-36563eeb1a8ad62f1b909515e87687a333562c9e.tar.zst
freebsd-ports-gnome-36563eeb1a8ad62f1b909515e87687a333562c9e.zip
www/pivotx: update to 2.3.7
- Update to 2.3.7 [1] - Fix EXAMPLES option [1] - Fix WWW in pkg-descr Changes: http://blog.pivotx.net/archive/2013/08/13/pivotx-237-released PR: ports/181238 [1] Submitted by: Fumiyuki Shimizu <fumifumi abacustech.jp> (maintainer)
-rw-r--r--www/pivotx/Makefile9
-rw-r--r--www/pivotx/distinfo4
-rw-r--r--www/pivotx/files/patch-module_smarty.php11
-rw-r--r--www/pivotx/pkg-descr2
-rw-r--r--www/pivotx/pkg-plist105
5 files changed, 84 insertions, 47 deletions
diff --git a/www/pivotx/Makefile b/www/pivotx/Makefile
index 4fc7c084bbe2..787450ef3acf 100644
--- a/www/pivotx/Makefile
+++ b/www/pivotx/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pivotx
-PORTVERSION= 2.3.3
-PORTREVISION= 1
+PORTVERSION= 2.3.7
CATEGORIES= www
MASTER_SITES= SF/pivot-weblog/PivotX \
http://pivotx.net/files/ \
@@ -17,12 +16,12 @@ COMMENT= Software to help you maintain dynamic sites such as weblogs
LICENSE= GPLv2
PORTDOCS= LICENSE.txt README.txt
-PORTEXAMPLES= example.htaccess
+PORTEXAMPLES= example.htaccess example.web.config
# Requirements:
# http://book.pivotx.net/index.php?page=app-e#anchor-determining-if-your-server-meets-pivotxs-requirements
-OPTIONS_DEFINE= MYSQL PHPDOM NLS DOCS
+OPTIONS_DEFINE= MYSQL PHPDOM DOCS EXAMPLES
MYSQL_DESC= Use MySQL instead of flat files
PHPDOM_DESC= Use PHP:DOM instead of SimpleXML
@@ -102,7 +101,7 @@ do-install:
@${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${DOCSDIR}'
.endfor
.endif
-.if ${PORT_OPTIONS:MNLS}
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} '${EXAMPLESDIR}'
.for FILES in ${PORTEXAMPLES}
@${INSTALL_DATA} '${TEMP_WRKSRC}/${FILES}' '${EXAMPLESDIR}'
diff --git a/www/pivotx/distinfo b/www/pivotx/distinfo
index f20483f75a6d..ebd849301bcc 100644
--- a/www/pivotx/distinfo
+++ b/www/pivotx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pivotx_2.3.3.tgz) = bc301de7e16cd24220d5e304762711eb435a01c8eb16c0f7d90f9b92923dff51
-SIZE (pivotx_2.3.3.tgz) = 2390948
+SHA256 (pivotx_2.3.7.tgz) = 32777a0c2402da8ffc24ade67971d4325e617e7d28fcc6742d4c5e6a2ae8c136
+SIZE (pivotx_2.3.7.tgz) = 2804920
diff --git a/www/pivotx/files/patch-module_smarty.php b/www/pivotx/files/patch-module_smarty.php
deleted file mode 100644
index 80af8cf6c85c..000000000000
--- a/www/pivotx/files/patch-module_smarty.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- pivotx/modules/module_smarty.php.orig 2012-04-13 00:04:12.000000000 +0900
-+++ pivotx/modules/module_smarty.php 2012-06-14 20:57:40.000000000 +0900
-@@ -5439,7 +5439,7 @@
- /**
- * @see $smarty->register_resource
- */
--function dbGetTemplate($tpl_name, $tpl_source, &$smarty_obj) {
-+function dbGetTemplate($tpl_name, &$tpl_source, &$smarty_obj) {
-
- if (isset($smarty_obj->custom_template[ $tpl_name ])) {
- $tpl_source = $smarty_obj->custom_template[ $tpl_name ];
diff --git a/www/pivotx/pkg-descr b/www/pivotx/pkg-descr
index afbc5a95fbcc..ede60c97259b 100644
--- a/www/pivotx/pkg-descr
+++ b/www/pivotx/pkg-descr
@@ -7,4 +7,4 @@ Since PivotX is an entirely different beast than pivot-weblog (Pivot
1.x), upgrading from Pivot 1.x will take a while to do properly.
(http://book.pivotx.net/page/4-1)
-WWW: http://pivotx.net/
+WWW: http://pivotx.net/
diff --git a/www/pivotx/pkg-plist b/www/pivotx/pkg-plist
index f67dae5dfcb0..c09f1bd4ae5a 100644
--- a/www/pivotx/pkg-plist
+++ b/www/pivotx/pkg-plist
@@ -120,7 +120,9 @@
%%WWWDIR%%/pivotx/extensions/extraimagefield/docs/summary.markdown
%%WWWDIR%%/pivotx/extensions/extraimagefield/hook_extraimagefield.php
%%WWWDIR%%/pivotx/extensions/fancybox/blank.gif
-%%WWWDIR%%/pivotx/extensions/fancybox/docs/summary.markdown
+%%WWWDIR%%/pivotx/extensions/fancybox/docs/changelog.markdown
+%%WWWDIR%%/pivotx/extensions/fancybox/docs/index.markdown
+%%WWWDIR%%/pivotx/extensions/fancybox/docs/toc.markdown
%%WWWDIR%%/pivotx/extensions/fancybox/fancy_close.png
%%WWWDIR%%/pivotx/extensions/fancybox/fancy_loading.png
%%WWWDIR%%/pivotx/extensions/fancybox/fancy_nav_left.png
@@ -153,8 +155,9 @@
%%WWWDIR%%/pivotx/extensions/gallery/upload_images.php
%%WWWDIR%%/pivotx/extensions/gallery/upload_images.tpl
%%WWWDIR%%/pivotx/extensions/index.html
+%%WWWDIR%%/pivotx/extensions/lifestream/TwitterAPIExchange.php
+%%WWWDIR%%/pivotx/extensions/lifestream/docs/index.markdown
%%WWWDIR%%/pivotx/extensions/lifestream/docs/screenshot.png
-%%WWWDIR%%/pivotx/extensions/lifestream/docs/summary.markdown
%%WWWDIR%%/pivotx/extensions/lifestream/flickr.gif
%%WWWDIR%%/pivotx/extensions/lifestream/jaiku.png
%%WWWDIR%%/pivotx/extensions/lifestream/lastfm.gif
@@ -163,9 +166,11 @@
%%WWWDIR%%/pivotx/extensions/lifestream/tumblr.gif
%%WWWDIR%%/pivotx/extensions/lifestream/twitter.png
%%WWWDIR%%/pivotx/extensions/lifestream/widget_lifestream.php
+%%WWWDIR%%/pivotx/extensions/slideshow/docs/changelog.markdown
%%WWWDIR%%/pivotx/extensions/slideshow/docs/index.markdown
+%%WWWDIR%%/pivotx/extensions/slideshow/docs/toc.markdown
%%WWWDIR%%/pivotx/extensions/slideshow/jquery.easing.1.3.js
-%%WWWDIR%%/pivotx/extensions/slideshow/jquery.slideviewer.1.2.js
+%%WWWDIR%%/pivotx/extensions/slideshow/jquery.slideviewer.1.2.1.js
%%WWWDIR%%/pivotx/extensions/slideshow/slideshow.css
%%WWWDIR%%/pivotx/extensions/slideshow/slideshow_skinny.css
%%WWWDIR%%/pivotx/extensions/slideshow/slideviewer.css
@@ -231,9 +236,9 @@
%%WWWDIR%%/pivotx/includes/index.html
%%WWWDIR%%/pivotx/includes/js/bookmarklet.js
%%WWWDIR%%/pivotx/includes/js/index.html
-%%WWWDIR%%/pivotx/includes/js/jquery-1.7.2.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-1.8.2.min.js
%%WWWDIR%%/pivotx/includes/js/jquery-plugins.js
-%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.8.17.custom.min.js
+%%WWWDIR%%/pivotx/includes/js/jquery-ui-1.9.1.custom.min.js
%%WWWDIR%%/pivotx/includes/js/jquery.Jcrop.min.js
%%WWWDIR%%/pivotx/includes/js/m_pivotx.js
%%WWWDIR%%/pivotx/includes/js/pivotx.js
@@ -254,9 +259,9 @@
%%WWWDIR%%/pivotx/includes/magpie/rss_parse.inc
%%WWWDIR%%/pivotx/includes/magpie/rss_utils.inc
%%WWWDIR%%/pivotx/includes/markdown/License.text
-%%WWWDIR%%/pivotx/includes/markdown/markdown.php
%%WWWDIR%%/pivotx/includes/markdown/PHP Markdown Readme.text
%%WWWDIR%%/pivotx/includes/markdown/PHP SmartyPants Readme.txt
+%%WWWDIR%%/pivotx/includes/markdown/markdown.php
%%WWWDIR%%/pivotx/includes/markdown/smartypants.php
%%WWWDIR%%/pivotx/includes/markitup/images/bg-container.png
%%WWWDIR%%/pivotx/includes/markitup/images/bg.png
@@ -674,33 +679,53 @@
%%WWWDIR%%/pivotx/templates/404.html
%%WWWDIR%%/pivotx/templates/_sub_commentform.html
%%WWWDIR%%/pivotx/templates/_sub_commentform_extended.html
-%%WWWDIR%%/pivotx/templates/bare_bones/_sub_about.html
-%%WWWDIR%%/pivotx/templates/bare_bones/_sub_footer.html
-%%WWWDIR%%/pivotx/templates/bare_bones/_sub_header.html
-%%WWWDIR%%/pivotx/templates/bare_bones/_sub_link_list.html
-%%WWWDIR%%/pivotx/templates/bare_bones/_sub_sidebar.html
-%%WWWDIR%%/pivotx/templates/bare_bones/bare_bones.css
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_about.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_footer.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_header.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_link_list.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_sidebar.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/_sub_weblog.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/archive.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/bare_bones-big.jpg
%%WWWDIR%%/pivotx/templates/bare_bones/bare_bones.jpg
%%WWWDIR%%/pivotx/templates/bare_bones/bare_bones.theme
+%%WWWDIR%%/pivotx/templates/bare_bones/entry.tpl
%%WWWDIR%%/pivotx/templates/bare_bones/entrypage_template.html
%%WWWDIR%%/pivotx/templates/bare_bones/extra_template.html
+%%WWWDIR%%/pivotx/templates/bare_bones/front.tpl
%%WWWDIR%%/pivotx/templates/bare_bones/frontpage_template.html
+%%WWWDIR%%/pivotx/templates/bare_bones/installation.txt
+%%WWWDIR%%/pivotx/templates/bare_bones/page.tpl
%%WWWDIR%%/pivotx/templates/bare_bones/page_template.html
-%%WWWDIR%%/pivotx/templates/default/2columns.jpg
-%%WWWDIR%%/pivotx/templates/default/2columns.theme
-%%WWWDIR%%/pivotx/templates/default/3columns.jpg
-%%WWWDIR%%/pivotx/templates/default/3columns.theme
-%%WWWDIR%%/pivotx/templates/default/_sub_about.html
-%%WWWDIR%%/pivotx/templates/default/_sub_footer.html
-%%WWWDIR%%/pivotx/templates/default/_sub_header.html
-%%WWWDIR%%/pivotx/templates/default/_sub_link_list.html
-%%WWWDIR%%/pivotx/templates/default/_sub_sidebar.html
+%%WWWDIR%%/pivotx/templates/bare_bones/search.tpl
+%%WWWDIR%%/pivotx/templates/bare_bones/style.css
+%%WWWDIR%%/pivotx/templates/default/_sub_about.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_entry.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_footer.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_header.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_link_list.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_page.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_sidebar.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_weblog.tpl
+%%WWWDIR%%/pivotx/templates/default/_sub_weblog_linkdump.tpl
+%%WWWDIR%%/pivotx/templates/default/archive_2.tpl
+%%WWWDIR%%/pivotx/templates/default/archive_3.tpl
%%WWWDIR%%/pivotx/templates/default/archivepage_template_2column.html
%%WWWDIR%%/pivotx/templates/default/archivepage_template_3column.html
+%%WWWDIR%%/pivotx/templates/default/default_2-big.jpg
+%%WWWDIR%%/pivotx/templates/default/default_2.jpg
+%%WWWDIR%%/pivotx/templates/default/default_2.theme
+%%WWWDIR%%/pivotx/templates/default/default_3-big.jpg
+%%WWWDIR%%/pivotx/templates/default/default_3.jpg
+%%WWWDIR%%/pivotx/templates/default/default_3.theme
+%%WWWDIR%%/pivotx/templates/default/entry_2.tpl
+%%WWWDIR%%/pivotx/templates/default/entry_3.tpl
%%WWWDIR%%/pivotx/templates/default/entrypage_template_2column.html
%%WWWDIR%%/pivotx/templates/default/entrypage_template_3column.html
%%WWWDIR%%/pivotx/templates/default/extrapage_template_2column.html
%%WWWDIR%%/pivotx/templates/default/extrapage_template_3column.html
+%%WWWDIR%%/pivotx/templates/default/front_2.tpl
+%%WWWDIR%%/pivotx/templates/default/front_3.tpl
%%WWWDIR%%/pivotx/templates/default/frontpage_template_2column.html
%%WWWDIR%%/pivotx/templates/default/frontpage_template_3column.html
%%WWWDIR%%/pivotx/templates/default/images/background_comments.gif
@@ -721,11 +746,16 @@
%%WWWDIR%%/pivotx/templates/default/images/header.jpg
%%WWWDIR%%/pivotx/templates/default/images/header_dark.jpg
%%WWWDIR%%/pivotx/templates/default/images/header_light.jpg
+%%WWWDIR%%/pivotx/templates/default/installation.txt
+%%WWWDIR%%/pivotx/templates/default/page_2.tpl
%%WWWDIR%%/pivotx/templates/default/page_2column.html
+%%WWWDIR%%/pivotx/templates/default/page_3.tpl
%%WWWDIR%%/pivotx/templates/default/page_3column.html
%%WWWDIR%%/pivotx/templates/default/pivotx_dark.css
%%WWWDIR%%/pivotx/templates/default/pivotx_default.css
%%WWWDIR%%/pivotx/templates/default/pivotx_light.css
+%%WWWDIR%%/pivotx/templates/default/search_2.tpl
+%%WWWDIR%%/pivotx/templates/default/search_3.tpl
%%WWWDIR%%/pivotx/templates/default_offline.html
%%WWWDIR%%/pivotx/templates/error.html
%%WWWDIR%%/pivotx/templates/feed_atom_template.xml
@@ -733,24 +763,43 @@
%%WWWDIR%%/pivotx/templates/feed_comments_rss_template.xml
%%WWWDIR%%/pivotx/templates/feed_rss_template.xml
%%WWWDIR%%/pivotx/templates/index.html
-%%WWWDIR%%/pivotx/templates/mobile/_sub_commentform.html
-%%WWWDIR%%/pivotx/templates/mobile/_sub_footer.html
-%%WWWDIR%%/pivotx/templates/mobile/_sub_header.html
+%%WWWDIR%%/pivotx/templates/mobile/_sub_commentform.tpl
+%%WWWDIR%%/pivotx/templates/mobile/_sub_footer.tpl
+%%WWWDIR%%/pivotx/templates/mobile/_sub_header.tpl
+%%WWWDIR%%/pivotx/templates/mobile/_sub_weblog.tpl
+%%WWWDIR%%/pivotx/templates/mobile/archive.tpl
+%%WWWDIR%%/pivotx/templates/mobile/entry.tpl
%%WWWDIR%%/pivotx/templates/mobile/entrypage_template.html
+%%WWWDIR%%/pivotx/templates/mobile/front.tpl
%%WWWDIR%%/pivotx/templates/mobile/frontpage_template.html
+%%WWWDIR%%/pivotx/templates/mobile/installation.txt
+%%WWWDIR%%/pivotx/templates/mobile/mobile-big.jpg
+%%WWWDIR%%/pivotx/templates/mobile/mobile.jpg
+%%WWWDIR%%/pivotx/templates/mobile/mobile.theme
+%%WWWDIR%%/pivotx/templates/mobile/page.tpl
%%WWWDIR%%/pivotx/templates/mobile/page_template.html
+%%WWWDIR%%/pivotx/templates/mobile/search.tpl
%%WWWDIR%%/pivotx/templates/mobile/search_template.html
%%WWWDIR%%/pivotx/templates/mobile/style.css
%%WWWDIR%%/pivotx/templates/pivotx_essentials.css
-%%WWWDIR%%/pivotx/templates/skinny/_sub_footer.html
-%%WWWDIR%%/pivotx/templates/skinny/_sub_header.html
-%%WWWDIR%%/pivotx/templates/skinny/_sub_sidebar.html
+%%WWWDIR%%/pivotx/templates/skinny/_sub_footer.tpl
+%%WWWDIR%%/pivotx/templates/skinny/_sub_header.tpl
+%%WWWDIR%%/pivotx/templates/skinny/_sub_sidebar.tpl
+%%WWWDIR%%/pivotx/templates/skinny/_sub_weblog.tpl
+%%WWWDIR%%/pivotx/templates/skinny/archive.tpl
%%WWWDIR%%/pivotx/templates/skinny/archivepage_template.html
+%%WWWDIR%%/pivotx/templates/skinny/entry.tpl
%%WWWDIR%%/pivotx/templates/skinny/entry_template.html
+%%WWWDIR%%/pivotx/templates/skinny/front.tpl
%%WWWDIR%%/pivotx/templates/skinny/frontpage_template.html
%%WWWDIR%%/pivotx/templates/skinny/images/header.jpg
+%%WWWDIR%%/pivotx/templates/skinny/installation.txt
+%%WWWDIR%%/pivotx/templates/skinny/page.tpl
%%WWWDIR%%/pivotx/templates/skinny/page_template.html
+%%WWWDIR%%/pivotx/templates/skinny/readme.txt
+%%WWWDIR%%/pivotx/templates/skinny/search.tpl
%%WWWDIR%%/pivotx/templates/skinny/search_template.html
+%%WWWDIR%%/pivotx/templates/skinny/skinny-big.jpg
%%WWWDIR%%/pivotx/templates/skinny/skinny.jpg
%%WWWDIR%%/pivotx/templates/skinny/skinny.theme
%%WWWDIR%%/pivotx/templates/skinny/style.css
@@ -845,7 +894,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.17.custom.css
+%%WWWDIR%%/pivotx/templates_internal/ui-theme/jquery-ui-1.9.1.custom.css
%%WWWDIR%%/pivotx/templates_internal/users.tpl
%%WWWDIR%%/pivotx/templates_internal/visitors.tpl
%%WWWDIR%%/pivotx/templates_internal/weblog.tpl