summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormi <mi@FreeBSD.org>2001-10-13 00:03:20 +0000
committermi <mi@FreeBSD.org>2001-10-13 00:03:20 +0000
commit9f05c31ec8aeac92c66e0923c4e065c0972a4419 (patch)
treedea1677a1cddd5b4a0894cb521d23bca26af6280
parentbee2d87f6186b9e0b439bf8de2a7c8d3a4fb8831 (diff)
downloadFreeBSD-ports-9f05c31ec8aeac92c66e0923c4e065c0972a4419.zip
FreeBSD-ports-9f05c31ec8aeac92c66e0923c4e065c0972a4419.tar.gz
A fix for my charset handling patch -- handling of messages
placed on hold. A fix for an original problem -- if a chosen charset could not represent all characters in the message, there was no way to go back and choose another. Instead of returning `-1', the TCL procedure was simply returning (`void'). Bump up portrevision.
-rw-r--r--mail/tkrat2/Makefile1
-rw-r--r--mail/tkrat2/files/patch-charset11
2 files changed, 11 insertions, 1 deletions
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 8c967e0..6dfa19d 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tkrat
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= mail tk83
MASTER_SITES= ftp://ftp.md.chalmers.se/pub/tkrat/ \
ftp://ftp.sunet.se/pub/unix/mail/tkrat/ \
diff --git a/mail/tkrat2/files/patch-charset b/mail/tkrat2/files/patch-charset
index c334132..f81b156 100644
--- a/mail/tkrat2/files/patch-charset
+++ b/mail/tkrat2/files/patch-charset
@@ -33,7 +33,7 @@ version comes out.
-
upvar #0 $mgh mh
if [info exists mh(body)] {
-@@ -411,15 +410,8 @@
+@@ -411,15 +410,10 @@
if [info exists p(charset)] {
set charset $p(charset)
- } else {
@@ -44,6 +44,8 @@ version comes out.
- }
+ } elseif [info exists mh(charset)] {
+ set charset $mh(charset)
++ } else {
++ set charset [encoding system]
}
- if {"auto" == $charset} {
- set charset utf-8
@@ -84,6 +86,13 @@ version comes out.
+
# ComposeBuildStruct --
#
+@@ -1066,5 +1092,5 @@
+ if {0 != [RatDialog $mh(toplevel) $t(warning) $t(bad_charset) {} 0 \
+ $t(continue) $t(abort)]} {
+- return
++ return -1
+ }
+ set charset $fallback
@@ -1074,10 +1096,9 @@
lappend bh(parameter) [list charset $charset]
}
OpenPOWER on IntegriCloud