diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index 28afc449542e..048b1ce985ee 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,156 +1,155 @@ # New ports collection makefile for: roundcube # Date created: Oct 21 2005 # Whom: Florent Thoumie # # $FreeBSD$ # PORTNAME= roundcube -DISTVERSION= 0.4-beta +DISTVERSION= 0.4 PORTEPOCH= 1 CATEGORIES?= mail www -MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail-beta/${DISTVERSION} +MASTER_SITES= SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION} DISTNAME= ${PORTNAME}mail-${DISTVERSION} MAINTAINER?= ale@FreeBSD.org COMMENT= Fully skinnable XHTML/CSS webmail written in PHP NO_BUILD= yes CONFLICTS= ja-roundcube-[0-9]* -RCUBECOMP= SQL bin config index.php logs plugins program robots.txt skins temp +RCUBECOMP= SQL config index.php logs plugins program robots.txt skins temp PORTDOCS= CHANGELOG INSTALL LICENSE README UPGRADING SCRIPTS_ENV= SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \ WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} \ WWWDIR=${WWWDIR} WANT_PHP_WEB= yes USE_PHP= pcre mbstring session iconv dom xml json IGNORE_WITH_PHP=4 SUB_FILES= pkg-install PKGDEINSTALL= ${PKGINSTALL} 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= MYSQL "Use MySQL backend" on \ PGSQL "Use PostgreSQL backend" off \ SQLITE "Use SQLite backend" 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 \ AUTOCOMP "Enable autocomplete in login form" off .include .if defined(WITHOUT_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE) IGNORE= needs a database backend .endif .if !defined(WITHOUT_MYSQL) USE_PHP+= mysql .endif .if defined(WITH_PGSQL) USE_PHP+= pgsql .endif .if defined(WITH_SQLITE) USE_PHP+= sqlite .endif .if defined(WITH_SSL) USE_PHP+= openssl .endif .if defined(WITH_LDAP) USE_PHP+= ldap .endif .if defined(WITH_PSPELL) || defined(WITH_NSC) USE_PHP+= pspell .endif .if defined(WITH_NSC) RCUBECOMP+= spellchecker.php USE_PHP+= simplexml PLIST_SUB+= SPELLCHECK="" .else PLIST_SUB+= SPELLCHECK="@comment " .endif .if defined(WITH_NSC) post-extract: @${CP} ${FILESDIR}/spellchecker.php ${WRKSRC} .endif post-patch: - @${RM} ${WRKSRC}/bin/*.sh @${FIND} ${WRKSRC} -name \*.orig -type f -delete .if defined(WITH_AUTOCOMP) @${REINPLACE_CMD} "s/ autocomplete=\"off\"//g" \ ${WRKSRC}/skins/default/templates/login.html .endif .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 @${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_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.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} .for i in ${RCUBECOMP} @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR} .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for i in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/ .endfor .endif @(cd ${WRKSRC}; ${FIND} ${RCUBECOMP} -not -type d) | ${SORT} | \ ${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST} @(cd ${WRKSRC}; ${FIND} ${RCUBECOMP} -type d) | ${SORT} -r | \ ${SED} -ne 's,^,@dirrm ${WWWDIR_REL}/,p' >> ${TMPPLIST} @${ECHO_CMD} '@dirrm ${WWWDIR_REL}' >> ${TMPPLIST} post-install: @${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include diff --git a/mail/roundcube/distinfo b/mail/roundcube/distinfo index c57f2bca745a..654f296ef2c3 100644 --- a/mail/roundcube/distinfo +++ b/mail/roundcube/distinfo @@ -1,3 +1,3 @@ -MD5 (roundcubemail-0.4-beta.tar.gz) = ccbae69017c6d0056b12536e5adc52cd -SHA256 (roundcubemail-0.4-beta.tar.gz) = cf9cbaccd09cb164e85a889d929f07fe37b7d5d10a3cad021e0d9ffb5b728941 -SIZE (roundcubemail-0.4-beta.tar.gz) = 2033675 +MD5 (roundcubemail-0.4.tar.gz) = 6e5d2313087ce1e1209eb0f4fd71beab +SHA256 (roundcubemail-0.4.tar.gz) = 1da2a57f0fa866cabc179d01c2a29c80dcf6108d45e415210129ef90ff8b2c1c +SIZE (roundcubemail-0.4.tar.gz) = 2159645 diff --git a/mail/roundcube/files/patch-program_include_rcube_message.php b/mail/roundcube/files/patch-program_include_rcube_message.php index cec05f069708..952a0911b58e 100644 --- a/mail/roundcube/files/patch-program_include_rcube_message.php +++ b/mail/roundcube/files/patch-program_include_rcube_message.php @@ -1,11 +1,11 @@ ---- program/include/rcube_message.php.orig 2009-08-27 10:08:27.000000000 +0200 -+++ program/include/rcube_message.php 2009-09-07 17:47:43.000000000 +0200 -@@ -384,7 +384,7 @@ - - // part is a file/attachment - else if (preg_match('/^(inline|attach)/', $mail_part->disposition) || -- $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) { -+ $mail_part->headers['content-id'] || $mail_part->filename) { - - // skip apple resource forks - if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') +--- program/include/rcube_message.php.orig 2010-08-06 15:22:20.000000000 +0200 ++++ program/include/rcube_message.php 2010-08-24 12:42:33.000000000 +0200 +@@ -427,7 +427,7 @@ + } + // part is a file/attachment + else if (preg_match('/^(inline|attach)/', $mail_part->disposition) || +- $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename) ++ $mail_part->headers['content-id'] || $mail_part->filename + ) { + // skip apple resource forks + if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')