4 files changed, 12 insertions, 28 deletions

diff --git a/www/campsite/Makefile b/www/campsite/Makefile
index de0097474578..6294561e9626 100644
--- a/www/campsite/Makefile
+++ b/www/campsite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	campsite
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/campsite/distinfo b/www/campsite/distinfo
index 7309b86c76b2..0db857c2dd4e 100644
--- a/www/campsite/distinfo
+++ b/www/campsite/distinfo
@@ -1,3 +1,3 @@
-MD5 (campsite-2.6.1.tar.gz) = 78235fcf34d3d2be58d3f03b80af298d
-SHA256 (campsite-2.6.1.tar.gz) = 0aa4bc8a217176cabe0919d3d1d3c9109f378204f1b1fbf9dbfcbce6e8b437a2
-SIZE (campsite-2.6.1.tar.gz) = 4412045
+MD5 (campsite-2.6.2.tar.gz) = 0112a951a8bf5938371d66c34a098b58
+SHA256 (campsite-2.6.2.tar.gz) = 43b192bebe9ee3a8c2b18e224020f4806586c90baeef84bf365539d30baf6fa4
+SIZE (campsite-2.6.2.tar.gz) = 4414833
diff --git a/www/campsite/files/patch-campsite-remove-instance.php b/www/campsite/files/patch-campsite-remove-instance.php
deleted file mode 100644
index 1a5e7aa9d6e2..000000000000
--- a/www/campsite/files/patch-campsite-remove-instance.php
+++ /dev/null
@@ -1,24 +0,0 @@
---- implementation/utils/campsite-remove-instance.php.orig	Wed Jul 12 21:49:26 2006
-+++ implementation/utils/campsite-remove-instance.php	Thu Jul 13 09:17:11 2006
-@@ -10,6 +10,11 @@
- $arg3 = isset($GLOBALS['argv'][3]) ? trim($GLOBALS['argv'][3]) : "";
- $no_backup = $arg3 == '--no_backup';
- 
-+// include install_conf.php file
-+require_once("$etc_dir/install_conf.php");
-+require_once($Campsite['BIN_DIR'] . "/cli_script_lib.php");
-+
-+
- if ($etc_dir == "") {
- 	die("Please supply the configuration directory as the first argument.\n");
- }
-@@ -21,9 +26,6 @@
- 	exit(1);
- }
- 
--// include install_conf.php file
--require_once("$etc_dir/install_conf.php");
--require_once($Campsite['BIN_DIR'] . "/cli_script_lib.php");
- 
- if (!$no_backup) {
- 	// backup instance
diff --git a/www/campsite/pkg-plist b/www/campsite/pkg-plist
index fc802f3c2036..9b0be4613fb6 100644
--- a/www/campsite/pkg-plist
+++ b/www/campsite/pkg-plist
@@ -39,6 +39,9 @@ campsite/instance/database/upgrade/2.5.x/upgrade_article_types.php
 campsite/instance/database/upgrade/2.5.x/upgrade_user_perms.php
 campsite/instance/database/upgrade/2.6.0/data-required.sql
 campsite/instance/database/upgrade/2.6.0/tables.sql
+campsite/instance/database/upgrade/2.6.1/data-required.sql
+campsite/instance/database/upgrade/2.6.1/tables.sql
+campsite/instance/database/upgrade/2.6.1/upgrade_phorum_users.php
 campsite/sbin/campsite_autopublish
 campsite/sbin/campsite_autopublish.php
 campsite/sbin/campsite_config
@@ -68,6 +71,7 @@ campsite/www-common/html/classes/DatabaseObject.php
 campsite/www-common/html/classes/DbObjectArray.php
 campsite/www-common/html/classes/DynMenuItem.php
 campsite/www-common/html/classes/Event.php
+campsite/www-common/html/classes/FileTextSearch.php
 campsite/www-common/html/classes/IPAccess.php
 campsite/www-common/html/classes/Image.php
 campsite/www-common/html/classes/ImageSearch.php
@@ -396,6 +400,7 @@ campsite/www-common/html/include/captcha/fonts/VeraSeBd.ttf
 campsite/www-common/html/include/captcha/fonts/local.conf
 campsite/www-common/html/include/captcha/image.php
 campsite/www-common/html/include/captcha/php-captcha.inc.php
+campsite/www-common/html/include/crypto/rc4Encrypt.php
 campsite/www-common/html/include/pear/Archive/Tar.php
 campsite/www-common/html/include/pear/Console/Getopt.php
 campsite/www-common/html/include/pear/File.php
@@ -1002,6 +1007,7 @@ campsite/www-common/html/javascript/SyntaxHighlighter/shBrushVb.js
 campsite/www-common/html/javascript/SyntaxHighlighter/shBrushXml.js
 campsite/www-common/html/javascript/SyntaxHighlighter/shCore.js
 campsite/www-common/html/javascript/campsite.js
+campsite/www-common/html/javascript/crypt.js
 campsite/www-common/html/javascript/fValidate/fValidate.basic.js
 campsite/www-common/html/javascript/fValidate/fValidate.config.js
 campsite/www-common/html/javascript/fValidate/fValidate.controls.js
@@ -2754,6 +2760,7 @@ campsite/www-common/html/priv/users/users_common.php
 @dirrm campsite/www-common/html/include/pear/Console
 @dirrm campsite/www-common/html/include/pear/Archive
 @dirrm campsite/www-common/html/include/pear
+@dirrm campsite/www-common/html/include/crypto
 @dirrm campsite/www-common/html/include/captcha/fonts
 @dirrm campsite/www-common/html/include/captcha
 @dirrm campsite/www-common/html/include/adodb/xsl
@@ -2779,6 +2786,7 @@ campsite/www-common/html/priv/users/users_common.php
 @dirrm campsite/www-common
 @dirrm campsite/www
 @dirrm campsite/sbin
+@dirrm campsite/instance/database/upgrade/2.6.1
 @dirrm campsite/instance/database/upgrade/2.6.0
 @dirrm campsite/instance/database/upgrade/2.5.x
 @dirrm campsite/instance/database/upgrade/2.4.x