summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorBeech Rintoul <beech@FreeBSD.org>2008-06-30 01:27:54 +0000
committerBeech Rintoul <beech@FreeBSD.org>2008-06-30 01:27:54 +0000
commitc10e57835c9dff22202a09a52e735925ef91e20d (patch)
tree13d909553be0227071588fa2c51ef04f26f40876 /mail
parentThese should actually be @dirrmtry. (diff)
- Update to 1.2 (release)
- Bump PORTEPOCH
Notes
Notes: svn path=/head/; revision=216003
Diffstat (limited to 'mail')
-rw-r--r--mail/horde-ingo/Makefile4
-rw-r--r--mail/horde-ingo/distinfo6
-rw-r--r--mail/horde-ingo/files/patch-lib_Script_procmail.php23
-rw-r--r--mail/horde-ingo/pkg-plist11
-rw-r--r--mail/horde4-ingo/Makefile4
-rw-r--r--mail/horde4-ingo/distinfo6
-rw-r--r--mail/horde4-ingo/files/patch-lib_Script_procmail.php23
-rw-r--r--mail/horde4-ingo/pkg-plist11
8 files changed, 44 insertions, 44 deletions
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index b86be70529f0..4138f777d36b 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -7,8 +7,8 @@
PORTNAME= ingo
PORTVERSION= 1.2
-DISTVERSIONSUFFIX= -rc2
-PORTREVISION= 1
+DISTVERSIONSUFFIX=
+PORTEPOCH= 1
CATEGORIES= mail www
MAINTAINER= beech@FreeBSD.org
diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo
index 139041f8b661..9c7bfcd2f6d4 100644
--- a/mail/horde-ingo/distinfo
+++ b/mail/horde-ingo/distinfo
@@ -1,3 +1,3 @@
-MD5 (ingo-h3-1.2-rc2.tar.gz) = e281ee9abd11eee907b0e67f2ff36d3f
-SHA256 (ingo-h3-1.2-rc2.tar.gz) = b4b0aa60d4d3a0fe158532b4f8b9c1e0f1416ea0a6ae6cf1a3fe5fb67258b72d
-SIZE (ingo-h3-1.2-rc2.tar.gz) = 1702873
+MD5 (ingo-h3-1.2.tar.gz) = 2c61da8e403ecce50cfc40876cac163c
+SHA256 (ingo-h3-1.2.tar.gz) = f9296353b4ce674f74664fec4353c08c0cfad8237e84543d2cfaf11c7bff2805
+SIZE (ingo-h3-1.2.tar.gz) = 1809119
diff --git a/mail/horde-ingo/files/patch-lib_Script_procmail.php b/mail/horde-ingo/files/patch-lib_Script_procmail.php
index b81c2f3f18f6..ffd93ad90241 100644
--- a/mail/horde-ingo/files/patch-lib_Script_procmail.php
+++ b/mail/horde-ingo/files/patch-lib_Script_procmail.php
@@ -1,21 +1,12 @@
---- lib/Script/procmail.php.orig 2007-08-21 17:51:56.000000000 -0800
-+++ lib/Script/procmail.php 2007-12-04 00:37:57.000000000 -0900
-@@ -434,9 +434,15 @@
+--- lib/Script/procmail.php.orig 2008-05-05 09:22:21.000000000 -0800
++++ lib/Script/procmail.php 2008-06-29 16:56:12.000000000 -0800
+@@ -470,9 +470,6 @@
$this->_action[] = '{';
foreach ($params['action-value']['addresses'] as $address) {
if (!empty($address)) {
-- $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-- . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
+- $this->_action[] = ' FILEDATE=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
+- . $this->_params['ls'] . ' -lcn --time-style=+%s ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' | '
- . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+/***** This bit does not work with FreeBSD
-+* $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-+* . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
-+* . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+*/
-+ $this->_action[] = ' FDATE=`ls -lcnT \'.vacation.' . $address
-+ . '\' 2> /dev/null | awk \'{ print $6, $7, $8, $9; }\'`';
-+ $this->_action[] = ' FILEDATE=`date -j -f "%b %d %H:%M:%S %Y" "$FDATE" +%s '
-+ . ' | awk \'{ print $1 + (' . $days * 86400 . ') }\'`';
- $this->_action[] = ' DATE=`date +%s`';
- $this->_action[] = ' DUMMY=`test -f \'.vacation.' . $address . '\' && '
+ $this->_action[] = ' DATE=`' . $this->_params['date'] . ' +%s`';
+ $this->_action[] = ' DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
. 'test $FILEDATE -le $DATE && '
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index c667c6c1fc86..bafa0dd3a5b9 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-ingo/pkg-plist
@@ -73,6 +73,8 @@
%%HORDIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/pt_PT/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
+%%HORDIR%%/locale/ru_RU/LC_MESSAGES/ingo.mo
+%%HORDIR%%/locale/sk_SK/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/sl_SI/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/tr_TR/LC_MESSAGES/ingo.mo
@@ -102,6 +104,8 @@
%%HORDIR%%/po/pt_BR.po
%%HORDIR%%/po/pt_PT.po
%%HORDIR%%/po/ro_RO.po
+%%HORDIR%%/po/ru_RU.po
+%%HORDIR%%/po/sk_SK.po
%%HORDIR%%/po/sl_SI.po
%%HORDIR%%/po/sv_SE.po
%%HORDIR%%/po/tr_TR.po
@@ -111,10 +115,11 @@
%%HORDIR%%/rule.php
%%HORDIR%%/script.php
%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/convert_imp_filters.php
%%HORDIR%%/scripts/ingo-postfix-policyd
%%HORDIR%%/scripts/sql/ingo.oci8.sql
%%HORDIR%%/scripts/sql/ingo.sql
+%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
+%%HORDIR%%/scripts/upgrades/convert_imp_filters.php
%%HORDIR%%/scripts/upgrades/convert_prefs_to_sql.php
%%HORDIR%%/spam.php
%%HORDIR%%/templates/blacklist/blacklist.inc
@@ -202,6 +207,10 @@
@dirrm %%HORDIR%%/locale/sv_SE
@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
@dirrm %%HORDIR%%/locale/ro_RO
@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index b86be70529f0..4138f777d36b 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -7,8 +7,8 @@
PORTNAME= ingo
PORTVERSION= 1.2
-DISTVERSIONSUFFIX= -rc2
-PORTREVISION= 1
+DISTVERSIONSUFFIX=
+PORTEPOCH= 1
CATEGORIES= mail www
MAINTAINER= beech@FreeBSD.org
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
index 139041f8b661..9c7bfcd2f6d4 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde4-ingo/distinfo
@@ -1,3 +1,3 @@
-MD5 (ingo-h3-1.2-rc2.tar.gz) = e281ee9abd11eee907b0e67f2ff36d3f
-SHA256 (ingo-h3-1.2-rc2.tar.gz) = b4b0aa60d4d3a0fe158532b4f8b9c1e0f1416ea0a6ae6cf1a3fe5fb67258b72d
-SIZE (ingo-h3-1.2-rc2.tar.gz) = 1702873
+MD5 (ingo-h3-1.2.tar.gz) = 2c61da8e403ecce50cfc40876cac163c
+SHA256 (ingo-h3-1.2.tar.gz) = f9296353b4ce674f74664fec4353c08c0cfad8237e84543d2cfaf11c7bff2805
+SIZE (ingo-h3-1.2.tar.gz) = 1809119
diff --git a/mail/horde4-ingo/files/patch-lib_Script_procmail.php b/mail/horde4-ingo/files/patch-lib_Script_procmail.php
index b81c2f3f18f6..ffd93ad90241 100644
--- a/mail/horde4-ingo/files/patch-lib_Script_procmail.php
+++ b/mail/horde4-ingo/files/patch-lib_Script_procmail.php
@@ -1,21 +1,12 @@
---- lib/Script/procmail.php.orig 2007-08-21 17:51:56.000000000 -0800
-+++ lib/Script/procmail.php 2007-12-04 00:37:57.000000000 -0900
-@@ -434,9 +434,15 @@
+--- lib/Script/procmail.php.orig 2008-05-05 09:22:21.000000000 -0800
++++ lib/Script/procmail.php 2008-06-29 16:56:12.000000000 -0800
+@@ -470,9 +470,6 @@
$this->_action[] = '{';
foreach ($params['action-value']['addresses'] as $address) {
if (!empty($address)) {
-- $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-- . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
+- $this->_action[] = ' FILEDATE=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
+- . $this->_params['ls'] . ' -lcn --time-style=+%s ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' | '
- . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+/***** This bit does not work with FreeBSD
-+* $this->_action[] = ' FILEDATE=`test -f \'.vacation.' . $address . '\' && '
-+* . 'ls -lcn --time-style=+%s \'.vacation.' . $address . '\' | '
-+* . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-+*/
-+ $this->_action[] = ' FDATE=`ls -lcnT \'.vacation.' . $address
-+ . '\' 2> /dev/null | awk \'{ print $6, $7, $8, $9; }\'`';
-+ $this->_action[] = ' FILEDATE=`date -j -f "%b %d %H:%M:%S %Y" "$FDATE" +%s '
-+ . ' | awk \'{ print $1 + (' . $days * 86400 . ') }\'`';
- $this->_action[] = ' DATE=`date +%s`';
- $this->_action[] = ' DUMMY=`test -f \'.vacation.' . $address . '\' && '
+ $this->_action[] = ' DATE=`' . $this->_params['date'] . ' +%s`';
+ $this->_action[] = ' DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
. 'test $FILEDATE -le $DATE && '
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
index c667c6c1fc86..bafa0dd3a5b9 100644
--- a/mail/horde4-ingo/pkg-plist
+++ b/mail/horde4-ingo/pkg-plist
@@ -73,6 +73,8 @@
%%HORDIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/pt_PT/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
+%%HORDIR%%/locale/ru_RU/LC_MESSAGES/ingo.mo
+%%HORDIR%%/locale/sk_SK/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/sl_SI/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
%%HORDIR%%/locale/tr_TR/LC_MESSAGES/ingo.mo
@@ -102,6 +104,8 @@
%%HORDIR%%/po/pt_BR.po
%%HORDIR%%/po/pt_PT.po
%%HORDIR%%/po/ro_RO.po
+%%HORDIR%%/po/ru_RU.po
+%%HORDIR%%/po/sk_SK.po
%%HORDIR%%/po/sl_SI.po
%%HORDIR%%/po/sv_SE.po
%%HORDIR%%/po/tr_TR.po
@@ -111,10 +115,11 @@
%%HORDIR%%/rule.php
%%HORDIR%%/script.php
%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/convert_imp_filters.php
%%HORDIR%%/scripts/ingo-postfix-policyd
%%HORDIR%%/scripts/sql/ingo.oci8.sql
%%HORDIR%%/scripts/sql/ingo.sql
+%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
+%%HORDIR%%/scripts/upgrades/convert_imp_filters.php
%%HORDIR%%/scripts/upgrades/convert_prefs_to_sql.php
%%HORDIR%%/spam.php
%%HORDIR%%/templates/blacklist/blacklist.inc
@@ -202,6 +207,10 @@
@dirrm %%HORDIR%%/locale/sv_SE
@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
@dirrm %%HORDIR%%/locale/ro_RO
@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES