5 files changed, 61 insertions, 102 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 1010e6fa0f63..f3299c2ec0af 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	roundcube
-DISTVERSION=	0.7.2
+DISTVERSION=	0.8.0
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U}
@@ -15,13 +15,13 @@ DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 MAINTAINER?=	ale@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
 
 NO_BUILD=	yes
 CONFLICTS=	ja-roundcube-[0-9]*
 
 RCUBECOMP=	.htaccess SQL config index.php installer logs plugins program robots.txt skins temp
-PORTDOCS=	CHANGELOG INSTALL README UPGRADING
+PORTDOCS=	CHANGELOG INSTALL README.md UPGRADING
 
 SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \
@@ -31,53 +31,51 @@ WANT_PHP_WEB=	yes
 USE_PHP=	pcre mbstring session iconv dom xml json intl
 IGNORE_WITH_PHP=4
 
-REINPLACE_ARGS=	-i ""
-.if defined(WITH_REPLACE_MAIL_URL) && !empty(WITH_REPLACE_MAIL_URL)
-MAIL=		${WITH_REPLACE_MAIL_URL}
-.else
-MAIL=		mail
-.endif
-PLIST_SUB+=	MAIL=${MAIL}
+OPTIONS_DEFINE=	SSL LDAP GD PSPELL NSC
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=MYSQL
 
-OPTIONS=	MYSQL "Use MySQL backend" on \
-		PGSQL "Use PostgreSQL backend" off \
-		SQLITE "Use SQLite backend (needs PHP 5.3 or below)" off \
-		SSL "Enable SSL support (imaps or google spellcheck)" off \
-		LDAP "Enable LDAP support (address book)" off \
-		PSPELL "Enable PSpell support (internal spellcheck)" off \
-		NSC "Install network spellchecker" off
+MYSQL_DESC=	Use MySQL backend
+PGSQL_DESC=	Use PostgreSQL backend
+SQLITE_DESC=	Use SQLite backend (needs PHP 5.3 or below)
+SSL_DESC=	Enable SSL support (imaps or google spellcheck)
+LDAP_DESC=	Enable LDAP support (address book)
+GD_DESC=	Enable GD support (image convertion)
+PSPELL_DESC=	Enable PSpell support (internal spellcheck)
+NSC_DESC=	Install network spellchecker
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE)
-IGNORE=		needs a database backend
-.endif
-
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_PHP+=	mysql
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pgsql
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_PHP+=	sqlite
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 USE_PHP+=	openssl
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
 
-.if defined(WITH_PSPELL) || defined(WITH_NSC)
+.if ${PORT_OPTIONS:MGD}
+USE_PHP+=	gd
+.endif
+
+.if ${PORT_OPTIONS:MPSPELL} || ${PORT_OPTIONS:MNSC}
 USE_PHP+=	pspell
 .endif
 
-.if defined(WITH_NSC)
+.if ${PORT_OPTIONS:MNSC}
 RCUBECOMP+=	spellchecker.php
 USE_PHP+=	simplexml
 PLIST_SUB+=	SPELLCHECK=""
@@ -85,52 +83,13 @@ PLIST_SUB+=	SPELLCHECK=""
 PLIST_SUB+=	SPELLCHECK="@comment "
 .endif
 
-.if defined(WITH_NSC)
+.if ${PORT_OPTIONS:MNSC}
 post-extract:
 	@${CP} ${FILESDIR}/spellchecker.php ${WRKSRC}
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
-.if defined(WITH_REPLACE_MAIL_URL)
-	@${REINPLACE_CMD} "s/'mail'/'${MAIL}'/g" ${WRKSRC}/index.php \
-		${WRKSRC}/plugins/*/*.php \
-		${WRKSRC}/program/include/rcmail.php \
-		${WRKSRC}/program/js/editor.js \
-		${WRKSRC}/program/localization/*/labels.inc \
-		${WRKSRC}/program/steps/addressbook/mailto.inc \
-		${WRKSRC}/skins/default/functions.js \
-		${WRKSRC}/skins/default/includes/links.html
-	@${REINPLACE_CMD} "s/'mail|/'${MAIL}|/g" ${WRKSRC}/plugins/*/*.php
-	@${REINPLACE_CMD} "s/|mail'/|${MAIL}'/g" ${WRKSRC}/plugins/*/*.php
-	@${REINPLACE_CMD} "s/_task=mail/_task=${MAIL}/g" \
-		${WRKSRC}/program/js/app.js
-	@${REINPLACE_CMD} "s/\"mail\"/\"${MAIL}\"/g" \
-		${WRKSRC}/program/js/app.js \
-		${WRKSRC}/skins/default/includes/taskbar.html
-	@${REINPLACE_CMD} "s/\"mail\//\"${MAIL}\//g" \
-		${WRKSRC}/program/js/app.js
-	@${REINPLACE_CMD} "s/mail_footer/${MAIL}_footer/g" \
-		${WRKSRC}/skins/default/*.css \
-		${WRKSRC}/skins/default/templates/login.html
-	@${REINPLACE_CMD} "s/mail_toolbar/${MAIL}_toolbar/g" \
-		${WRKSRC}/skins/default/*.css \
-		${WRKSRC}/skins/default/templates/login.html
-	@${MV} ${WRKSRC}/program/steps/mail \
-		${WRKSRC}/program/steps/${MAIL}
-	@${MV} ${WRKSRC}/skins/default/images/mail_footer.gif \
-		${WRKSRC}/skins/default/images/${MAIL}_footer.gif
-	@${MV} ${WRKSRC}/skins/default/images/mail_footer.png \
-		${WRKSRC}/skins/default/images/${MAIL}_footer.png
-	@${MV} ${WRKSRC}/skins/default/images/mail_toolbar.gif \
-		${WRKSRC}/skins/default/images/${MAIL}_toolbar.gif
-	@${MV} ${WRKSRC}/skins/default/images/mail_toolbar.png \
-		${WRKSRC}/skins/default/images/${MAIL}_toolbar.png
-	@${MV} ${WRKSRC}/skins/default/mail.css \
-		${WRKSRC}/skins/default/${MAIL}.css
-	@${MV} ${WRKSRC}/skins/default/templates/mail.html \
-		${WRKSRC}/skins/default/templates/${MAIL}.html
-.endif
 
 do-install:
 	-${MKDIR} ${WWWDIR}
@@ -139,7 +98,7 @@ do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
 .endfor
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/logs ${WWWDIR}/temp
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo
index a9e5f88097da..960f10a39019 100644
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roundcubemail-0.7.2.tar.gz) = a29e4aded3a3b01b763e60443f5afb4cb2969365532762f4436793e8b98cea17
-SIZE (roundcubemail-0.7.2.tar.gz) = 2714219
+SHA256 (roundcubemail-0.8.0.tar.gz) = 1b9d916f393127d17c6ce379f3dcda5af64318162de4d44cb44627333c7c8e73
+SIZE (roundcubemail-0.8.0.tar.gz) = 3710405
diff --git a/mail/roundcube/files/patch-installer_check.php b/mail/roundcube/files/patch-installer_check.php
index 8aa157c9cda2..6ccab3db1921 100644
--- a/mail/roundcube/files/patch-installer_check.php
+++ b/mail/roundcube/files/patch-installer_check.php
@@ -1,10 +1,10 @@
---- installer/check.php.orig	2010-12-13 17:38:24.000000000 +0100
-+++ installer/check.php	2010-12-13 17:38:36.000000000 +0100
-@@ -37,7 +37,6 @@
+--- installer/check.php.orig	2012-08-06 18:18:13.000000000 +0200
++++ installer/check.php	2012-08-13 12:36:52.000000000 +0200
+@@ -39,7 +39,6 @@
      'session.auto_start'            => 0,
      'zend.ze1_compatibility_mode'   => 0,
      'mbstring.func_overload'        => 0,
 -    'suhosin.session.encrypt'       => 0,
+     'magic_quotes_runtime'          => 0,
+     'magic_quotes_sybase'           => 0,
  );
- 
- $optional_checks = array(
diff --git a/mail/roundcube/files/patch-program_include_iniset.php b/mail/roundcube/files/patch-program_include_iniset.php
index 1a3cde97ce66..aab818353fee 100644
--- a/mail/roundcube/files/patch-program_include_iniset.php
+++ b/mail/roundcube/files/patch-program_include_iniset.php
@@ -1,10 +1,10 @@
---- program/include/iniset.php.orig	2010-04-26 15:54:45.000000000 +0200
-+++ program/include/iniset.php	2010-04-26 15:54:53.000000000 +0200
-@@ -25,7 +25,6 @@
- // an error/warning in the logs later. See (#1486307).
- $crit_opts = array(
-     'mbstring.func_overload' => 0,
+--- program/include/iniset.php.orig	2012-08-06 18:18:13.000000000 +0200
++++ program/include/iniset.php	2012-08-13 12:37:50.000000000 +0200
+@@ -29,7 +29,6 @@
+     // critical PHP settings here. Only these, which doesn't provide
+     // an error/warning in the logs later. See (#1486307).
+     'mbstring.func_overload'  => 0,
 -    'suhosin.session.encrypt' => 0,
-     'session.auto_start' => 0,
-     'file_uploads' => 1,
- );
+     'session.auto_start'      => 0,
+     'file_uploads'            => 1,
+     'magic_quotes_runtime'    => 0,
diff --git a/mail/roundcube/files/patch-program_include_rcube_session.php b/mail/roundcube/files/patch-program_include_rcube_session.php
index 3393c95653c2..6797dfebd9c7 100644
--- a/mail/roundcube/files/patch-program_include_rcube_session.php
+++ b/mail/roundcube/files/patch-program_include_rcube_session.php
@@ -1,14 +1,14 @@
---- program/include/rcube_session.php.orig	2011-10-07 08:21:40.000000000 +0200
-+++ program/include/rcube_session.php	2011-10-07 08:28:55.000000000 +0200
-@@ -33,7 +33,6 @@
+--- program/include/rcube_session.php.orig	2012-08-06 18:18:13.000000000 +0200
++++ program/include/rcube_session.php	2012-08-13 12:44:54.000000000 +0200
+@@ -37,7 +37,6 @@
    private $ip;
    private $start;
    private $changed;
 -  private $unsets = array();
    private $gc_handlers = array();
    private $cookiename = 'roundcube_sessauth';
-   private $vars = false;
-@@ -132,7 +131,7 @@
+   private $vars;
+@@ -134,7 +133,7 @@
      if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
        $this->changed = strtotime($sql_arr['changed']);
        $this->ip      = $sql_arr['ip'];
@@ -16,11 +16,11 @@
 +      $this->vars    = $sql_arr['vars'];
        $this->key     = $key;
  
-       if (!empty($this->vars))
-@@ -169,13 +168,13 @@
+       return !empty($this->vars) ? (string) $this->vars : '';
+@@ -170,13 +169,13 @@
      }
  
-     if ($oldvars !== false) {
+     if ($oldvars !== null) {
 -      $newvars = $this->_fixvars($vars, $oldvars);
 +      $newvars = $vars;
  
@@ -33,7 +33,7 @@
        }
        else if ($ts - $this->changed > $this->lifetime / 2) {
          $this->db->query("UPDATE ".get_table_name('session')." SET changed=$now WHERE sess_id=?", $key);
-@@ -186,7 +185,7 @@
+@@ -187,7 +186,7 @@
          sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
            "VALUES (?, ?, ?, %s, %s)",
            get_table_name('session'), $now, $now),
@@ -42,7 +42,7 @@
      }
  
      return true;
-@@ -194,29 +193,6 @@
+@@ -195,29 +194,6 @@
  
  
    /**
@@ -50,7 +50,7 @@
 -   */
 -  private function _fixvars($vars, $oldvars)
 -  {
--    if ($oldvars !== false) {
+-    if ($oldvars !== null) {
 -      $a_oldvars = $this->unserialize($oldvars);
 -      if (is_array($a_oldvars)) {
 -        foreach ((array)$this->unsets as $k)
@@ -72,16 +72,16 @@
     * Handler for session_destroy()
     *
     * @param string Session ID
-@@ -295,7 +271,7 @@
+@@ -296,7 +272,7 @@
      else // else read data again
        $oldvars = $this->mc_read($key);
  
--    $newvars = $oldvars !== false ? $this->_fixvars($vars, $oldvars) : $vars;
+-    $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
 +    $newvars = $vars;
-     
-     if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2) {
-       $value = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars));
-@@ -386,7 +362,6 @@
+ 
+     if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2)
+       return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), MEMCACHE_COMPRESSED, $this->lifetime);
+@@ -376,7 +352,6 @@
      if (empty($var))
        return $this->destroy(session_id());