- Update to 2.0.9

PR:		ports/69042
Submitted by:	Xin LI <delphij@frontfree.net>
Approved by:	maintainer

4 files changed, 10 insertions, 113 deletions

diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index 279fc1018614..4417796d71f8 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.8
-PORTREVISION=	3
+PORTVERSION=	2.0.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	phpBB-${PORTVERSION}a
+DISTNAME=	phpBB-${PORTVERSION}
 
-MAINTAINER=	liukang@bjpu.edu.cn
+MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	A PHP-based bulletin board / discussion forum system
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
@@ -37,6 +36,7 @@ NO_BUILD=	yes
 USE_REINPLACE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+PLIST_SUB+=	PHPBB_VER=${PORTVERSION:S/.//g}
 
 # Set custom variables:
 #
@@ -61,6 +61,7 @@ pre-everything::
 post-patch:
 	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \
 	  ${WRKSRC}/docs/*.html
+	@${RM} -f `${FIND} ${WRKSRC} -name '*.orig'`
 
 post-configure:
 	@ ${SED} \
diff --git a/www/phpbb/distinfo b/www/phpbb/distinfo
index e2f7b0a1cd95..ba04f844b8d4 100644
--- a/www/phpbb/distinfo
+++ b/www/phpbb/distinfo
@@ -1,2 +1,2 @@
-MD5 (phpBB-2.0.8a.tar.bz2) = 44d33a5851800f8f278d3c100fb2fcb3
-SIZE (phpBB-2.0.8a.tar.bz2) = 457308
+MD5 (phpBB-2.0.9.tar.bz2) = 2b6b5814c62acea8078d99378a0a11b4
+SIZE (phpBB-2.0.9.tar.bz2) = 452079
diff --git a/www/phpbb/files/patch-common.php b/www/phpbb/files/patch-common.php
deleted file mode 100644
index a796174c73ee..000000000000
--- a/www/phpbb/files/patch-common.php
+++ /dev/null
@@ -1,104 +0,0 @@
---- common.php:1.74.2.10	Wed Jun  4 10:41:39 2003
-+++ common.php	Wed Apr 21 05:18:02 2004
-@@ -6,8 +6,7 @@
-  *   copyright            : (C) 2001 The phpBB Group
-  *   email                : support@phpbb.com
-  *
-- *   $Id: common.php,v 1.74.2.10 2003/06/04 17:41:39 acydburn Exp $
-- *
-+ *   $Id: common.php,v 1.74.2.11 2004/04/21 12:18:02 psotfx Exp $
-  *
-  ***************************************************************************/
- 
-@@ -25,9 +24,44 @@
- 	die("Hacking attempt");
- }
- 
-+//
-+function unset_vars(&$var)
-+{
-+	while (list($var_name, $null) = @each($var))
-+	{
-+		unset($GLOBALS[$var_name]);
-+	}
-+	return;
-+}
-+
-+//
- error_reporting  (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
- set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
- 
-+$ini_val = (@phpversion() >= '4.0.0') ? 'ini_get' : 'get_cfg_var';
-+
-+// Unset globally registered vars - PHP5 ... hhmmm
-+if (@$ini_val('register_globals') == '1' || strtolower(@$ini_val('register_globals')) == 'on')
-+{
-+	$var_prefix = (phpversion() >= '4.3.0') ? '' : 'HTTP';
-+	$var_suffix = (phpversion() >= '4.3.0') ? '' : '_VARS';
-+
-+	if(is_array(${$var_prefix . '_GET' . $var_suffix}))
-+	{
-+		unset_vars(${$var_prefix . '_GET' . $var_suffix});
-+	}
-+
-+	if(is_array(${$var_prefix . '_POST' . $var_suffix}))
-+	{
-+		unset_vars(${$var_prefix . '_POST' . $var_suffix});
-+	}
-+
-+	if(is_array(${$var_prefix . '_COOKIE' . $var_suffix}))
-+	{
-+		unset_vars(${$var_prefix . '_COOKIE' . $var_suffix});
-+	}
-+}
-+
- //
- // addslashes to vars if magic_quotes_gpc is off
- // this is a security precaution to prevent someone
-@@ -106,6 +140,7 @@
- $theme = array();
- $images = array();
- $lang = array();
-+$nav_links = array();
- $gen_simple_header = FALSE;
- 
- include($phpbb_root_path . 'config.'.$phpEx);
-@@ -126,32 +161,12 @@
- //
- // Obtain and encode users IP
- //
--if( getenv('HTTP_X_FORWARDED_FOR') != '' )
--{
--	$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
--
--	$entries = explode(',', getenv('HTTP_X_FORWARDED_FOR'));
--	reset($entries);
--	while (list(, $entry) = each($entries)) 
--	{
--		$entry = trim($entry);
--		if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $entry, $ip_list) )
--		{
--			$private_ip = array('/^0\./', '/^127\.0\.0\.1/', '/^192\.168\..*/', '/^172\.((1[6-9])|(2[0-9])|(3[0-1]))\..*/', '/^10\..*/', '/^224\..*/', '/^240\..*/');
--			$found_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
--
--			if ($client_ip != $found_ip)
--			{
--				$client_ip = $found_ip;
--				break;
--			}
--		}
--	}
--}
--else
--{
--	$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
--}
-+// I'm removing HTTP_X_FORWARDED_FOR ... this may well cause other problems such as
-+// private range IP's appearing instead of the guilty routable IP, tough, don't
-+// even bother complaining ... go scream and shout at the idiots out there who feel
-+// "clever" is doing harm rather than good ... karma is a great thing ... :)
-+//
-+$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR );
- $user_ip = encode_ip($client_ip);
- 
- //
diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist
index 61817a60d9a6..3b56ec451c20 100644
--- a/www/phpbb/pkg-plist
+++ b/www/phpbb/pkg-plist
@@ -11,9 +11,9 @@ share/phpbb/contrib/dbinformer.php
 share/phpbb/contrib/fixfiles.sh
 share/phpbb/contrib/template_db_cache.php
 share/phpbb/contrib/template_file_cache.php
-share/phpbb/contrib/visual_confirmation.zip
+share/phpbb/contrib/visual_confirmation.tar.bz2
 share/phpbb/install.php
-share/phpbb/update_to_208.php
+share/phpbb/update_to_%%PHPBB_VER%%.php
 share/phpbb/upgrade.php
 %%PHPBBDIR%%/admin/admin_board.php
 %%PHPBBDIR%%/admin/admin_db_utilities.php
@@ -113,7 +113,7 @@ share/phpbb/upgrade.php
 %%PHPBBDIR%%/install/schemas/mysql_schema.sql
 %%PHPBBDIR%%/install/schemas/postgres_basic.sql
 %%PHPBBDIR%%/install/schemas/postgres_schema.sql
-%%PHPBBDIR%%/install/update_to_208.php
+%%PHPBBDIR%%/install/update_to_%%PHPBB_VER%%.php
 %%PHPBBDIR%%/install/upgrade.php
 %%PHPBBDIR%%/language/index.htm
 %%PHPBBDIR%%/language/lang_english/email/admin_activate.tpl