Date: Wed, 22 Mar 2006 18:03:11 +0100 (CET) From: Johan van Selst <johans@stack.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94834: mail/elm+ME update to version 2.4.122g Message-ID: <20060322170311.7D09822A5C@mud.stack.nl> Resent-Message-ID: <200603221710.k2MHABp0015700@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94834
>Category: ports
>Synopsis: mail/elm+ME update to version 2.4.122g
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 22 17:10:10 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Johan van Selst
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #10: Wed Mar 1 17:14:02 CET 2006 johans@mud.stack.nl:/usr/obj/usr/src/sys/mud i386
>Description:
Current elm+me includes much improved utf8 support
and some other nice features and bugfixes.
Old website/master_site is now dead and burried.
Port description changed to reflect that elm+ME is not just a hack,
but a development branch that has moved on from original elm.
This patch keeps the old (unsexy) port layout,
but I'm not ready to do a complete makeover yet.
>How-To-Repeat:
>Fix:
- Old MASTER_SITES/WWW is dead: set new one and add mirrors.
- Remove unneeded USE_REINPLACE
- Remove unneeded patch files:
files/patch-answer.c
files/patch-iconv.c
diff -uNr elm+ME/Makefile elm+ME/Makefile
--- elm+ME/Makefile Tue Feb 21 04:06:53 2006
+++ elm+ME/Makefile Wed Mar 22 17:45:42 2006
@@ -9,10 +9,11 @@
PORTVERSION= ${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
CATEGORIES= mail
DISTNAME= elm-${ELM_VERSION}ME+${ELM_REVISION}
+MASTER_SITES= http://www.elmme-mailer.org/ \
+ ftp://ftp.elmme-mailer.org/elmme-mailer.org/src/elm-2.4ME+/ \
+ ftp://ftp.funet.fi//pub/unix/mail/elm/elm-2.4ME+/
+COMMENT= Modern branch of an old, well-known mail user agent
-# here is the main repository.
-MASTER_SITES= http://www.ozone.fmi.fi/KEH/
-
# the following repositories conform to the main repository.
MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/mail/elm-me/ \
ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \
@@ -28,7 +29,6 @@
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
-COMMENT= A once-popular mail user agent, unofficial clone
# not needed since config.sh is generated by scripts/pre-configure.
# BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
@@ -42,7 +42,6 @@
WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
HAS_CONFIGURE= yes
-USE_REINPLACE= yes
USE_OPENSSL= yes
CONFIGURE_SCRIPT= Configure
@@ -56,7 +55,7 @@
CONFIGURE_ARGS= -b -S -P ${PREFIX} -c ../${CONFIG_PATH:T}
MAKE_ENV= MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1"
-ALL_TARGET= all documentation
+ALL_TARGET= all
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= %%PREFIX%%/%%SHLIB_DIR%%
@@ -70,7 +69,7 @@
${ELM_SHLIBS:U:S/^/ELM_/:S/$/=""/} \
${ELM_UNSHLIBS:U:S/^/ELM_/:S/$/="@comment "/}
-MAN1= answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \
+MAN1= answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \
elmcharset.1 elmlibregister.1 elmrc-write.1 elmregister.1 \
elmstringconvert.1 elmterminal.1 elmunidata.1 elmuninstall.1 \
fastmail.1 frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
@@ -91,8 +90,8 @@
#
ELM_VERSION= 2.4
-ELM_REVISION= 121
-ELM_PATCHLEVEL= h # a...z = patch-level, _ means no patch-level.
+ELM_REVISION= 122
+ELM_PATCHLEVEL= g # a...z = patch-level, _ means no patch-level.
ELM_PATCHDONE= false
.for level in _ a b c d e f g h i j k l m n o p q r s t u v w x y z
@@ -160,9 +159,7 @@
TERM_INFO= elm.terminalinfo
ELM_RC= elm.rc
LOCAL_CONF_FILES= ${MIME_TYPES} ${MIME_CSETS} ${TERM_INFO} ${ELM_RC}
-DOC_FILES= MIME.txt README.ME+ \
- doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \
- doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd
+DOC_FILES= MIME.txt README.ME+
.for shlib in ${ELM_SHLIBS}
DOC_FILES+= shared_libs/${shlib:L}/README.${shlib:U}
.endfor
diff -uNr elm+ME/distinfo elm+ME/distinfo
--- elm+ME/distinfo Sun Jan 22 15:52:34 2006
+++ elm+ME/distinfo Mon Mar 20 22:39:04 2006
@@ -1,27 +1,24 @@
-MD5 (elm-2.4ME+121.tar.gz) = 78e5e788a587cd6d55a442bba39c6e21
-SHA256 (elm-2.4ME+121.tar.gz) = 75a048cccfa6a8796639712ee131e8c4b5c9fcf1ddf3e1c9cd17e5f17c8f46d5
-SIZE (elm-2.4ME+121.tar.gz) = 1494295
-MD5 (elm-2.4ME+PL121a.patch.gz) = 9663e2f7e5bba40e21b8b1e78dda2b95
-SHA256 (elm-2.4ME+PL121a.patch.gz) = 795731302bc6f07eeaccee36857bb3ac1bd6183541bcfea6040dfc668f7972fe
-SIZE (elm-2.4ME+PL121a.patch.gz) = 2706
-MD5 (elm-2.4ME+PL121b.patch.gz) = e8e8b4db47cb6b655cd69885e6752689
-SHA256 (elm-2.4ME+PL121b.patch.gz) = 5f03c027d3d180496e0243782c5498a65451433bf8ed1543587f4f9668dcecbb
-SIZE (elm-2.4ME+PL121b.patch.gz) = 1219
-MD5 (elm-2.4ME+PL121c.patch.gz) = d8f29cf8c314971ec986be014aaa739d
-SHA256 (elm-2.4ME+PL121c.patch.gz) = 7067c5ca65d7a70166e961bebb347fbec87485fd5a4fe8895c1698cce0e8a560
-SIZE (elm-2.4ME+PL121c.patch.gz) = 1307
-MD5 (elm-2.4ME+PL121d.patch.gz) = c863d2687dd0474de8572970130cd6df
-SHA256 (elm-2.4ME+PL121d.patch.gz) = 4fc4805299448d4160d4a1ff1b2c7415ca75a7f60ee999065765766745d2b65a
-SIZE (elm-2.4ME+PL121d.patch.gz) = 7295
-MD5 (elm-2.4ME+PL121e.patch.gz) = 3689ac0e2d1562a6ac297d11812d5448
-SHA256 (elm-2.4ME+PL121e.patch.gz) = fe2ee2149ab806a9f5fbc34f6dd4cb89c2845b77f62082c88c6c6f1a522a6a7a
-SIZE (elm-2.4ME+PL121e.patch.gz) = 5406
-MD5 (elm-2.4ME+PL121f.patch.gz) = d86a9097759492edefaa67fd59f2d7cc
-SHA256 (elm-2.4ME+PL121f.patch.gz) = fb7d3d9b2e7c850fccf0d597aa2a00b5deb44c4d13e4456012f4bf70ea93cba9
-SIZE (elm-2.4ME+PL121f.patch.gz) = 3111
-MD5 (elm-2.4ME+PL121g.patch.gz) = 3e47ae7f5c8a4dd8ff3d4525fc6bbe9b
-SHA256 (elm-2.4ME+PL121g.patch.gz) = 03c9061d6948d4aaf999e1bd851cbe8f34ee2d1f4cefbf4be91ed4c05a1ffc54
-SIZE (elm-2.4ME+PL121g.patch.gz) = 3358
-MD5 (elm-2.4ME+PL121h.patch.gz) = 50888989755abf8df1c35e92d8f7a4d9
-SHA256 (elm-2.4ME+PL121h.patch.gz) = 14ec9599b5dcc24c7670f6e07c5c1fd1ebefe142d77f8142ffd45daaa3b4e214
-SIZE (elm-2.4ME+PL121h.patch.gz) = 2393
+MD5 (elm-2.4ME+122.tar.gz) = f20df2de6278cac0b00c4bc64ab9932e
+SHA256 (elm-2.4ME+122.tar.gz) = ed75a72f4bd7d23a6506a1ad049a44b5506271c29156f161f58f864a0d5776f0
+SIZE (elm-2.4ME+122.tar.gz) = 1519057
+MD5 (elm-2.4ME+PL122a.patch.gz) = 0b6ff710d21253518f3ce940a615306f
+SHA256 (elm-2.4ME+PL122a.patch.gz) = f5d15967e08c4c6e6805d839c56715e6a86d646aa3fdaaa5bfe8d3d0cd3b8954
+SIZE (elm-2.4ME+PL122a.patch.gz) = 3546
+MD5 (elm-2.4ME+PL122b.patch.gz) = c1e83b57bdbe3fbde3db666097cf017c
+SHA256 (elm-2.4ME+PL122b.patch.gz) = 14792d2be86c1f662ffa4237215de280ad84cca414acc037b5076ca9f07ff301
+SIZE (elm-2.4ME+PL122b.patch.gz) = 18764
+MD5 (elm-2.4ME+PL122c.patch.gz) = 8ad52019a60434523e81262c85458da5
+SHA256 (elm-2.4ME+PL122c.patch.gz) = 5fa6680f98e6215c162fdad63b9a16d7190e6c9407225eb532e2a88388afc2d2
+SIZE (elm-2.4ME+PL122c.patch.gz) = 3325
+MD5 (elm-2.4ME+PL122d.patch.gz) = 03fc6e9cf6fedac38d9043622144395e
+SHA256 (elm-2.4ME+PL122d.patch.gz) = f6047d9b6b22ee246d02685bebe2533076051cdaaed6e6bc50ea6886a23b5246
+SIZE (elm-2.4ME+PL122d.patch.gz) = 12432
+MD5 (elm-2.4ME+PL122e.patch.gz) = ce964330c86d670a30ab093530f5f69f
+SHA256 (elm-2.4ME+PL122e.patch.gz) = 9f9a0971b52aa8492166076a5874852ef122dfd5a8373fdf2d29b643f855b61c
+SIZE (elm-2.4ME+PL122e.patch.gz) = 2272
+MD5 (elm-2.4ME+PL122f.patch.gz) = 211a2ed7a318883007c118e7144ff509
+SHA256 (elm-2.4ME+PL122f.patch.gz) = def8a17c82d1524ead7152c1653a5897f690e032c96c059d298b1539e201101e
+SIZE (elm-2.4ME+PL122f.patch.gz) = 1732
+MD5 (elm-2.4ME+PL122g.patch.gz) = 086fb0f47397d925bed98dbb1a14a094
+SHA256 (elm-2.4ME+PL122g.patch.gz) = 3e2b4c02e544b57bb01891f65ac320f68c2ce2b6c6d7bd0fbfd3ad932d64aff1
+SIZE (elm-2.4ME+PL122g.patch.gz) = 2585
diff -uNr elm+ME/files/patch-answer.c elm+ME/files/patch-answer.c
--- elm+ME/files/patch-answer.c Thu Jul 7 23:38:01 2005
+++ elm+ME/files/patch-answer.c Thu Jan 1 01:00:00 1970
@@ -1,21 +0,0 @@
-int and void* are not always of the same size. This patch eliminates
-a compiler warning...
-
---- utils/answer.c Wed Jul 21 12:36:33 2004
-+++ utils/answer.c Wed Jul 6 23:48:29 2005
-@@ -380,5 +380,5 @@
- read(user_data, buffer, entry.length > VERY_LONG_STRING ? VERY_LONG_STRING : entry.length);
- if ((entry.type & GROUP) != 0 && mailing) {
-- if (expand_group(sprbuffer, buffer + (int) entry.address,
-+ if (expand_group(sprbuffer, buffer + (intptr_t) entry.address,
- depth, sizeof sprbuffer) < 0)
- return NULL;
-@@ -386,6 +386,6 @@
- elm_sfprintf(sprbuffer, sizeof sprbuffer,
- FRM("%s (%s)"),
-- buffer + (int) entry.address,
-- buffer + (int) entry.name);
-+ buffer + (intptr_t) entry.address,
-+ buffer + (intptr_t) entry.name);
- }
- return sprbuffer;
diff -uNr elm+ME/files/patch-iconv.c elm+ME/files/patch-iconv.c
--- elm+ME/files/patch-iconv.c Thu Jul 7 23:38:01 2005
+++ elm+ME/files/patch-iconv.c Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-unicode_value (uint16) can not possibly exceed 0xFFFF. Remove
-the statement, that triggers a compiler warning.
-
---- shared_libs/iconv/iconv.c Tue Mar 30 11:38:44 2004
-+++ shared_libs/iconv/iconv.c Thu Jul 7 16:49:57 2005
-@@ -1000,7 +1000,4 @@
- /* Add unicode value */
-
-- if (ch->p->a.g1->unicode_value > 0xFFFF)
-- return;
--
- /* NOTE: str->p->a.words is not NUL terminated */
- str->p->a.words = safe_realloc(str->p->a.words,
diff -uNr elm+ME/pkg-descr elm+ME/pkg-descr
--- elm+ME/pkg-descr Wed Jan 31 18:16:05 2001
+++ elm+ME/pkg-descr Mon Mar 20 22:38:56 2006
@@ -1,5 +1,5 @@
An interactive screen-oriented mailer program that supersedes mail
-and mailx. This version is an unofficial clone with enhanced MIME
-and character set support. others new features include PGP, IMAP.
+and mailx. This version is a branch from ELM with enhanced MIME
+and character set support. Others features include PGP and IMAP.
-WWW: http://www.ozone.fmi.fi/KEH/
+WWW: http://www.elmme-mailer.org/
diff -uNr elm+ME/pkg-plist elm+ME/pkg-plist
--- elm+ME/pkg-plist Sat Jul 9 04:05:12 2005
+++ elm+ME/pkg-plist Tue Mar 21 18:35:20 2006
@@ -62,6 +62,7 @@
%%LIB_DIR%%/elm.map.txt/CP437.TXT
%%LIB_DIR%%/elm.map.txt/dec-mcs.txt
%%LIB_DIR%%/elm.map.txt/hp-roman8.txt
+%%LIB_DIR%%/elm.map.txt/koi8-e.txt
%%LIB_DIR%%/elm.map.txt/viscii.txt
%%LIB_DIR%%/elmbindata
%%LIB_DIR%%/elmcharset
@@ -78,23 +79,17 @@
%%ELM_ICONV%%%%SHLIB_DIR%%/libelmme-iconv.so%%SO_REV%%
%%ELM_SMTP%%%%SHLIB_DIR%%/libelmme-smtp.so%%SO_REV%%
%%ELM_TLS%%%%SHLIB_DIR%%/libelmme-tls.so%%SO_REV%%
-%%PORTDOCS%%%%DOCSDIR%%/Alias.fmtd.gz
-%%PORTDOCS%%%%DOCSDIR%%/Config.fmtd.gz
-%%PORTDOCS%%%%DOCSDIR%%/Cover.fmtd.gz
-%%PORTDOCS%%%%DOCSDIR%%/Form.fmtd.gz
%%PORTDOCS%%%%DOCSDIR%%/MIME.txt.gz
%%ELM_ICONV%%%%PORTDOCS%%%%DOCSDIR%%/README.ICONV.gz
%%PORTDOCS%%%%DOCSDIR%%/README.ME+.gz
%%ELM_SMTP%%%%PORTDOCS%%%%DOCSDIR%%/README.SMTP.gz
%%ELM_TLS%%%%PORTDOCS%%%%DOCSDIR%%/README.TLS.gz
-%%PORTDOCS%%%%DOCSDIR%%/Ref.fmtd.gz
-%%PORTDOCS%%%%DOCSDIR%%/Users.fmtd.gz
share/nls/C/elm2.4me+.cat
@exec %D/%%LIB_DIR%%/elmrc-write -G -I
@exec %D/%%LIB_DIR%%/elmlibregister -G -I %%ELM_SHLIBS%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%LIB_DIR%%/elm.map.txt
@dirrm %%LIB_DIR%%/elm.map.bin
-@unexec rmdir %D/%%LIB_DIR%% 2> /dev/null || :
-@unexec rmdir %D/%%CONF_DIR%% 2> /dev/null || :
-@unexec rmdir %D/%%MAIL_DIR%% 2> /dev/null || :
+@dirrmtry %D/%%LIB_DIR%%
+@dirrmtry %D/%%CONF_DIR%%
+@dirrmtry %D/%%MAIL_DIR%%
diff -uNr elm+ME/scripts/pre-configure elm+ME/scripts/pre-configure
--- elm+ME/scripts/pre-configure Sat Jul 9 04:05:12 2005
+++ elm+ME/scripts/pre-configure Wed Mar 22 14:46:55 2006
@@ -5,6 +5,7 @@
# $FreeBSD: ports/mail/elm+ME/scripts/pre-configure,v 1.36 2005/07/07 21:38:02 mi Exp $
[ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
+cpp /usr/include/wchar.h | grep mbrlen && has_wchar=define || has_wchar=undef
d_shared_rev=${SO_REV:-$(awk '/SHAREDTAG:/{print $2}' ${WRKSRC}/hdrs/patchlevel.h)}
@@ -47,6 +48,8 @@
c=''
orderlib='false'
ranlib=':'
+ar='ar'
+nm='nm'
package='elm2.4me+'
pager='builtin++'
use_builtin_pager='define'
@@ -349,6 +352,8 @@
special_path='/usr/bin'
special_path2='${PREFIX}/bin'
locale_dir='/usr/share/locale'
+d_wchar='${has_wchar}'
+d_wcwidth='${has_wchar}'
CONFIG=true
EOF
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060322170311.7D09822A5C>