Update to 4.0 from 3.9.2

* Update MESSAGE to use apache24 and php-fpm.
* Add php-fpm option, and make default option as php-fpm.

Changelog:
What's New
General

    Featured image previews now support .bmp files
    Featured Image meta box is now hidden for contributors lacking upload capabilities
    New supported oEmbed providers: CollegeHumor, Issuu, Mixcloud, YouTube playlists, TED talks
    Install WordPress in your language
    Streamlined Language management right from the dashboard

Posts

    Display embed previews for audio/visual URLs in Visual editor content box.
    Page scrolling now scrolls post content box.
    Edit Post/Page menu bar sticks to top of content box when scrolling (Visual and Text editor).
    Color picker was re-added to the Visual editor

Media

    Add Media Grid view option (default) for Media Library
    Add "Bulk Select" button to Media Grid view to delete multiple items
    Add oEmbed support for TED talks, Mixcloud, CollegeHumor.com, Issuu
    Expand oEmbed support to include YouTube playlist URLs and Polldaddy’s short URL format
    Remove Viddler oEmbed support
    Update SlideShare oEmbed regex
    Improved media experience on small screen sizes (embedded videos now responsive)
    Native video and audio shortcodes now support Flash playback looping

Comments

    Comments in trash can now be marked as spam.

Plugins

    Display plugins list as grid, with thumbnails, on Add New screen.
    Add popup window with plugin details (displays info from plugin's directory page).
    Add "Beta Testing" tab to Plugins screen for new features-as-plugins.

Accessibility

    Improved keyboard accessibility in the Add Media panel
    Improved screen-reader support for Customizer sections
    Makes links in help tabs keyboard accessible
    Improvements for screen-readers when managing widgets in the Customizer

Install Process

    Add language select menu as first Installation screen (skipped for localized installs)

Multisite

    mp4 file extension was added to allowed upload file types

5 files changed, 56 insertions, 22 deletions

diff --git a/www/php-ja-wordpress/MESSAGE b/www/php-ja-wordpress/MESSAGE
index 023caaf7e3c..2bd3a4c8ac4 100644
--- a/www/php-ja-wordpress/MESSAGE
+++ b/www/php-ja-wordpress/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2013/12/27 16:46:12 ryoon Exp $
+$NetBSD: MESSAGE,v 1.3 2014/10/19 14:14:47 ryoon Exp $
 
 To use Japanese localized WordPress with Apache httpd 2.4, you will need
 to perform the following steps.
@@ -27,10 +27,20 @@ to perform the following steps.
 	define('DB_PASSWORD', 'wppassword');
 	define('DB_HOST', 'localhost');
 
-5. Edit ${PREFIX}/etc/httpd/httpd.conf, and Add the following line at
+5. Edit ${PREFIX}/etc/httpd/httpd.conf, and add the following line at
    the its bottom.
 
-	Include etc/ja-wordpress.conf
+	LoadModule proxy_module lib/httpd/mod_proxy.so
+	LoadModule proxy_fcgi_module lib/httpd/mod_proxy_fcgi.so
+	ProxyPassMatch ^/wordpress/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/${PREFIX}/share/ja-wordpress/$1
+	Alias /wordpress ${PREFIX}/share/ja-wordpress
+	<Directory "${PREFIX}/share/ja-wordpress">
+		Order allow,deny
+		Allow from all
+		AllowOverride FileInfo All
+		Require all granted
+		DirectoryIndex index.php
+	</Directory>
 
 6. Add the following line to ${PREFIX}/etc/php.ini.
 
@@ -38,8 +48,8 @@ to perform the following steps.
 
 7. Adjust ${PREFIX}/etc/ja-wordpress.conf for your environment.
 
-8. Start Apache httpd 2.4, and access http://localhost/wordpress/ ,
-   and enter website name etc.
+8. Start Apache httpd 2.4 and php-fpm, and access
+   http://localhost/wordpress/ , and enter website name etc.
 
 For further post-installation customisation you may need to make
 changes to file permissions etc. based on the functionality that
diff --git a/www/php-ja-wordpress/Makefile b/www/php-ja-wordpress/Makefile
index 18c9cc37858..c51c24417c2 100644
--- a/www/php-ja-wordpress/Makefile
+++ b/www/php-ja-wordpress/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/09/28 14:18:00 taca Exp $
+# $NetBSD: Makefile,v 1.4 2014/10/19 14:14:47 ryoon Exp $
 
 DISTNAME=		wordpress-${VERSION}-ja
 PKGNAME=		${PHP_PKG_PREFIX}-ja-wordpress-${VERSION}
-VERSION=		3.9.2
+VERSION=		4.0
 CATEGORIES=		www
 MASTER_SITES=		http://ja.wordpress.org/
 
diff --git a/www/php-ja-wordpress/PLIST b/www/php-ja-wordpress/PLIST
index 51d7180cf90..aecbc6512b7 100644
--- a/www/php-ja-wordpress/PLIST
+++ b/www/php-ja-wordpress/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/09/28 14:18:00 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/10/19 14:14:47 ryoon Exp $
 share/doc/ja-wordpress/license.txt
 share/doc/ja-wordpress/readme.html
 share/examples/ja-wordpress/ja-wordpress.conf
@@ -250,6 +250,7 @@ share/ja-wordpress/wp-admin/includes/taxonomy.php
 share/ja-wordpress/wp-admin/includes/template.php
 share/ja-wordpress/wp-admin/includes/theme-install.php
 share/ja-wordpress/wp-admin/includes/theme.php
+share/ja-wordpress/wp-admin/includes/translation-install.php
 share/ja-wordpress/wp-admin/includes/update-core.php
 share/ja-wordpress/wp-admin/includes/update.php
 share/ja-wordpress/wp-admin/includes/upgrade.php
@@ -277,6 +278,8 @@ share/ja-wordpress/wp-admin/js/dashboard.js
 share/ja-wordpress/wp-admin/js/dashboard.min.js
 share/ja-wordpress/wp-admin/js/edit-comments.js
 share/ja-wordpress/wp-admin/js/edit-comments.min.js
+share/ja-wordpress/wp-admin/js/editor-expand.js
+share/ja-wordpress/wp-admin/js/editor-expand.min.js
 share/ja-wordpress/wp-admin/js/editor.js
 share/ja-wordpress/wp-admin/js/editor.min.js
 share/ja-wordpress/wp-admin/js/farbtastic.js
@@ -289,6 +292,8 @@ share/ja-wordpress/wp-admin/js/inline-edit-post.min.js
 share/ja-wordpress/wp-admin/js/inline-edit-tax.js
 share/ja-wordpress/wp-admin/js/inline-edit-tax.min.js
 share/ja-wordpress/wp-admin/js/iris.min.js
+share/ja-wordpress/wp-admin/js/language-chooser.js
+share/ja-wordpress/wp-admin/js/language-chooser.min.js
 share/ja-wordpress/wp-admin/js/link.js
 share/ja-wordpress/wp-admin/js/link.min.js
 share/ja-wordpress/wp-admin/js/media-gallery.js
@@ -463,6 +468,8 @@ share/ja-wordpress/wp-content/plugins/index.html
 share/ja-wordpress/wp-content/plugins/index.php
 share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/ext/ja/admin.css
 share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/ext/ja/class.php
+share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/js/20140410/wplink.js
+share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/js/20140410/wplink.min.js
 share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/js/word-count.js
 share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/js/word-count.min.js
 share/ja-wordpress/wp-content/plugins/wp-multibyte-patch/js/wplink.js
@@ -556,15 +563,18 @@ share/ja-wordpress/wp-content/themes/twentythirteen/content-video.php
 share/ja-wordpress/wp-content/themes/twentythirteen/content.php
 share/ja-wordpress/wp-content/themes/twentythirteen/css/editor-style.css
 share/ja-wordpress/wp-content/themes/twentythirteen/css/ie.css
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/COPYING.txt
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/LICENSE.txt
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.eot
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.svg
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.ttf
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/genericons-regular-webfont.woff
-share/ja-wordpress/wp-content/themes/twentythirteen/fonts/genericons.css
 share/ja-wordpress/wp-content/themes/twentythirteen/footer.php
 share/ja-wordpress/wp-content/themes/twentythirteen/functions.php
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/COPYING.txt
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/Genericons-Regular.otf
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/LICENSE.txt
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/README.txt
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/example.html
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/font/genericons-regular-webfont.eot
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/font/genericons-regular-webfont.svg
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/font/genericons-regular-webfont.ttf
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/font/genericons-regular-webfont.woff
+share/ja-wordpress/wp-content/themes/twentythirteen/genericons/genericons.css
 share/ja-wordpress/wp-content/themes/twentythirteen/header.php
 share/ja-wordpress/wp-content/themes/twentythirteen/image.php
 share/ja-wordpress/wp-content/themes/twentythirteen/images/dotted-line-2x.png
@@ -718,6 +728,7 @@ share/ja-wordpress/wp-includes/class-wp-admin-bar.php
 share/ja-wordpress/wp-includes/class-wp-ajax-response.php
 share/ja-wordpress/wp-includes/class-wp-customize-control.php
 share/ja-wordpress/wp-includes/class-wp-customize-manager.php
+share/ja-wordpress/wp-includes/class-wp-customize-panel.php
 share/ja-wordpress/wp-includes/class-wp-customize-section.php
 share/ja-wordpress/wp-includes/class-wp-customize-setting.php
 share/ja-wordpress/wp-includes/class-wp-customize-widgets.php
@@ -955,6 +966,8 @@ share/ja-wordpress/wp-includes/js/media-audiovideo.js
 share/ja-wordpress/wp-includes/js/media-audiovideo.min.js
 share/ja-wordpress/wp-includes/js/media-editor.js
 share/ja-wordpress/wp-includes/js/media-editor.min.js
+share/ja-wordpress/wp-includes/js/media-grid.js
+share/ja-wordpress/wp-includes/js/media-grid.min.js
 share/ja-wordpress/wp-includes/js/media-models.js
 share/ja-wordpress/wp-includes/js/media-models.min.js
 share/ja-wordpress/wp-includes/js/media-views.js
@@ -1002,6 +1015,8 @@ share/ja-wordpress/wp-includes/js/tinymce/langs/wp-langs-en.js
 share/ja-wordpress/wp-includes/js/tinymce/license.txt
 share/ja-wordpress/wp-includes/js/tinymce/plugins/charmap/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/colorpicker/plugin.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/colorpicker/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/compat3x/css/dialog.css
 share/ja-wordpress/wp-includes/js/tinymce/plugins/compat3x/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/compat3x/plugin.min.js
@@ -1013,6 +1028,8 @@ share/ja-wordpress/wp-includes/js/tinymce/plugins/hr/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/hr/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/image/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/image/plugin.min.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/lists/plugin.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/lists/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/media/moxieplayer.swf
 share/ja-wordpress/wp-includes/js/tinymce/plugins/media/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/media/plugin.min.js
@@ -1024,6 +1041,8 @@ share/ja-wordpress/wp-includes/js/tinymce/plugins/textcolor/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/textcolor/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/wordpress/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/wordpress/plugin.min.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js
+share/ja-wordpress/wp-includes/js/tinymce/plugins/wpautoresize/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/wpdialogs/plugin.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/wpdialogs/plugin.min.js
 share/ja-wordpress/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -1143,6 +1162,7 @@ share/ja-wordpress/wp-includes/rewrite.php
 share/ja-wordpress/wp-includes/rss-functions.php
 share/ja-wordpress/wp-includes/rss.php
 share/ja-wordpress/wp-includes/script-loader.php
+share/ja-wordpress/wp-includes/session.php
 share/ja-wordpress/wp-includes/shortcodes.php
 share/ja-wordpress/wp-includes/taxonomy.php
 share/ja-wordpress/wp-includes/template-loader.php
diff --git a/www/php-ja-wordpress/distinfo b/www/php-ja-wordpress/distinfo
index 88b8fafe120..a8f06c04d3f 100644
--- a/www/php-ja-wordpress/distinfo
+++ b/www/php-ja-wordpress/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/09/28 14:18:00 taca Exp $
+$NetBSD: distinfo,v 1.4 2014/10/19 14:14:47 ryoon Exp $
 
-SHA1 (wordpress-3.9.2-ja.tar.gz) = 7783c9b6f90b820884c94f0be3cd23dbb79436c6
-RMD160 (wordpress-3.9.2-ja.tar.gz) = 2a18248074c8fbeca70d02e7c0453c4601d003ff
-Size (wordpress-3.9.2-ja.tar.gz) = 6254219 bytes
+SHA1 (wordpress-4.0-ja.tar.gz) = afd8257effdcf9e8bb1c10376d3f03ed44dd8780
+RMD160 (wordpress-4.0-ja.tar.gz) = bf5d36f0257950041844844491664737e0cbfc39
+Size (wordpress-4.0-ja.tar.gz) = 6489528 bytes
diff --git a/www/php-ja-wordpress/options.mk b/www/php-ja-wordpress/options.mk
index 8b939484d14..2d3dfebdcea 100644
--- a/www/php-ja-wordpress/options.mk
+++ b/www/php-ja-wordpress/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2013/11/10 11:13:08 ryoon Exp $
+# $NetBSD: options.mk,v 1.2 2014/10/19 14:14:47 ryoon Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wordpress
 
 PKG_OPTIONS_REQUIRED_GROUPS=	wordpress
-PKG_OPTIONS_GROUP.wordpress=	php-cgi ap-php
+PKG_OPTIONS_GROUP.wordpress=	php-cgi ap-php php-fpm
 
-PKG_SUGGESTED_OPTIONS=		ap-php
+PKG_SUGGESTED_OPTIONS=		php-fpm
 
 .include "../../mk/bsd.options.mk"
 
@@ -17,3 +17,7 @@ DEPENDS+=	php>=5.2.4:${PHPPKGSRCDIR}
 .  include "../../mk/apache.mk"
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php
 .endif
+
+.if !empty(PKG_OPTIONS:Mphp-fpm)
+DEPENDS+=	${PHP_PKG_PREFIX}-fpm>=5.2.4:../../www/php-fpm
+.endif