10 files changed, 102 insertions, 79 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 7c6f110fee2e..9a67514ebea1 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -11,8 +11,9 @@ CATEGORIES=	mail
 DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
 
 # here are the main repositories.
-MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
-		http://www.ozone.fmi.fi/KEH/
+MASTER_SITES=	http://www.ozone.fmi.fi/KEH/ \
+		ftp://ftp.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/ \
@@ -45,7 +46,6 @@ COMMENT=	A once-popular mail user agent, unofficial clone
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
 
 HAS_CONFIGURE=	yes
-USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 
@@ -66,7 +66,6 @@ INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/%%SHLIB_DIR%%
 
 PLIST_SUB=	SO_REV="${SO_REV}" \
-		RC_DIR="${RC_DIR:S,^${PREFIX}/,,}" \
 		MAIL_DIR="${MAIL_DIR:S,^${PREFIX}/,,}" \
 		CONF_DIR="${CONF_DIR:S,^${PREFIX}/,,}" \
 		LIB_DIR="${LIB_DIR:S,^${PREFIX}/,,}" \
@@ -74,7 +73,6 @@ PLIST_SUB=	SO_REV="${SO_REV}" \
 		ELM_SHLIBS="${ELM_SHLIBS}" \
 		${ELM_SHLIBS:U:S/^/ELM_/:S/$/=""/} \
 		${ELM_UNSHLIBS:U:S/^/ELM_/:S/$/="@comment "/}
-RCSCRIPTS_SUB=	SHLIB_DIR="${SHLIB_DIR}" RC_SUBR=${RC_SUBR}
 
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \
 		elmcharset.1 elmlibregister.1 elmrc-write.1 elmregister.1 \
@@ -97,8 +95,8 @@ OPTIONS=	ELM_ICONV "libiconv support" on \
 #
 
 ELM_VERSION=	2.4
-ELM_REVISION=	119
-ELM_PATCHLEVEL=	_	# a...z = patch-level, _ means no patch-level.
+ELM_REVISION=	121
+ELM_PATCHLEVEL=	h	# 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
@@ -155,15 +153,12 @@ SO_REV=		$$([ -f ${WRKSRC}/hdrs/patchlevel.h ] && \
 MSECS=		1
 
 STAGE_DIR=	${WRKDIR}/stage
-RC_DIR=		${PREFIX}/etc/rc.d
 MAIL_DIR=	${PREFIX}/etc/mail
 CONF_DIR=	${MAIL_DIR}/elm
 LIB_DIR=	${PREFIX}/lib/elm
-SHLIB_DIR=	${PREFIX}/libexec/elm
+SHLIB_DIR=	${PREFIX}/lib
 
 CONFIG_PATH=	${WRKDIR}/config.sh
-_RC_FILE=	00elm.sh
-RC_FILE=	000.elm.sh
 MIME_TYPES=	elm.mimetypes
 MIME_CSETS=	elm.mimecharsets
 TERM_INFO=	elm.terminalinfo
@@ -179,15 +174,11 @@ DOC_FILES+=	shared_libs/${shlib:L}/README.${shlib:U}
 # Post-patch
 #
 
-post-patch: fix-permissions patch-startup-scripts patch-setgid patch-nls-files
+post-patch: fix-permissions patch-setgid patch-nls-files
 
 fix-permissions:
 	@${CHMOD} -R u+w ${WRKSRC}
 
-patch-startup-scripts:
-	@${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/${_RC_FILE} > ${WRKDIR}/${RC_FILE}
-
 # from <sys/unistd.h>:
 # Although we have saved user/group IDs, we do not use them in setuid
 # as described in POSIX 1003.1, because the feature does not work for
@@ -262,15 +253,12 @@ backup-conf-files:
 # Post-install
 #
 
-post-install: install-startup-files install-nls-files \
+post-install: install-nls-files \
 	      install-doc-files install-mime-types \
 	      install-conf-files restore-conf-files \
 	      merge-global-rc-file \
 	      remove-catman-files remove-catman-links
 
-install-startup-files:
-	@${INSTALL_SCRIPT} ${WRKDIR}/${RC_FILE} ${RC_DIR}
-
 install-nls-files:
 	@cd ${WRKSRC}/nls; ${MAKE} install
 
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 9e5c696a53b8..969aa1fae2f9 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,2 +1,18 @@
-MD5 (elm-2.4ME+119.tar.gz) = b9491fcc6533a42d1e835c5cc0049a45
-SIZE (elm-2.4ME+119.tar.gz) = 1491512
+MD5 (elm-2.4ME+121.tar.gz) = 78e5e788a587cd6d55a442bba39c6e21
+SIZE (elm-2.4ME+121.tar.gz) = 1494295
+MD5 (elm-2.4ME+PL121a.patch.gz) = 9663e2f7e5bba40e21b8b1e78dda2b95
+SIZE (elm-2.4ME+PL121a.patch.gz) = 2706
+MD5 (elm-2.4ME+PL121b.patch.gz) = e8e8b4db47cb6b655cd69885e6752689
+SIZE (elm-2.4ME+PL121b.patch.gz) = 1219
+MD5 (elm-2.4ME+PL121c.patch.gz) = d8f29cf8c314971ec986be014aaa739d
+SIZE (elm-2.4ME+PL121c.patch.gz) = 1307
+MD5 (elm-2.4ME+PL121d.patch.gz) = c863d2687dd0474de8572970130cd6df
+SIZE (elm-2.4ME+PL121d.patch.gz) = 7295
+MD5 (elm-2.4ME+PL121e.patch.gz) = 3689ac0e2d1562a6ac297d11812d5448
+SIZE (elm-2.4ME+PL121e.patch.gz) = 5406
+MD5 (elm-2.4ME+PL121f.patch.gz) = d86a9097759492edefaa67fd59f2d7cc
+SIZE (elm-2.4ME+PL121f.patch.gz) = 3111
+MD5 (elm-2.4ME+PL121g.patch.gz) = 3e47ae7f5c8a4dd8ff3d4525fc6bbe9b
+SIZE (elm-2.4ME+PL121g.patch.gz) = 3358
+MD5 (elm-2.4ME+PL121h.patch.gz) = 50888989755abf8df1c35e92d8f7a4d9
+SIZE (elm-2.4ME+PL121h.patch.gz) = 2393
diff --git a/mail/elm+ME/files/00elm.sh b/mail/elm+ME/files/00elm.sh
deleted file mode 100644
index e94cfad0196d..000000000000
--- a/mail/elm+ME/files/00elm.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Configure the shared library cache
-#
-# PROVIDE: elm
-# REQUIRE: ldconfig
-# KEYWORD: FreeBSD
-
-elm_enable=${elm_enable:-"YES"}
-elm_shlib_dir=${elm_shlib_dir:-"%%SHLIB_DIR%%"}
-
-. %%RC_SUBR%%
-
-name=ldconfig
-rcvar=$(set_rcvar)
-ldconfig_command="/sbin/ldconfig"
-load_rc_config ${name}
-
-name="elm"
-rcvar=$(set_rcvar)
-start_cmd="elm_start"
-stop_cmd=":"
-
-elm_start ()
-{
-	local _ins
-
-	_ins=
-	ldconfig=${ldconfig_command}
-	checkyesno ldconfig_insecure && _ins="-i"
-	if [ -x "${ldconfig_command}" ]; then
-		${ldconfig} -m ${_ins} ${elm_shlib_dir}
-	fi
-}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/mail/elm+ME/files/patch-answer.c b/mail/elm+ME/files/patch-answer.c
new file mode 100644
index 000000000000..5e50a75a1749
--- /dev/null
+++ b/mail/elm+ME/files/patch-answer.c
@@ -0,0 +1,21 @@
+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 --git a/mail/elm+ME/files/patch-header_alloc.c b/mail/elm+ME/files/patch-header_alloc.c
index cf2a7f5c708a..83aadcab0efd 100644
--- a/mail/elm+ME/files/patch-header_alloc.c
+++ b/mail/elm+ME/files/patch-header_alloc.c
@@ -1,27 +1,29 @@
---- src/messages/header_alloc.c.orig	Wed Dec 17 19:22:20 2003
-+++ src/messages/header_alloc.c	Tue Dec 23 03:14:46 2003
-@@ -333,6 +333,36 @@
+--- src/messages/header_alloc.c	Mon Aug 30 13:28:48 2004
++++ src/messages/header_alloc.c	Wed Jul  6 23:39:03 2005
+@@ -318,6 +318,38 @@
      }
  
-     if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
-+						"Newsgroup"))) {	    
-+	struct addr_item * addrs = 
+     for (tmphdr = locate_header_by_name(parsed_headers,
++						"Newsgroup");
++	 tmphdr;
++	 tmphdr = tmphdr -> next_this_header) {
++	struct addr_item * addrs =
 +	    break_down_address(tmphdr->body,
-+			       !(current_header -> status & 
++			       !(current_header -> status &
 +				 NOHDRENCODING) &&
 +			       is_rfc1522(tmphdr->body),
 +			       current_header->header_charset);
-+	
++
 +	if (addrs) {
 +	    if (current_header->to)
 +		free_addr_items(current_header->to);
 +	    current_header->to = addrs;
-+	    
++
 +#if DEBUG
 +	    if (Debug.active > 10) {
 +		struct addr_item * p;
 +		for (p =  current_header->to; p->addr; p++) {
-+		    DPRINT(Debug,15,(&Debug, 
++		    DPRINT(Debug,15,(&Debug,
 +				     "--   newsgroup[%d] addr='%s' comment='%S' fullname='%S'\n",
 +				     p - current_header->to,
 +				     p->addr,
@@ -30,10 +32,10 @@
 +		}
 +	    }
 +#endif
-+	}	       
++	}
 +    }
 +
-+    if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
- 						"Cc"))) {	    
- 	struct addr_item * addrs = 
- 	    break_down_address(tmphdr->body,
++    for (tmphdr = locate_header_by_name(parsed_headers,
+ 					"Cc");
+ 	 tmphdr;
+ 	 tmphdr = tmphdr -> next_this_header) {
diff --git a/mail/elm+ME/files/patch-iconv.c b/mail/elm+ME/files/patch-iconv.c
new file mode 100644
index 000000000000..b554876eedd7
--- /dev/null
+++ b/mail/elm+ME/files/patch-iconv.c
@@ -0,0 +1,13 @@
+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 --git a/mail/elm+ME/files/patch-iso2022_map.c b/mail/elm+ME/files/patch-iso2022_map.c
new file mode 100644
index 000000000000..c1e23da8e3d1
--- /dev/null
+++ b/mail/elm+ME/files/patch-iso2022_map.c
@@ -0,0 +1,12 @@
+127+128 is 255, which no `char' can exceed. This leads to a compiler
+warning...
+
+--- lib/iso2022_map.c	Tue Mar 30 11:38:43 2004
++++ lib/iso2022_map.c	Wed Jul  6 23:43:14 2005
+@@ -926,5 +926,5 @@
+ 		if (iso2022_94 == Mx->type ||
+ 		    iso2022_96 == Mx->type) {
+-		    if (ch < 32 + 128 || ch > 127 + 128) {
++		    if (ch < 32 + 128) {
+ 			DPRINT(Debug,10,(&Debug,
+ 					 "map_unicode_to_ISO2022_word_1: char %c (unicode %u)  out of range (type iso2022_94 or iso2022_96, PF_BUILTIN_upper)",
diff --git a/mail/elm+ME/files/patch-mime_parse.c b/mail/elm+ME/files/patch-mime_parse.c
new file mode 100644
index 000000000000..a5d4df6e0e45
--- /dev/null
+++ b/mail/elm+ME/files/patch-mime_parse.c
@@ -0,0 +1,12 @@
+Do not pause to inform the user, metamail is not needed.
+Maybe, there is no need to even say anything at all...
+
+--- melib/mime_parse.c	Sun Jun 27 15:39:33 2004
++++ melib/mime_parse.c	Thu Jul  7 16:46:46 2005
+@@ -749,5 +749,5 @@
+ 		
+ 		if (! (tmp & NOTPLAIN_need_metamail)) {
+-		    lib_error(CATGETS(elm_msg_cat, MeSet, MeParsingMimeNoMetamail,
++		    lib_transient(CATGETS(elm_msg_cat, MeSet, MeParsingMimeNoMetamail,
+ 				      "Parsing MIME structure... metamail not needed"));	    
+ 		}
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index efed4c049dec..89b65fdab3b7 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -33,7 +33,6 @@ bin/readmsg
 %%CONF_DIR%%/elm.terminalinfo-dist
 @exec if [ -f %D/%%LIB_DIR%%/elm.terminalinfo ]; then [ -f %B/elm.terminalinfo ] && old=.old || old=; mv %D/%%LIB_DIR%%/elm.terminalinfo %B/elm.terminalinfo${old}; fi
 @exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
-%%RC_DIR%%/000.elm.sh
 %%LIB_DIR%%/elm-help.0
 %%LIB_DIR%%/elm-help.1
 %%LIB_DIR%%/elm-help.2
@@ -94,7 +93,6 @@ 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 %%SHLIB_DIR%%
 @dirrm %%LIB_DIR%%/elm.map.txt
 @dirrm %%LIB_DIR%%/elm.map.bin
 @unexec rmdir %D/%%LIB_DIR%% 2> /dev/null || :
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 6dc752b90e5b..e18501d9c559 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -340,7 +340,7 @@ xenlf=''
 d_xenix='undef'
 d_bsd='define'
 locale='locale'
-have_codeset='undef'
+have_codeset='define'
 d_pgp='define'
 pgp='${LOCALBASE}/bin/pgp'
 pgp2_path='${LOCALBASE}/bin/pgp'