From ad8c0d4ec9112aa822ea5a3632f2e23a9222db9c Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 2 Nov 2009 17:20:10 +0000 Subject: [PATCH] update to 0.3.1 --- mail/roundcubemail/Makefile | 12 +++---- mail/roundcubemail/distinfo | 10 +++--- .../patches/patch-config_main_inc_php_dist | 10 +++--- mail/roundcubemail/pkg/PLIST | 32 ++++++++----------- 4 files changed, 28 insertions(+), 36 deletions(-) diff --git a/mail/roundcubemail/Makefile b/mail/roundcubemail/Makefile index 098386df17e..e666a73aa86 100644 --- a/mail/roundcubemail/Makefile +++ b/mail/roundcubemail/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.19 2009/10/13 17:00:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.20 2009/11/02 17:20:10 sthen Exp $ COMMENT = imap4 webmail client -#DISTNAME = roundcubemail-0.3-stable -#PKGNAME = ${DISTNAME:S/-stable//} -DISTNAME = roundcubemail-0.3.0.3038 +DISTNAME = roundcubemail-0.3.1 CATEGORIES = mail www HOMEPAGE = http://www.roundcube.net/ @@ -16,9 +14,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -#MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} -# svn export -MASTER_SITES = http://spacehopper.org/mirrors/ +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} NO_BUILD = Yes NO_REGRESS = Yes @@ -35,6 +31,6 @@ do-install: cp -Rp ${WRKDIST} ${INSTDIR} mv ${INSTDIR}/config/mimetypes.php ${INSTDIR}/config/mimetypes.php.dist chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} - find ${INSTDIR} -name \*.orig -exec rm -f {} \; + find ${INSTDIR} \( -name \*.orig -or -name \*.src \) -exec rm -f {} \; .include diff --git a/mail/roundcubemail/distinfo b/mail/roundcubemail/distinfo index a0088f099ad..75f30aa9f76 100644 --- a/mail/roundcubemail/distinfo +++ b/mail/roundcubemail/distinfo @@ -1,5 +1,5 @@ -MD5 (roundcubemail-0.3.0.3038.tar.gz) = Ru3lwqaac04SjRjpOMuJXw== -RMD160 (roundcubemail-0.3.0.3038.tar.gz) = 5z2WNRxwUEBnG7Gwn1vJM5gT91o= -SHA1 (roundcubemail-0.3.0.3038.tar.gz) = mfjVjrGDZr5BKlFHVWDGAVYIsDI= -SHA256 (roundcubemail-0.3.0.3038.tar.gz) = CLY7QqtT5wLJi+TYDX1LZlSeh5Kh131jqfhZyfgqYps= -SIZE (roundcubemail-0.3.0.3038.tar.gz) = 1916055 +MD5 (roundcubemail-0.3.1.tar.gz) = NOjhh3Ln6tqHabbFwg98jg== +RMD160 (roundcubemail-0.3.1.tar.gz) = EEflCgR261Oosn3wsS6Vqxh6HEE= +SHA1 (roundcubemail-0.3.1.tar.gz) = OSe7mcICEPxTkTCGXSZU6W4tU5A= +SHA256 (roundcubemail-0.3.1.tar.gz) = eLcWDlj8NpJZHoqQlGSoWFAHaOXnp8B2tJanyvEZ3dE= +SIZE (roundcubemail-0.3.1.tar.gz) = 1917564 diff --git a/mail/roundcubemail/patches/patch-config_main_inc_php_dist b/mail/roundcubemail/patches/patch-config_main_inc_php_dist index 09bb7afdeaa..d1dba24cfac 100644 --- a/mail/roundcubemail/patches/patch-config_main_inc_php_dist +++ b/mail/roundcubemail/patches/patch-config_main_inc_php_dist @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_main_inc_php_dist,v 1.7 2009/10/13 17:00:59 sthen Exp $ ---- config/main.inc.php.dist.orig Tue Oct 13 10:40:21 2009 -+++ config/main.inc.php.dist Tue Oct 13 13:55:04 2009 -@@ -94,7 +94,7 @@ $rcmail_config['virtuser_query'] = ''; +$OpenBSD: patch-config_main_inc_php_dist,v 1.8 2009/11/02 17:20:10 sthen Exp $ +--- config/main.inc.php.dist.orig Wed Oct 21 09:47:40 2009 ++++ config/main.inc.php.dist Sat Oct 31 15:23:57 2009 +@@ -99,7 +99,7 @@ $rcmail_config['virtuser_query'] = ''; // to use SSL connection, set ssl://smtp.host.com // if left blank, the PHP mail() function is used // Use %h variable as replacement for user's IMAP hostname @@ -10,7 +10,7 @@ $OpenBSD: patch-config_main_inc_php_dist,v 1.7 2009/10/13 17:00:59 sthen Exp $ // SMTP port (default is 25; 465 for SSL) $rcmail_config['smtp_port'] = 25; -@@ -333,7 +333,7 @@ $rcmail_config['include_host_config'] = false; +@@ -338,7 +338,7 @@ $rcmail_config['include_host_config'] = false; $rcmail_config['max_pagesize'] = 200; // mime magic database diff --git a/mail/roundcubemail/pkg/PLIST b/mail/roundcubemail/pkg/PLIST index cf52d58692a..a8c6ef49819 100644 --- a/mail/roundcubemail/pkg/PLIST +++ b/mail/roundcubemail/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2009/10/13 17:00:59 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.14 2009/11/02 17:20:10 sthen Exp $ roundcubemail/ roundcubemail/.htaccess roundcubemail/CHANGELOG @@ -16,19 +16,14 @@ roundcubemail/SQL/sqlite.update.sql roundcubemail/UPGRADING roundcubemail/bin/ roundcubemail/bin/decrypt.php -roundcubemail/bin/dumpschema.php roundcubemail/bin/html2text.php @mode 600 roundcubemail/bin/killcache.php @mode -roundcubemail/bin/makedoc.sh roundcubemail/bin/modcss.php @mode 600 roundcubemail/bin/msgexport.sh roundcubemail/bin/msgimport.sh -@mode -roundcubemail/bin/quotaimg.php -@mode 600 roundcubemail/bin/update.sh @mode roundcubemail/config/ @@ -81,6 +76,7 @@ roundcubemail/plugins/archive/localization/en_US.inc roundcubemail/plugins/archive/localization/et_EE.inc roundcubemail/plugins/archive/localization/fr_FR.inc roundcubemail/plugins/archive/localization/pl_PL.inc +roundcubemail/plugins/archive/localization/ru_RU.inc roundcubemail/plugins/archive/skins/ roundcubemail/plugins/archive/skins/default/ roundcubemail/plugins/archive/skins/default/archive_act.png @@ -101,8 +97,6 @@ roundcubemail/plugins/example_addressbook/example_addressbook.php roundcubemail/plugins/example_addressbook/example_addressbook_backend.php roundcubemail/plugins/filesystem_attachments/ roundcubemail/plugins/filesystem_attachments/filesystem_attachments.php -roundcubemail/plugins/force_https/ -roundcubemail/plugins/force_https/force_https.php roundcubemail/plugins/help/ roundcubemail/plugins/help/config.inc.php.dist @sample roundcubemail/plugins/help/config.inc.php @@ -139,6 +133,7 @@ roundcubemail/plugins/managesieve/localization/bg_BG.inc roundcubemail/plugins/managesieve/localization/cs_CZ.inc roundcubemail/plugins/managesieve/localization/de_CH.inc roundcubemail/plugins/managesieve/localization/de_DE.inc +roundcubemail/plugins/managesieve/localization/el_GR.inc roundcubemail/plugins/managesieve/localization/en_GB.inc roundcubemail/plugins/managesieve/localization/en_US.inc roundcubemail/plugins/managesieve/localization/es_ES.inc @@ -181,6 +176,7 @@ roundcubemail/plugins/markasjunk/localization/cs_CZ.inc roundcubemail/plugins/markasjunk/localization/en_US.inc roundcubemail/plugins/markasjunk/localization/et_EE.inc roundcubemail/plugins/markasjunk/localization/pl_PL.inc +roundcubemail/plugins/markasjunk/localization/ru_RU.inc roundcubemail/plugins/markasjunk/localization/sv_SE.inc roundcubemail/plugins/markasjunk/markasjunk.js roundcubemail/plugins/markasjunk/markasjunk.php @@ -195,6 +191,7 @@ roundcubemail/plugins/new_user_dialog/localization/de_DE.inc roundcubemail/plugins/new_user_dialog/localization/en_US.inc roundcubemail/plugins/new_user_dialog/localization/et_EE.inc roundcubemail/plugins/new_user_dialog/localization/pl_PL.inc +roundcubemail/plugins/new_user_dialog/localization/ru_RU.inc roundcubemail/plugins/new_user_dialog/localization/sv_SE.inc roundcubemail/plugins/new_user_dialog/new_user_dialog.php roundcubemail/plugins/new_user_dialog/newuserdialog.css @@ -242,9 +239,12 @@ roundcubemail/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php roundcubemail/plugins/subscriptions_option/ roundcubemail/plugins/subscriptions_option/localization/ roundcubemail/plugins/subscriptions_option/localization/cs_CZ.inc +roundcubemail/plugins/subscriptions_option/localization/de_CH.inc +roundcubemail/plugins/subscriptions_option/localization/de_DE.inc roundcubemail/plugins/subscriptions_option/localization/en_US.inc roundcubemail/plugins/subscriptions_option/localization/et_EE.inc roundcubemail/plugins/subscriptions_option/localization/pl_PL.inc +roundcubemail/plugins/subscriptions_option/localization/ru_RU.inc roundcubemail/plugins/subscriptions_option/localization/sv_SE.inc roundcubemail/plugins/subscriptions_option/subscriptions_option.php roundcubemail/plugins/userinfo/ @@ -259,6 +259,11 @@ roundcubemail/plugins/userinfo/localization/sv_SE.inc roundcubemail/plugins/userinfo/userinfo.js roundcubemail/plugins/userinfo/userinfo.php roundcubemail/plugins/vcard_attachments/ +roundcubemail/plugins/vcard_attachments/localization/ +roundcubemail/plugins/vcard_attachments/localization/de_CH.inc +roundcubemail/plugins/vcard_attachments/localization/de_DE.inc +roundcubemail/plugins/vcard_attachments/localization/en_US.inc +roundcubemail/plugins/vcard_attachments/localization/ru_RU.inc roundcubemail/plugins/vcard_attachments/vcard_add_contact.png roundcubemail/plugins/vcard_attachments/vcard_attachments.php roundcubemail/plugins/vcard_attachments/vcardattach.js @@ -889,6 +894,7 @@ roundcubemail/program/lib/Net/ roundcubemail/program/lib/Net/SMTP.php roundcubemail/program/lib/Net/Socket.php roundcubemail/program/lib/PEAR.php +roundcubemail/program/lib/PEAR5.php roundcubemail/program/lib/des.inc roundcubemail/program/lib/encoding/ roundcubemail/program/lib/encoding/CP1250.map @@ -1293,13 +1299,3 @@ roundcubemail/temp/ @mode @group roundcubemail/temp/.htaccess -roundcubemail/tests/ -roundcubemail/tests/mailfunc.php -roundcubemail/tests/modcss.php -roundcubemail/tests/runtests.sh -roundcubemail/tests/src/ -roundcubemail/tests/src/BID-26800.txt -roundcubemail/tests/src/htmlbody.txt -roundcubemail/tests/src/htmlxss.txt -roundcubemail/tests/src/plainbody.txt -roundcubemail/tests/src/valid.css