4 files changed, 12 insertions, 21 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index b599711988a4..a32a4c0e5e95 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	elm ME+ (unofficial Elm)
-# Date created:		26 June 1995
-# Whom:			ache
-#
+# Created by: ache
 # $FreeBSD$
-#
 
 PORTNAME=	elm+ME
 PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
@@ -78,7 +74,7 @@ TLS_DESC=	Enable POP STLS and IMAP STARTTLS support
 #
 
 ELM_VERSION=	2.4
-ELM_REVISION=	125
+ELM_REVISION=	126
 ELM_PATCHLEVEL=	_	# a...z = patch-level, _ means no patch-level.
 
 ELM_PATCHDONE=	false
@@ -118,7 +114,6 @@ SHLIB_DIR=	${PREFIX}/lib
 CONFIG_PATH=	${WRKDIR}/config.sh
 MIME_TYPES=	elm.mimetypes
 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+
@@ -219,7 +214,7 @@ install-nls-files:
 	@cd ${WRKSRC}/nls; ${MAKE} install
 
 install-doc-files:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 . for file in ${DOC_FILES}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 6a4c413bf5be..78eaafa8ecf3 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,2 +1,2 @@
-SHA256 (elm-2.4ME+125.tar.gz) = 188a2827c0f904f2f0977f9cd837148a3ed3600346f837c1fb3decf10a45186a
-SIZE (elm-2.4ME+125.tar.gz) = 1692382
+SHA256 (elm-2.4ME+126.tar.gz) = 49b25bdbbcc660141ef028320a63515f3b8de94b6a57e0f3b631644e80236f7d
+SIZE (elm-2.4ME+126.tar.gz) = 1698705
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index f80dc12423d1..cf5919358de6 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -31,11 +31,6 @@ bin/readmsg
 %%CONF_DIR%%/elm.rc-dist
 @exec if [ -f %D/%%LIB_DIR%%/elm.rc ]; then [ -f %B/elm.rc ] && old=.old || old=; mv %D/%%LIB_DIR%%/elm.rc %B/elm.rc${old}; fi
 @exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
-@unexec if cmp -s %D/%%CONF_DIR%%/elm.terminalinfo %D/%%CONF_DIR%%/elm.terminalinfo-dist; then rm -f %D/%%CONF_DIR%%/elm.terminalinfo; fi
-%%CONF_DIR%%/elm.terminalinfo-dist
-%%CONF_DIR%%/elm.terminalinfo.NEW
-@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
 %%LIB_DIR%%/elm-help.0
 %%LIB_DIR%%/elm-help.1
 %%LIB_DIR%%/elm-help.2
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 297ba85a5014..3f81ed98ff56 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -37,12 +37,13 @@ d_poll='define'
 d_select='define'
 i_sys_select='define'
 d_mmap='define'
-d_socket='define'
+i_sys_socket='define'
 d_connect_reopen='undef'
-d_netdb='define'
-d_netinet_in='define'
+i_netdb='define'
+i_netinet_in='define'
+i_arpa_inet='define'
 d_use_aton='define'
-d_inttypes='${has_inttypes}'
+i_inttypes='${has_inttypes}'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -215,8 +216,8 @@ d_internet=''
 d_ispell='define'
 ispell_path='${LOCALBASE}/bin/ispell'
 ispell_options='-x'
-d_locale='define'
-d_nl_types='define'
+i_locale='define'
+i_nl_types='define'
 d_msgcat='define'
 d_usenls=''
 d_mallocvoid='define'