- Update to 1.6

PR:		138196
Submitted by:	Wen Heping <wenheping@gmail.com> (maintainer)

3 files changed, 79 insertions, 32 deletions

diff --git a/www/elgg/Makefile b/www/elgg/Makefile
index 068fb26cfdff..56f294f41d41 100644
--- a/www/elgg/Makefile
+++ b/www/elgg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	elgg
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	www
 MASTER_SITES=	http://elgg.org/download/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff --git a/www/elgg/distinfo b/www/elgg/distinfo
index 0435ba378986..40a4ea6a5448 100644
--- a/www/elgg/distinfo
+++ b/www/elgg/distinfo
@@ -1,3 +1,3 @@
-MD5 (elgg1.5.tar.gz) = a258eb64b781d88d46a1e856c7ce21ff
-SHA256 (elgg1.5.tar.gz) = 1c3cce1e4d1289a7b814c5ee7965c72a558fcd363c0242199d4a197d3ccb404f
-SIZE (elgg1.5.tar.gz) = 1329920
+MD5 (elgg1.6.tar.gz) = 2b66bf0c6d59d800d72ee1f9fab547ae
+SHA256 (elgg1.6.tar.gz) = 9efaed2b72682fb31367dae064d1b925a573852ee4cab2c2c3715048549efae5
+SIZE (elgg1.6.tar.gz) = 1647323
diff --git a/www/elgg/pkg-plist b/www/elgg/pkg-plist
index 5b572a3a5f5a..b00d9b098a08 100644
--- a/www/elgg/pkg-plist
+++ b/www/elgg/pkg-plist
@@ -1,3 +1,4 @@
+%%WWWDIR%%/ChangeLog
 %%WWWDIR%%/CONTRIBUTORS.txt
 %%WWWDIR%%/INSTALL.txt
 %%WWWDIR%%/LICENCE.txt
@@ -122,6 +123,7 @@
 %%WWWDIR%%/engine/lib/install.php
 %%WWWDIR%%/engine/lib/languages.php
 %%WWWDIR%%/engine/lib/location.php
+%%WWWDIR%%/engine/lib/mb_wrapper.php
 %%WWWDIR%%/engine/lib/memcache.php
 %%WWWDIR%%/engine/lib/metadata.php
 %%WWWDIR%%/engine/lib/metastrings.php
@@ -135,17 +137,20 @@
 %%WWWDIR%%/engine/lib/plugins.php
 %%WWWDIR%%/engine/lib/query.php
 %%WWWDIR%%/engine/lib/relationships.php
-%%WWWDIR%%/engine/lib/river.php
 %%WWWDIR%%/engine/lib/river2.php
+%%WWWDIR%%/engine/lib/search.php
 %%WWWDIR%%/engine/lib/sessions.php
 %%WWWDIR%%/engine/lib/sites.php
 %%WWWDIR%%/engine/lib/social.php
 %%WWWDIR%%/engine/lib/statistics.php
 %%WWWDIR%%/engine/lib/system_log.php
 %%WWWDIR%%/engine/lib/tags.php
+%%WWWDIR%%/engine/lib/testing.php
 %%WWWDIR%%/engine/lib/upgrades/2008100701.php
 %%WWWDIR%%/engine/lib/upgrades/2008101303.php
 %%WWWDIR%%/engine/lib/upgrades/2009022701.php
+%%WWWDIR%%/engine/lib/upgrades/2009041701.php
+%%WWWDIR%%/engine/lib/upgrades/2009070101.php
 %%WWWDIR%%/engine/lib/users.php
 %%WWWDIR%%/engine/lib/usersettings.php
 %%WWWDIR%%/engine/lib/version.php
@@ -170,6 +175,8 @@
 %%WWWDIR%%/engine/schema/upgrades/2009010901.sql
 %%WWWDIR%%/engine/schema/upgrades/2009021201.sql
 %%WWWDIR%%/engine/schema/upgrades/2009021301.sql
+%%WWWDIR%%/engine/schema/upgrades/2009051401.sql
+%%WWWDIR%%/engine/schema/upgrades/2009052201.sql
 %%WWWDIR%%/engine/settings.example.php
 %%WWWDIR%%/engine/start.php
 %%WWWDIR%%/entities/index.php
@@ -185,6 +192,7 @@
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install.php
 %%WWWDIR%%/languages/en.php
+%%WWWDIR%%/mod/ChangeLog
 %%WWWDIR%%/mod/blog/actions/add.php
 %%WWWDIR%%/mod/blog/actions/delete.php
 %%WWWDIR%%/mod/blog/actions/edit.php
@@ -236,6 +244,19 @@
 %%WWWDIR%%/mod/bookmarks/views/default/widgets/bookmarks/edit.php
 %%WWWDIR%%/mod/bookmarks/views/default/widgets/bookmarks/view.php
 %%WWWDIR%%/mod/bookmarks/views/rss/object/bookmarks.php
+%%WWWDIR%%/mod/captcha/backgrounds/bg1.jpg
+%%WWWDIR%%/mod/captcha/backgrounds/bg2.jpg
+%%WWWDIR%%/mod/captcha/backgrounds/bg3.jpg
+%%WWWDIR%%/mod/captcha/backgrounds/bg4.jpg
+%%WWWDIR%%/mod/captcha/backgrounds/bg5.jpg
+%%WWWDIR%%/mod/captcha/fonts/1.ttf
+%%WWWDIR%%/mod/captcha/fonts/Liberation_serif_License.txt
+%%WWWDIR%%/mod/captcha/languages/en.php
+%%WWWDIR%%/mod/captcha/views/default/captcha/css.php
+%%WWWDIR%%/mod/captcha/views/default/input/captcha.php
+%%WWWDIR%%/mod/captcha/captcha.php
+%%WWWDIR%%/mod/captcha/manifest.xml
+%%WWWDIR%%/mod/captcha/start.php
 %%WWWDIR%%/mod/categories/actions/save.php
 %%WWWDIR%%/mod/categories/languages/en.php
 %%WWWDIR%%/mod/categories/manifest.xml
@@ -268,14 +289,18 @@
 %%WWWDIR%%/mod/diagnostics/languages/en.php
 %%WWWDIR%%/mod/diagnostics/manifest.xml
 %%WWWDIR%%/mod/diagnostics/start.php
+%%WWWDIR%%/mod/diagnostics/testreport.php
+%%WWWDIR%%/mod/diagnostics/unittester.php
 %%WWWDIR%%/mod/diagnostics/views/default/diagnostics/forms/download.php
+%%WWWDIR%%/mod/diagnostics/views/default/diagnostics/runalltests.php
+%%WWWDIR%%/mod/diagnostics/views/default/diagnostics/test.php
+%%WWWDIR%%/mod/diagnostics/views/default/diagnostics/testresult.php
 %%WWWDIR%%/mod/embed/README.txt
 %%WWWDIR%%/mod/embed/embed.php
 %%WWWDIR%%/mod/embed/images/button_spacer.gif
 %%WWWDIR%%/mod/embed/images/close_button.gif
 %%WWWDIR%%/mod/embed/images/loading.gif
 %%WWWDIR%%/mod/embed/images/media_modal.png
-%%WWWDIR%%/mod/embed/jquery.form.js
 %%WWWDIR%%/mod/embed/languages/en.php
 %%WWWDIR%%/mod/embed/manifest.xml
 %%WWWDIR%%/mod/embed/start.php
@@ -477,6 +502,7 @@
 %%WWWDIR%%/mod/groups/views/default/river/object/groupforumtopic/create.php
 %%WWWDIR%%/mod/groups/views/default/river/object/groupforumtopic/update.php
 %%WWWDIR%%/mod/groups/views/default/river/relationship/member/create.php
+%%WWWDIR%%/mod/groups/views/default/settings/groups/edit.php
 %%WWWDIR%%/mod/groups/views/default/sharing/invite.php
 %%WWWDIR%%/mod/groups/views/default/widgets/a_users_groups/edit.php
 %%WWWDIR%%/mod/groups/views/default/widgets/a_users_groups/view.php
@@ -489,6 +515,13 @@
 %%WWWDIR%%/mod/groups/views/rss/forum/viewposts.php
 %%WWWDIR%%/mod/groups/views/rss/groups/contentwrapper.php
 %%WWWDIR%%/mod/groups/views/rss/groups/profileitems.php
+%%WWWDIR%%/mod/htmlawed/vendors/htmLawed/htmLawed.php
+%%WWWDIR%%/mod/htmlawed/vendors/htmLawed/htmLawedTest.php
+%%WWWDIR%%/mod/htmlawed/vendors/htmLawed/htmLawed_README.htm
+%%WWWDIR%%/mod/htmlawed/vendors/htmLawed/htmLawed_README.txt
+%%WWWDIR%%/mod/htmlawed/vendors/htmLawed/htmLawed_TESTCASE.txt
+%%WWWDIR%%/mod/htmlawed/manifest.xml
+%%WWWDIR%%/mod/htmlawed/start.php
 %%WWWDIR%%/mod/invitefriends/actions/invite.php
 %%WWWDIR%%/mod/invitefriends/index.php
 %%WWWDIR%%/mod/invitefriends/languages/en.php
@@ -687,8 +720,8 @@
 %%WWWDIR%%/mod/profile/views/default/icon/user/default/small.php
 %%WWWDIR%%/mod/profile/views/default/icon/user/default/tiny.php
 %%WWWDIR%%/mod/profile/views/default/icon/user/default/topbar.php
-%%WWWDIR%%/mod/profile/views/default/js/jquery.imgareaselect-0.4.2.js
-%%WWWDIR%%/mod/profile/views/default/js/jquery.imgareaselect-0.4.2.min.js
+%%WWWDIR%%/mod/profile/views/default/js/jquery.imgareaselect-0.8.js
+%%WWWDIR%%/mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js
 %%WWWDIR%%/mod/profile/views/default/profile/css.php
 %%WWWDIR%%/mod/profile/views/default/profile/edit.php
 %%WWWDIR%%/mod/profile/views/default/profile/editdefaultprofile.php
@@ -745,6 +778,7 @@
 %%WWWDIR%%/mod/thewire/add.php
 %%WWWDIR%%/mod/thewire/everyone.php
 %%WWWDIR%%/mod/thewire/graphics/thewire_speech_bubble.gif
+%%WWWDIR%%/mod/thewire/graphics/river_icon_thewire.gif
 %%WWWDIR%%/mod/thewire/index.php
 %%WWWDIR%%/mod/thewire/languages/en.php
 %%WWWDIR%%/mod/thewire/manifest.xml
@@ -1039,6 +1073,7 @@
 %%WWWDIR%%/mod/zaudio/views/default/file/specialcontent/audio/mp3.php
 %%WWWDIR%%/mod/zaudio/views/default/file/specialcontent/audio/mpeg.php
 %%WWWDIR%%/search/index.php
+%%WWWDIR%%/search/groups.php
 %%WWWDIR%%/search/users.php
 %%WWWDIR%%/services/api/rest.php
 %%WWWDIR%%/services/export/handler.php
@@ -1049,28 +1084,16 @@
 %%WWWDIR%%/simplecache/view.php
 %%WWWDIR%%/upgrade.php
 %%WWWDIR%%/vendors/calendarpopup/CalendarPopup.js
-%%WWWDIR%%/vendors/jquery/jquery-1.2.6.pack.js
-%%WWWDIR%%/vendors/jquery/jquery-ui-personalized-1.5.3.packed.js
 %%WWWDIR%%/vendors/jquery/jquery.easing.1.3.packed.js
-%%WWWDIR%%/vendors/kses/AUTHORS
-%%WWWDIR%%/vendors/kses/COPYING
-%%WWWDIR%%/vendors/kses/ChangeLog
-%%WWWDIR%%/vendors/kses/README
-%%WWWDIR%%/vendors/kses/TODO
-%%WWWDIR%%/vendors/kses/docs/attribute-value-checks
-%%WWWDIR%%/vendors/kses/docs/hooks
-%%WWWDIR%%/vendors/kses/docs/stripping-everything
-%%WWWDIR%%/vendors/kses/docs/supported-formats
-%%WWWDIR%%/vendors/kses/docs/whitelisted-url-protocols
-%%WWWDIR%%/vendors/kses/examples/filter.php
-%%WWWDIR%%/vendors/kses/examples/test.php
-%%WWWDIR%%/vendors/kses/kses.php
-%%WWWDIR%%/vendors/kses/oop/oop.kses.changelog.txt
-%%WWWDIR%%/vendors/kses/oop/oop.simple.api.txt
-%%WWWDIR%%/vendors/kses/oop/php4.class.kses.php
-%%WWWDIR%%/vendors/kses/oop/php5.class.kses.php
-%%WWWDIR%%/vendors/kses/oop/test.oop.kses.php
+%%WWWDIR%%/vendors/jquery/jquery-1.3.2.min.js
+%%WWWDIR%%/vendors/jquery/jquery-ui-1.7.2.custom.min.js
+%%WWWDIR%%/vendors/jquery/jquery.form.js
 %%WWWDIR%%/version.php
+%%WWWDIR%%/views/ical/canvas/default.php
+%%WWWDIR%%/views/ical/export/entity.php
+%%WWWDIR%%/views/ical/object/default.php
+%%WWWDIR%%/views/ical/pageshells/pageshell.php
+%%WWWDIR%%/views/ical/search/entity_list.php
 %%WWWDIR%%/views/default/account/forms/forgotten_password.php
 %%WWWDIR%%/views/default/account/forms/login.php
 %%WWWDIR%%/views/default/account/forms/register.php
@@ -1124,9 +1147,12 @@
 %%WWWDIR%%/views/default/friends/tablelistcountupdate.php
 %%WWWDIR%%/views/default/graphics/icon.php
 %%WWWDIR%%/views/default/group/default.php
+%%WWWDIR%%/views/default/group/search/finishblurb.php
+%%WWWDIR%%/views/default/group/search/startblurb.php
 %%WWWDIR%%/views/default/input/access.php
 %%WWWDIR%%/views/default/input/button.php
 %%WWWDIR%%/views/default/input/calendar.php
+%%WWWDIR%%/views/default/input/captcha.php
 %%WWWDIR%%/views/default/input/checkboxes.php
 %%WWWDIR%%/views/default/input/email.php
 %%WWWDIR%%/views/default/input/file.php
@@ -1138,12 +1164,15 @@
 %%WWWDIR%%/views/default/input/pulldown.php
 %%WWWDIR%%/views/default/input/radio.php
 %%WWWDIR%%/views/default/input/reset.php
+%%WWWDIR%%/views/default/input/securitytoken.php
 %%WWWDIR%%/views/default/input/submit.php
 %%WWWDIR%%/views/default/input/tags.php
 %%WWWDIR%%/views/default/input/text.php
 %%WWWDIR%%/views/default/input/url.php
+%%WWWDIR%%/views/default/input/urlshortener.php
 %%WWWDIR%%/views/default/js/friendsPickerv1.php
 %%WWWDIR%%/views/default/js/initialise_elgg.php
+%%WWWDIR%%/views/default/js/upload_js.php
 %%WWWDIR%%/views/default/messages/errors/error.php
 %%WWWDIR%%/views/default/messages/errors/list.php
 %%WWWDIR%%/views/default/messages/exceptions/exception.php
@@ -1199,6 +1228,7 @@
 %%WWWDIR%%/views/default/text/about.php
 %%WWWDIR%%/views/default/text/privacy_view.php
 %%WWWDIR%%/views/default/text/tos_view.php
+%%WWWDIR%%/views/default/upload/upload_form_content.php
 %%WWWDIR%%/views/default/user/default.php
 %%WWWDIR%%/views/default/user/search/finishblurb.php
 %%WWWDIR%%/views/default/user/search/startblurb.php
@@ -1370,6 +1400,14 @@
 @dirrm %%WWWDIR%%/mod/bookmarks/views/rss
 @dirrm %%WWWDIR%%/mod/bookmarks/views
 @dirrm %%WWWDIR%%/mod/bookmarks
+@dirrm %%WWWDIR%%/mod/captcha/views/default/input
+@dirrm %%WWWDIR%%/mod/captcha/views/default/captcha
+@dirrm %%WWWDIR%%/mod/captcha/views/default
+@dirrm %%WWWDIR%%/mod/captcha/views
+@dirrm %%WWWDIR%%/mod/captcha/languages
+@dirrm %%WWWDIR%%/mod/captcha/fonts
+@dirrm %%WWWDIR%%/mod/captcha/backgrounds
+@dirrm %%WWWDIR%%/mod/captcha
 @dirrm %%WWWDIR%%/mod/categories/actions
 @dirrm %%WWWDIR%%/mod/categories/languages
 @dirrm %%WWWDIR%%/mod/categories/views/default/categories
@@ -1479,6 +1517,8 @@
 @dirrm %%WWWDIR%%/mod/groups/views/default/river/relationship/member
 @dirrm %%WWWDIR%%/mod/groups/views/default/river/relationship
 @dirrm %%WWWDIR%%/mod/groups/views/default/river
+@dirrm %%WWWDIR%%/mod/groups/views/default/settings/groups
+@dirrm %%WWWDIR%%/mod/groups/views/default/settings
 @dirrm %%WWWDIR%%/mod/groups/views/default/sharing
 @dirrm %%WWWDIR%%/mod/groups/views/default/widgets/a_users_groups
 @dirrm %%WWWDIR%%/mod/groups/views/default/widgets/group_entities_widget
@@ -1490,6 +1530,9 @@
 @dirrm %%WWWDIR%%/mod/groups/views/rss
 @dirrm %%WWWDIR%%/mod/groups/views
 @dirrm %%WWWDIR%%/mod/groups
+@dirrm %%WWWDIR%%/mod/htmlawed/vendors/htmLawed
+@dirrm %%WWWDIR%%/mod/htmlawed/vendors
+@dirrm %%WWWDIR%%/mod/htmlawed
 @dirrm %%WWWDIR%%/mod/invitefriends/actions
 @dirrm %%WWWDIR%%/mod/invitefriends/languages
 @dirrm %%WWWDIR%%/mod/invitefriends/views/default/invitefriends
@@ -1770,11 +1813,13 @@
 @dirrm %%WWWDIR%%/simplecache
 @dirrm %%WWWDIR%%/vendors/calendarpopup
 @dirrm %%WWWDIR%%/vendors/jquery
-@dirrm %%WWWDIR%%/vendors/kses/docs
-@dirrm %%WWWDIR%%/vendors/kses/examples
-@dirrm %%WWWDIR%%/vendors/kses/oop
-@dirrm %%WWWDIR%%/vendors/kses
 @dirrm %%WWWDIR%%/vendors
+@dirrm %%WWWDIR%%/views/ical/canvas
+@dirrm %%WWWDIR%%/views/ical/export
+@dirrm %%WWWDIR%%/views/ical/object
+@dirrm %%WWWDIR%%/views/ical/pageshells
+@dirrm %%WWWDIR%%/views/ical/search
+@dirrm %%WWWDIR%%/views/ical
 @dirrm %%WWWDIR%%/views/default/account/forms
 @dirrm %%WWWDIR%%/views/default/account
 @dirrm %%WWWDIR%%/views/default/admin/main_opt
@@ -1798,6 +1843,7 @@
 @dirrm %%WWWDIR%%/views/default/friends/river
 @dirrm %%WWWDIR%%/views/default/friends
 @dirrm %%WWWDIR%%/views/default/graphics
+@dirrm %%WWWDIR%%/views/default/group/search
 @dirrm %%WWWDIR%%/views/default/group
 @dirrm %%WWWDIR%%/views/default/input
 @dirrm %%WWWDIR%%/views/default/js
@@ -1821,6 +1867,7 @@
 @dirrm %%WWWDIR%%/views/default/site
 @dirrm %%WWWDIR%%/views/default/spotlight
 @dirrm %%WWWDIR%%/views/default/text
+@dirrm %%WWWDIR%%/views/default/upload
 @dirrm %%WWWDIR%%/views/default/user/search
 @dirrm %%WWWDIR%%/views/default/user/settings
 @dirrm %%WWWDIR%%/views/default/user