From 39b5f23ca6946548805b09eead5f8b0bfdef7da3 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Mon, 14 Aug 2000 13:27:17 +0000 Subject: [PATCH] Upgrade to +82, add CP1251 support --- mail/elm+ME/Makefile | 5 +-- mail/elm+ME/distinfo | 2 +- mail/elm+ME/files/patch-ad | 63 +++++++++++++++++++++++++++++++ mail/elm+ME/files/patch-ae | 10 +++++ mail/elm+ME/files/patch-af | 11 ++++++ mail/elm+ME/pkg-descr | 1 + mail/elm+ME/pkg-plist | 1 + mail/elm+ME/scripts/pre-configure | 7 ++-- 8 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 mail/elm+ME/files/patch-ad create mode 100644 mail/elm+ME/files/patch-ae create mode 100644 mail/elm+ME/files/patch-af diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile index 1502b221d91e..a629457a3a2b 100644 --- a/mail/elm+ME/Makefile +++ b/mail/elm+ME/Makefile @@ -4,10 +4,9 @@ # # $FreeBSD$ # -# WARNING: it is NOT official Elm 2.* PORTNAME= elm -PORTVERSION= 2.4ME+77 +PORTVERSION= 2.4ME+82 CATEGORIES= mail MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \ ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \ @@ -18,7 +17,7 @@ MAINTAINER= ache@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./} MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \ frm.1 listalias.1 messages.1 newalias.1 newmail.1 \ - printmail.1 readmsg.1 elmcharset.1 + printmail.1 readmsg.1 elmcharset.1 elmterminal.1 MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1 HAS_CONFIGURE= Yes diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo index 60db661e3afc..0e5bd2aaefee 100644 --- a/mail/elm+ME/distinfo +++ b/mail/elm+ME/distinfo @@ -1 +1 @@ -MD5 (elm-2.4ME+77.tar.gz) = ae2e8a7cf681979a2836a29d92d00d77 +MD5 (elm-2.4ME+82.tar.gz) = eae2465a6ecd3399ad68d5b81f923e76 diff --git a/mail/elm+ME/files/patch-ad b/mail/elm+ME/files/patch-ad new file mode 100644 index 000000000000..ae2f5ac41ef0 --- /dev/null +++ b/mail/elm+ME/files/patch-ad @@ -0,0 +1,63 @@ +--- lib/cs_binary.c.old Wed Aug 9 18:14:34 2000 ++++ lib/cs_binary.c Mon Aug 14 17:07:42 2000 +@@ -274,6 +274,51 @@ + &cs_ascii, "KOI8-R", 0, map_init_koi8r, 0 }; + + ++/* CP1251 ------------------------------------------------------------ */ ++ ++/* Table compied from official Unicode mapping 2.01 */ ++ ++static uint16 cp12512unicode[128] = { ++ 0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021, ++ 0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F, ++ 0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014, ++ 0x003F,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F, ++ 0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7, ++ 0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407, ++ 0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7, ++ 0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457, ++ 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417, ++ 0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F, ++ 0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427, ++ 0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F, ++ 0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437, ++ 0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F, ++ 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, ++ 0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F ++ }; ++ ++ ++static void map_init_cp1251 P_((struct map_info *map)); ++static void map_init_cp1251(map) ++ struct map_info *map; ++{ ++ int i; ++ ++ for (i = 0; i < 128; i++) { ++ map->b.ascii.map_ascii_upper[i] = cp12512unicode[i]; ++ } ++ ++ map_ascii_init_rev(map); ++ map->map_initialized = 1; ++ ++ dprint(5,(debugfile, ++ "Map %s initialized\n",map->map_name)); ++} ++ ++struct map_info map_cp1251 = { ++ &cs_ascii, "WINDOWS-1251", 0, map_init_cp1251, 0 }; ++ ++ + /* bytemap --------------------------------------------------------------- */ + + static void map_bytemap_init_rev P_((struct map_info *map)); +@@ -2209,7 +2254,7 @@ + + int i; + static struct map_info * maps[] = { &map_ascii, &map_latin1, +- &map_koi8r, NULL }; ++ &map_koi8r, &map_cp1251, NULL }; + + for (i = 0; maps[i]; i++) + if (0 == strcmp(map_name,maps[i]->map_name)) diff --git a/mail/elm+ME/files/patch-ae b/mail/elm+ME/files/patch-ae new file mode 100644 index 000000000000..abf3fdf108b2 --- /dev/null +++ b/mail/elm+ME/files/patch-ae @@ -0,0 +1,10 @@ +--- lib/charset.c.old Wed Aug 9 18:14:33 2000 ++++ lib/charset.c Mon Aug 14 17:09:14 2000 +@@ -52,6 +52,7 @@ + { &cs_ascii, NULL, SET_valid, "ISO-8859-14", ASCII, NULL }, + { &cs_ascii, NULL, SET_valid, "ISO-8859-15", ASCII, NULL }, + { &cs_ascii, &map_koi8r, SET_valid, "KOI8-R", ASCII, NULL }, ++ { &cs_ascii, &map_cp1251, SET_valid, "WINDOWS-1251", ASCII, NULL }, + { &cs_utf8, &map_utf8, SET_valid, "UTF-8", NULL, &set_utf8 }, + { NULL, NULL, 0, NULL, NULL, NULL } + diff --git a/mail/elm+ME/files/patch-af b/mail/elm+ME/files/patch-af new file mode 100644 index 000000000000..f9c60663f91c --- /dev/null +++ b/mail/elm+ME/files/patch-af @@ -0,0 +1,11 @@ +--- hdrs/cs_imp.h.old Wed Aug 9 18:14:33 2000 ++++ hdrs/cs_imp.h Mon Aug 14 17:10:56 2000 +@@ -155,7 +155,7 @@ + uint16 iso646[12]; + struct utfmap utfmap; + } b; +-} map_ascii, map_latin1, map_koi8r, map_invariant, map_utf8; ++} map_ascii, map_latin1, map_koi8r, map_cp1251, map_invariant, map_utf8; + + extern unsigned char map_fallback_rev P_((unsigned int val, int *found)); + extern uint16 map_fallback P_((unsigned int c)); diff --git a/mail/elm+ME/pkg-descr b/mail/elm+ME/pkg-descr index c80c268a40b7..6a7ff44a681c 100644 --- a/mail/elm+ME/pkg-descr +++ b/mail/elm+ME/pkg-descr @@ -1,2 +1,3 @@ Elm is an interactive screen-oriented mailer program that supersedes mail and mailx. This is unofficial clone. +WWW: http://www.ozone.fmi.fi/KEH/ diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist index b0cde400c7d7..655a9f4bf1b1 100644 --- a/mail/elm+ME/pkg-plist +++ b/mail/elm+ME/pkg-plist @@ -16,6 +16,7 @@ lib/prlong lib/elm.mimecharsets lib/elm.mimetypes lib/elmcharset +lib/elmterminal lib/elmrc-info lib/elm-help.0 lib/elm-help.1 diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure index f1a0e6370604..ef46f51f7d19 100644 --- a/mail/elm+ME/scripts/pre-configure +++ b/mail/elm+ME/scripts/pre-configure @@ -27,8 +27,10 @@ d_symlink='define' d_whoami='undef' d_poll='define' d_select='define' +i_sys_select='define' d_mmap='define' d_socket='define' +d_connect_reopen='undef' d_netdb='define' d_netinet_in='define' d_inttypes='$has_inttypes' @@ -162,7 +164,7 @@ compress='/usr/bin/compress' execmail='' libswanted='sun nls c_s' noaddlib='yes' -c_date='Wed May 24 12:12:00 MSD 2000' +c_date='Mon Aug 14 15:54:12 MSD 2000' d_ascii='undef' d_broke_ctype='undef' d_calendar='define' @@ -204,8 +206,7 @@ defencoding='' d_8bitmime='define' d_binarymime='undef' d_dsn='define' -defcharset='DISPLAY' -defdispcharset='ISO-8859-1' +defsystemcharset='US-ASCII' d_mmdf='undef' d_newauto='define' d_noaddfrom='define'