Update to 2.9.2

2.9.2:
    * Fixed problem where where logged in users can peek at trashed posts belonging to other authors.
    * Fixed other issues

2.9.1:
    * Fixed problem where scheduled posts and pingbacks are not processed correctly due to incompatibilities with some hosts
    * Fixed other issues

2.9:

 User Features

    * Trash status for posts, pages, and comments (includes restore and permanent delete)
    * Add support for 'include' and 'exclude' to [gallery] (Gallery Shortcode)
    * Allow user registration to be enabled by an XMLRPC client
    * Add support for sticky posts to the WXR exporter and importer
    * 'rel=canonical' for singular pages
    * Scroll back to the same location after saving a file in the Plugin and Theme editors
    * Correct comments and remove unnecessary echos from the default themes sidebar template file
    * Enable the APP (Atom) attachment file download to work correctly
    * Support location of category templates based on 'category-slug' as well as 'category-id' (Ticket 10614)
    * Support location of tag templates based on 'tag-id' as well as 'tag-slug' (Ticket 10868)
    * Support location of page templates based on 'page-slug' and 'page-id'
    * Set "Allow my blog to appear in search engines" to checked in installation
    * Don't offer to make a category its own parent
    * Remove Sphere from search list
    * Minify admin CSS
    * Show correct max upload filesize error message
    * Add 'rel' attribute to next/previous post links
    * Make the default and classic themes comment textareas valid XHTML
    * Clean up '.button' and '.button[disabled]' CSS classes, add 'spinner' and 'gray-out' buttons after clicking Publish or Update post
    * Fix race condition with autosave when clicking Publish immediately after entering post title
    * Add Comments for Pages in the WordPress Default theme
    * Define '$content_width' for Kubrick
    * Better feedback on publishing of future posts and pages
    * Display comments in descending date order, consistently
    * Add means of automatically repairing tables
    * Press This bookmarklet fixes
    * Give plugins and themes simple control over the text displayed at the end of an autogenerated Excerpt
    * Don't show "Change Permalinks" button when editing the page set as "Front page"
    * Image editing
    * Retire BunnyTags importer
    * Retire Jerome's keywords importer
    * Explain that the permalink is temporary for autosave generated permalinks
    * Update SimplePie to 1.2
    * Eliminate the redundant and confusing comment threading depth of 1
    * Easier Embeds with oEmbed support (see Ticket #10337) (oEmbed discovery disabled by default, use plugin to enable it)
    * TinyMCE 3.2.7
    * Remove rel='tag' on links in Tag Clouds
    * Add a title to the Home link output by wp_page_menu()
    * Adjust comment moderation keyboard shortcut keys 'd = trash' or delete depending on the screen
    * Show "Draft updated" instead of "Post updated" when saving draft
    * Show the login form in a popup when autosave hits the login grace period
    * Open View/Preview post in a new window from the link in the Saved/Updated message
    * Separate fields for 'image alt' and 'image caption' in Media uploader
    * Display better information about broken themes when there is no stylesheet
    * Improve situation when tables such as wp_options table were 'corrupt' new installation message was offered. Add means of automatically repairing tables
    * Export and import custom taxonomies
    * Admin copy improvements
    * Don't show page templates in the drop down if they are in a subdirectory
    * Make codex link open in a new window
    * Change 'Remove' link on widgets to 'Delete' because it doesn't just remove it, it deletes the settings for that widget instance.

Development, Themes, Plugins

    * Added 'excerpt_more' filter to wp_trim_excerpt() function, which allow developers to change excerpt '[...]' more string (Ticket 10395)
    * Add 'smilies_src' filter so plugins can better add smilies
    * Canonical redirects for post name queries
    * Allow _wp_get_comment_list() to handle custom comment types
    * Return an empty array instead of false for get_children() when no children found
    * Add some filters so that HTTP requests can be filtered
    * Move plugin update notice output to the plugin specific hook
    * Limit wp-mail 'blog by email' checks to every 5 minutes
    * Make it much easier to filter contact methods from user profiles
    * Allow filtering of get_edit_post_link for custom post_type
    * 'get_sample_permalink_html' filter
    * Enforce activation key to be a string, reject activation keys that are arrays
    * Support for new post types
    * Respect custom post_type in queries
    * Send Retry-After header when in maintenance mode
    * Various WP Filesystem related fixes and documentation
    * Add constants for ftp connections timeouts
    * Increase timeout on cron-based requests when checking for upgrades
    * Don't use has_action() before do_action() in http.php
    * Speed up jQuery based scripts
    * Use the current user as author for autosave
    * Show My Posts as default view on the Edit Posts screen for users without 'edit_others_posts' cap
    * Ensure that drafts viewed over XMLRPC have a correct gmt date set
    * Pass user id to 'get_' the_author_meta filters
    * Move _wp_get_user_contactmethods() into the registrations functions file
    * Machine parseable db error codes
    * Add global JS vars and actions to the media uploader iframe
    * Add JSON compat for PHP < 5.2
    * Make option_name the primary key for the options table
    * Allow a plugin to do a complete takeover of Post by Email
    * Logarithmic scale for tag cloud
    * Pass Post ID to the 'get_comments_number' filter
    * Always filter the url in the media upload form
    * Add a 'the_terms' filter
    * is_blog_installed() improvements
    * Allow force_ssl_admin() to properly accept false as a value
    * Pass logged_in cookie to async-upload and filter the cookie scheme in auth_redirect()
    * Add more actions around database add/delete/update operations
    * phpDoc for wp_"check|set"_post_lock functions
    * Use the old strings which are more translator friendly and add a generic default string to aid re-use by plugins adding post_types
    * Filter fields through kses upon display and introduce sanitize_user_object() and sanitize_user_field()
    * Use null instead of 0 when setting content length
    * Include 'hidden' directories in filesystem dirlist by default
    * Pass args array to 'wp_list_pages' filter
    * Actions for taxonomy updates
    * Key should be 'comment_id' not 'post_id' in comments table
    * Add get_delete_post_link () to retrieve delete posts link for post
    * Add 'separator' parameter to wp_tag_cloud() and wp_generate_tag_cloud() functions (Ticket 10315)
    * Added add_comment_meta() family of functions
    * Use a post_parent of 0 instead of -1 to indicate unattached posts
    * Improve get_page_hierarchy() function
    * Deprecate the_content_rss(), add the_content_feed() and get_the_content_feed(). Convert places that called the_content_rss() with an excerpt length to the_excerpt_rss(). Remove the rss_excerpt_length option. Use the_content_feed() where the_content() was previously used in feeds.
    * Add 'pad_counts' argument to wp_dropdown_categories()
    * Remove codepress
    * Remove the php-gettext library
    * Canonical post thumbanils
    * Add a filter to the_author_posts_link()
    * Merge post.js with page.js and slug.js, optimize categories and tags JS, standardize postboxes IDs and JS
    * Introduce register_theme_directory() which takes a wp-content-relative path and will additionally scan it for themes. Plugins can use this to add themes without requiring copying by the user
    * Add set_user_role action hook
    * Allow theme devs to change attrs (like CSS class) of thumbnail images
    * Add wp-post-image CSS class to post images
    * Allow for plugins to enhance the number of metadata fields captured from plugin and theme headers
    * Merge updated pomo code
    * Switch to using NOOP_Translations for untranslated sites
    * Improve wptexturize performance
    * Provide context to the strings in the Plugin and Theme installers to allow for different grammatical gender
    * Fixes for theme subdir support
    * Introduce wp_kses_post() and wp_kses_data() for filtering unescaped data
    * Add 'orderby=comment_count' argument to query_posts()
    * Honor Post Type for Sticky Posts
    * Allow querying multiple post types
    * Introduce add_theme_support(feature) and current_theme_supports(feature) for announcing and checking theme support for various features
    * Introduce require_if_theme_supports()
    * Add number of Embed related filters
    * Add 'IMAGE_EDIT_OVERWRITE' constant to control edited image save or replace, most useful for setups that have dynamic image resizing
    * Add load_child_theme_textdomain() to allow child themes to have their own translation files
    * Add sidebar descriptions to sidebar settings and widget admin screen
    * Make option_id primary. Add uniques for option_name and autoload
    * Allow plugins to override the behaviour of load_textdomain() in a variety of flexible ways
    * Mark _c() as deprecated. The new _x() function should be used instead.
    * Allow plugins to change the redirect on post/page publishing/submitting
    * Standardize on 'user_id' instead of 'user_ID' when passing comment data. Accept either 'user_id' or 'user_ID'. Remove 'user_id' global.
    * Filter imported comments
    * Introducing set_post_image_size(w, h, crop) so themes can register their special size/crop for canonical post images
    * Standardize around "post image" instead of "post thumbnail"
    * Allow registering post image support per post type
    * Return false from is_paged() if on the first page.
    * Check MySQL and PHP versions when auto upgrading
    * Add required php and mysql versions to version.php
    * Hard code required version in update-core.php

PR pkg/42765

3 files changed, 47 insertions, 18 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index aa84cc0ffbe..738172047ac 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/03/21 22:47:34 morr Exp $
+# $NetBSD: Makefile,v 1.10 2010/04/19 22:34:02 morr Exp $
 
 DISTNAME=		wordpress-${VERSION}
-VERSION=		2.8.6
+VERSION=		2.9.2
 CATEGORIES=		www
 MASTER_SITES=		http://wordpress.org/
 
@@ -20,11 +20,11 @@ USE_TOOLS+=		pax
 NO_BUILD=		yes
 WRKSRC=			${WRKDIR}/wordpress
 
-WWW_USER?=              ${APACHE_USER}
-WWW_GROUP?=             ${APACHE_GROUP}
+WWW_USER?=		${APACHE_USER}
+WWW_GROUP?=		${APACHE_GROUP}
 
-PKG_GROUPS_VARS+=	WWW_GROUP
-PKG_USERS_VARS+=	WWW_USER
+PKG_GROUPS_VARS=	WWW_GROUP
+PKG_USERS_VARS=		WWW_USER
 BUILD_DEFS+=		WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 EGDIR=			${PREFIX}/share/examples/wordpress
 DOCDIR=			${PREFIX}/share/doc/wordpress
@@ -36,7 +36,7 @@ CONF_FILES+=		${EGDIR}/wordpress.conf ${PKG_SYSCONFDIR}/wordpress.conf
 CONF_FILES_PERMS+=	${EGDIR}/wp-config-sample.php ${WPHOME}/wp-config.php \
 			${WWW_USER} ${WWW_GROUP} 0640
 OWN_DIRS_PERMS+=	${WPHOME}/wp-content/uploads \
-			${WWW_USER} ${WWW_GROUP} 0640
+			${WWW_USER} ${WWW_GROUP} 0750
 
 INSTALLATION_DIRS+=	${DOCDIR} ${WPHOME} ${EGDIR}
 
diff --git a/www/wordpress/PLIST b/www/wordpress/PLIST
index 299ef9ff748..f0636427cdb 100644
--- a/www/wordpress/PLIST
+++ b/www/wordpress/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/11/12 22:05:55 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/04/19 22:34:02 morr Exp $
 share/doc/wordpress/license.txt
 share/doc/wordpress/readme.html
 share/examples/wordpress/wordpress.conf
@@ -15,31 +15,43 @@ share/wordpress/wp-admin/categories.php
 share/wordpress/wp-admin/comment.php
 share/wordpress/wp-admin/css/colors-classic-rtl.css
 share/wordpress/wp-admin/css/colors-classic.css
+share/wordpress/wp-admin/css/colors-classic.dev.css
 share/wordpress/wp-admin/css/colors-fresh-rtl.css
 share/wordpress/wp-admin/css/colors-fresh.css
+share/wordpress/wp-admin/css/colors-fresh.dev.css
 share/wordpress/wp-admin/css/dashboard-rtl.css
 share/wordpress/wp-admin/css/dashboard.css
+share/wordpress/wp-admin/css/dashboard.dev.css
 share/wordpress/wp-admin/css/farbtastic-rtl.css
 share/wordpress/wp-admin/css/farbtastic.css
 share/wordpress/wp-admin/css/global-rtl.css
 share/wordpress/wp-admin/css/global.css
+share/wordpress/wp-admin/css/global.dev.css
 share/wordpress/wp-admin/css/ie-rtl.css
 share/wordpress/wp-admin/css/ie.css
 share/wordpress/wp-admin/css/install-rtl.css
 share/wordpress/wp-admin/css/install.css
+share/wordpress/wp-admin/css/install.dev.css
 share/wordpress/wp-admin/css/login-rtl.css
 share/wordpress/wp-admin/css/login.css
+share/wordpress/wp-admin/css/login.dev.css
 share/wordpress/wp-admin/css/media-rtl.css
 share/wordpress/wp-admin/css/media.css
+share/wordpress/wp-admin/css/media.dev.css
 share/wordpress/wp-admin/css/plugin-install-rtl.css
 share/wordpress/wp-admin/css/plugin-install.css
+share/wordpress/wp-admin/css/plugin-install.dev.css
 share/wordpress/wp-admin/css/press-this-rtl.css
 share/wordpress/wp-admin/css/press-this.css
+share/wordpress/wp-admin/css/press-this.dev.css
 share/wordpress/wp-admin/css/theme-editor-rtl.css
 share/wordpress/wp-admin/css/theme-editor.css
+share/wordpress/wp-admin/css/theme-editor.dev.css
 share/wordpress/wp-admin/css/theme-install.css
+share/wordpress/wp-admin/css/theme-install.dev.css
 share/wordpress/wp-admin/css/widgets-rtl.css
 share/wordpress/wp-admin/css/widgets.css
+share/wordpress/wp-admin/css/widgets.dev.css
 share/wordpress/wp-admin/custom-header.php
 share/wordpress/wp-admin/edit-attachment-rows.php
 share/wordpress/wp-admin/edit-category-form.php
@@ -86,6 +98,7 @@ share/wordpress/wp-admin/images/generic.png
 share/wordpress/wp-admin/images/gray-grad.png
 share/wordpress/wp-admin/images/icons32-vs.png
 share/wordpress/wp-admin/images/icons32.png
+share/wordpress/wp-admin/images/imgedit-icons.png
 share/wordpress/wp-admin/images/list-vs.png
 share/wordpress/wp-admin/images/list.png
 share/wordpress/wp-admin/images/loading-publish.gif
@@ -161,10 +174,12 @@ share/wordpress/wp-admin/includes/continents-cities.php
 share/wordpress/wp-admin/includes/dashboard.php
 share/wordpress/wp-admin/includes/export.php
 share/wordpress/wp-admin/includes/file.php
+share/wordpress/wp-admin/includes/image-edit.php
 share/wordpress/wp-admin/includes/image.php
 share/wordpress/wp-admin/includes/import.php
 share/wordpress/wp-admin/includes/manifest.php
 share/wordpress/wp-admin/includes/media.php
+share/wordpress/wp-admin/includes/meta-boxes.php
 share/wordpress/wp-admin/includes/misc.php
 share/wordpress/wp-admin/includes/plugin-install.php
 share/wordpress/wp-admin/includes/plugin.php
@@ -202,6 +217,8 @@ share/wordpress/wp-admin/js/editor.js
 share/wordpress/wp-admin/js/farbtastic.js
 share/wordpress/wp-admin/js/gallery.dev.js
 share/wordpress/wp-admin/js/gallery.js
+share/wordpress/wp-admin/js/image-edit.dev.js
+share/wordpress/wp-admin/js/image-edit.js
 share/wordpress/wp-admin/js/inline-edit-post.dev.js
 share/wordpress/wp-admin/js/inline-edit-post.js
 share/wordpress/wp-admin/js/inline-edit-tax.dev.js
@@ -212,8 +229,6 @@ share/wordpress/wp-admin/js/media-upload.dev.js
 share/wordpress/wp-admin/js/media-upload.js
 share/wordpress/wp-admin/js/media.dev.js
 share/wordpress/wp-admin/js/media.js
-share/wordpress/wp-admin/js/page.dev.js
-share/wordpress/wp-admin/js/page.js
 share/wordpress/wp-admin/js/password-strength-meter.dev.js
 share/wordpress/wp-admin/js/password-strength-meter.js
 share/wordpress/wp-admin/js/plugin-install.dev.js
@@ -223,8 +238,8 @@ share/wordpress/wp-admin/js/post.js
 share/wordpress/wp-admin/js/postbox.dev.js
 share/wordpress/wp-admin/js/postbox.js
 share/wordpress/wp-admin/js/revisions-js.php
-share/wordpress/wp-admin/js/slug.dev.js
-share/wordpress/wp-admin/js/slug.js
+share/wordpress/wp-admin/js/set-post-thumbnail.dev.js
+share/wordpress/wp-admin/js/set-post-thumbnail.js
 share/wordpress/wp-admin/js/tags.dev.js
 share/wordpress/wp-admin/js/tags.js
 share/wordpress/wp-admin/js/theme-preview.dev.js
@@ -248,6 +263,7 @@ share/wordpress/wp-admin/link-parse-opml.php
 share/wordpress/wp-admin/link.php
 share/wordpress/wp-admin/load-scripts.php
 share/wordpress/wp-admin/load-styles.php
+share/wordpress/wp-admin/maint/repair.php
 share/wordpress/wp-admin/media-new.php
 share/wordpress/wp-admin/media-upload.php
 share/wordpress/wp-admin/media.php
@@ -275,6 +291,7 @@ share/wordpress/wp-admin/press-this.php
 share/wordpress/wp-admin/profile.php
 share/wordpress/wp-admin/revision.php
 share/wordpress/wp-admin/rtl.css
+share/wordpress/wp-admin/rtl.dev.css
 share/wordpress/wp-admin/setup-config.php
 share/wordpress/wp-admin/sidebar.php
 share/wordpress/wp-admin/theme-editor.php
@@ -292,6 +309,7 @@ share/wordpress/wp-admin/user-new.php
 share/wordpress/wp-admin/users.php
 share/wordpress/wp-admin/widgets.php
 share/wordpress/wp-admin/wp-admin.css
+share/wordpress/wp-admin/wp-admin.dev.css
 share/wordpress/wp-app.php
 share/wordpress/wp-atom.php
 share/wordpress/wp-blog-header.php
@@ -361,6 +379,8 @@ share/wordpress/wp-includes/category-template.php
 share/wordpress/wp-includes/category.php
 share/wordpress/wp-includes/class-IXR.php
 share/wordpress/wp-includes/class-feed.php
+share/wordpress/wp-includes/class-json.php
+share/wordpress/wp-includes/class-oembed.php
 share/wordpress/wp-includes/class-phpass.php
 share/wordpress/wp-includes/class-phpmailer.php
 share/wordpress/wp-includes/class-pop3.php
@@ -375,6 +395,7 @@ share/wordpress/wp-includes/comment-template.php
 share/wordpress/wp-includes/comment.php
 share/wordpress/wp-includes/compat.php
 share/wordpress/wp-includes/cron.php
+share/wordpress/wp-includes/default-embeds.php
 share/wordpress/wp-includes/default-filters.php
 share/wordpress/wp-includes/default-widgets.php
 share/wordpress/wp-includes/deprecated.php
@@ -390,7 +411,6 @@ share/wordpress/wp-includes/functions.php
 share/wordpress/wp-includes/functions.wp-scripts.php
 share/wordpress/wp-includes/functions.wp-styles.php
 share/wordpress/wp-includes/general-template.php
-share/wordpress/wp-includes/gettext.php
 share/wordpress/wp-includes/http.php
 share/wordpress/wp-includes/images/blank.gif
 share/wordpress/wp-includes/images/crystal/archive.png
@@ -482,6 +502,11 @@ share/wordpress/wp-includes/js/crop/marqueeHoriz.gif
 share/wordpress/wp-includes/js/crop/marqueeVert.gif
 share/wordpress/wp-includes/js/hoverIntent.dev.js
 share/wordpress/wp-includes/js/hoverIntent.js
+share/wordpress/wp-includes/js/imgareaselect/border-anim-h.gif
+share/wordpress/wp-includes/js/imgareaselect/border-anim-v.gif
+share/wordpress/wp-includes/js/imgareaselect/imgareaselect.css
+share/wordpress/wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js
+share/wordpress/wp-includes/js/imgareaselect/jquery.imgareaselect.js
 share/wordpress/wp-includes/js/jcrop/Jcrop.gif
 share/wordpress/wp-includes/js/jcrop/jquery.Jcrop.css
 share/wordpress/wp-includes/js/jcrop/jquery.Jcrop.dev.js
@@ -507,6 +532,8 @@ share/wordpress/wp-includes/js/jquery/ui.resizable.js
 share/wordpress/wp-includes/js/jquery/ui.selectable.js
 share/wordpress/wp-includes/js/jquery/ui.sortable.js
 share/wordpress/wp-includes/js/jquery/ui.tabs.js
+share/wordpress/wp-includes/js/json2.dev.js
+share/wordpress/wp-includes/js/json2.js
 share/wordpress/wp-includes/js/prototype.js
 share/wordpress/wp-includes/js/quicktags.dev.js
 share/wordpress/wp-includes/js/quicktags.js
@@ -593,6 +620,7 @@ share/wordpress/wp-includes/js/tinymce/plugins/wordpress/css/content.css
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/audio.gif
+share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/embedded.png
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/help.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/image.gif
 share/wordpress/wp-includes/js/tinymce/plugins/wordpress/img/media.gif
@@ -684,6 +712,7 @@ share/wordpress/wp-includes/l10n.php
 share/wordpress/wp-includes/link-template.php
 share/wordpress/wp-includes/locale.php
 share/wordpress/wp-includes/media.php
+share/wordpress/wp-includes/meta.php
 share/wordpress/wp-includes/pluggable.php
 share/wordpress/wp-includes/plugin.php
 share/wordpress/wp-includes/pomo/entry.php
@@ -692,6 +721,7 @@ share/wordpress/wp-includes/pomo/po.php
 share/wordpress/wp-includes/pomo/streams.php
 share/wordpress/wp-includes/pomo/translations.php
 share/wordpress/wp-includes/post-template.php
+share/wordpress/wp-includes/post-thumbnail-template.php
 share/wordpress/wp-includes/post.php
 share/wordpress/wp-includes/query.php
 share/wordpress/wp-includes/registration-functions.php
@@ -701,7 +731,6 @@ share/wordpress/wp-includes/rss-functions.php
 share/wordpress/wp-includes/rss.php
 share/wordpress/wp-includes/script-loader.php
 share/wordpress/wp-includes/shortcodes.php
-share/wordpress/wp-includes/streams.php
 share/wordpress/wp-includes/taxonomy.php
 share/wordpress/wp-includes/template-loader.php
 share/wordpress/wp-includes/theme.php
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index f1c8f8081ee..8c8cb092842 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/11/12 22:05:55 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2010/04/19 22:34:02 morr Exp $
 
-SHA1 (wordpress-2.8.6.tar.gz) = 01a996c57f54a95cf6e457b61082f520a82ad1b5
-RMD160 (wordpress-2.8.6.tar.gz) = 309816cbb85463e511d10eacc9066a5bc1c93438
-Size (wordpress-2.8.6.tar.gz) = 2078596 bytes
+SHA1 (wordpress-2.9.2.tar.gz) = c4bc4fa6e4b1c631d372a930852873303708a881
+RMD160 (wordpress-2.9.2.tar.gz) = aea65429c9ee66fa1237319539119a761ba93d2d
+Size (wordpress-2.9.2.tar.gz) = 2229832 bytes