5 files changed, 48 insertions, 61 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 8d3aeae9af95..42dc6c4ca559 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -8,27 +8,17 @@
 PORTNAME=	elm+ME
 PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
 CATEGORIES=	mail
+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+/
 DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
 
-# 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/ \
-		ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \
-		ftp://ftp.ntua.gr/pub/net/mail/elm-me/src/elm-${ELM_VERSION}ME+/
-
-# the following repositories maybe conform to the main repository.
-# MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
-# 		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
-
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	# see below.
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A once-popular mail user agent, unofficial clone
+COMMENT=	Modern branch of an old mail user agent
 
 # not needed since config.sh is generated by scripts/pre-configure.
 # BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
@@ -42,7 +32,6 @@ COMMENT=	A once-popular mail user agent, unofficial clone
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
 
 HAS_CONFIGURE=	yes
-USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 
 CONFIGURE_SCRIPT=	Configure
@@ -56,7 +45,7 @@ SCRIPTS_ENV=	CONFIG_PATH="${CONFIG_PATH}" CFLAGS="${CFLAGS}" \
 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 +59,7 @@ PLIST_SUB=	SO_REV="${SO_REV}" \
 		${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 +80,8 @@ OPTIONS=	ELM_ICONV "libiconv support" on \
 #
 
 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 +149,7 @@ MIME_CSETS=	elm.mimecharsets
 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
@@ -286,6 +273,8 @@ restore-conf-files:
 merge-global-rc-file:
 	@${LIB_DIR}/elmrc-write -G -I
 	@${LIB_DIR}/elmlibregister -G -I ${ELM_SHLIBS}
+	@${INSTALL_DATA} ${CONF_DIR}/${ELM_RC} ${CONF_DIR}/${ELM_RC}-dist
+	@${RM} -f ${CONF_DIR}/${ELM_RC}.old-values
 
 remove-catman-files:
 .for sect in ${MSECS}
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 4f03b5bf79b7..52c795945903 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -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 --git a/mail/elm+ME/pkg-descr b/mail/elm+ME/pkg-descr
index 98d1110f019c..9f4a2ec78d79 100644
--- a/mail/elm+ME/pkg-descr
+++ b/mail/elm+ME/pkg-descr
@@ -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 --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 89b65fdab3b7..11b4edf162f8 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -62,6 +62,7 @@ bin/readmsg
 %%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
@@ -75,26 +76,21 @@ bin/readmsg
 %%LIB_DIR%%/elmunidata
 %%LIB_DIR%%/prlong
 %%SHLIB_DIR%%/libelmme-base.so%%SO_REV%%
+%%SHLIB_DIR%%/libelmme-mailer.so%%SO_REV%%
 %%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 %%LIB_DIR%%
+@dirrmtry %%CONF_DIR%%
+@dirrmtry %%MAIL_DIR%%
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index e18501d9c559..f8e1f93dc64b 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -5,6 +5,7 @@
 # $FreeBSD$
 
 [ -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 @@ n='-n'
 c=''
 orderlib='false'
 ranlib=':'
+ar='ar'
+nm='nm'
 package='elm2.4me+'
 pager='builtin++'
 use_builtin_pager='define'
@@ -349,6 +352,8 @@ gpg_path='${LOCALBASE}/bin/gpg'
 special_path='/usr/bin'
 special_path2='${PREFIX}/bin'
 locale_dir='/usr/share/locale'
+d_wchar='${has_wchar}'
+d_wcwidth='${has_wchar}'
 CONFIG=true
 EOF