o update to 2.4.94

o remove unnecessary patches
o PATCH_* and LIB_DEPENDS (iconv) added
o INSTALLS_SHLIB and LDCONFIG_DIRS added
o scripts/pre-configure changes:
	-e added
	PREFIX -> LOCALBASE for external programs
	new iconv support added (untested)
	config.sh generation fixed

PR:		29868
Submitted by:	MAINTAINER

8 files changed, 140 insertions, 104 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index fe082fad79c3..def87bee17bd 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	elm+ME
-PORTVERSION=	2.4.92
+PORTVERSION=	2.4.94
 CATEGORIES=	mail
 DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
 
 # here are the main repositories.
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
 		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/ \
@@ -21,21 +20,25 @@ MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/mail/elm-me/ \
 		ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
 		ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/
-
 # the following repositories maybe conform to the main repository.
 MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
 		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
 		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME:S/+/+PL/}a.patch.gz \
+		${DISTNAME:S/+/+PL/}b.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	clefevre@citeweb.net
 
+LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
+
 # not needed since config.sh is generated by scripts/pre-configure.
 # BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 # BUILD_DEPENDS=	metamail:${PORTSDIR}/mail/metamail
 # BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 # BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
-#
 # Global variables
 #
 
@@ -44,13 +47,16 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
 HAS_CONFIGURE=	yes
 
 CONFIGURE_SCRIPT=	Configure
-SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} \
-		PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}"
+SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} PREFIX="${PREFIX}" \
+		LOCALBASE="${LOCALBASE}" MAN1PREFIX="${MAN1PREFIX}"
 CONFIGURE_ARGS=	-S -P ${PREFIX}
 
 MAKE_ARGS=	MJ="FORMATTER=groff FORMATTER_OPTS=-Tlatin1"
 ALL_TARGET=	all documentation
 
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/%%SHLIB_SUBDIR%%
+
 PLIST_SUB=	SO_REV="${SO_REV}" DOC_SUBDIR="${DOC_SUBDIR}" \
 		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
 
@@ -59,11 +65,12 @@ MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
 		messages.1 newalias.1 newmail.1 printmail.1 readmsg.1
 MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
-#
 # Local variables
 #
 
-SO_REV=		`${AWK} '/SHAREDTAG:/{print $$2}' ${WRKSRC}/hdrs/patchlevel.h`
+# evaluation should be protected 'til extraction to avoid noisy messages.
+SO_REV=		$$([ -f ${WRKSRC}/hdrs/patchlevel.h ] && \
+		  ${AWK} '/SHAREDTAG:/{print $$2}' ${WRKSRC}/hdrs/patchlevel.h)
 MSECS=		1
 
 RCD_SUBDIR=	etc/rc.d
@@ -73,13 +80,12 @@ DOC_SUBDIR=	share/doc/elm
 
 RCD_FILE=	00elm.sh
 MIME_TYPES=	elm.mimetypes
-DOC_FILES=	README.ME+ shared_libs/tls/README.TLS \
+DOC_FILES=	README.ME+ \
+		shared_libs/iconv/README.ICONV \
+		shared_libs/tls/README.TLS \
 		doc/Alias.fmtd doc/Config.fmtd doc/Cover.fmtd \
 		doc/Form.fmtd doc/Ref.fmtd doc/Users.fmtd
 
-AWK?=		awk
-
-#
 # Post-patch
 #
 
@@ -100,7 +106,6 @@ patch-setgid:
 patch-nls-files:
 	@${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
 
-#
 # Post-install
 #
 
@@ -158,7 +163,6 @@ FETCH_CMD_INTERIOR=	${FETCH_CMD:M*fetch*}
 # lip6 dislike $USER@localhost...
 FETCH_ENV=	FTP_PASSWORD=${FTP_PASSWORD}
 
-AWK?=		awk
 IFCONFIG?=	ifconfig
 
 # well, this is a hack to make fetch happy on lip6, ugh!
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 1ca7471bcfc0..4ab447360f24 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1,3 @@
-MD5 (elm-2.4ME+92.tar.gz) = fd3ebe8318a6f33cc3f42aeda39808d7
+MD5 (elm+ME/elm-2.4ME+94.tar.gz) = 51e17fea6a2bd8fa49633d07f4047b12
+MD5 (elm+ME/elm-2.4ME+PL94a.patch.gz) = 2f9dafa7e0bfaa8b56566bc876f556ec
+MD5 (elm+ME/elm-2.4ME+PL94b.patch.gz) = 6db19ead83eafc7f6449fbbb9e20ee4c
diff --git a/mail/elm+ME/files/elm.mimetypes b/mail/elm+ME/files/elm.mimetypes
index 93491edd31cb..64446f2932ca 100644
--- a/mail/elm+ME/files/elm.mimetypes
+++ b/mail/elm+ME/files/elm.mimetypes
@@ -24,11 +24,11 @@ taz	application/octet-stream; type=tar; conversions=x-compress
 tgz	application/octet-stream; type=tar; conversions=x-gzip
 tbz	application/octet-stream; type=tar; conversions=x-bzip
 tbz2	application/octet-stream; type=tar; conversions=x-bzip2
-#tar	application/octet-stream; type=tar
+#	application/octet-stream; type=tar
 #Z	application/octet-stream
 #gz	application/octet-stream
 #bz2	application/octet-stream
-#zip	application/octet-stream; type=zip
+#zip	application/octet-stream; type=zip	[-> application/zip]
 
 # PGP users might want the following
 #pgp	application/pgp
@@ -963,9 +963,13 @@ enc		application/pre-encrypted
 mda		application/vnd.ms-access
 mdb		application/vnd.ms-access
 mde		application/vnd.ms-access
+pwz		application/vnd.ms-powerpoint
 sc2		application/vnd.ms-schedule
 scd		application/vnd.ms-schedule
 sch		application/vnd.ms-schedule
+wp5		application/wordperfect5.1
+wk		application/x-123
+ckl		application/x-fortezza-ckl
 mocha		application/x-javascript
 jsc		application/x-javascript-config
 pac		application/x-ns-proxy-autoconfig
@@ -976,6 +980,7 @@ perl		application/x-perl
 #		application/x-pkcs7-mime	[-> application/pkcs7-mime]
 #		application/x-pkcs7-signature	[-> application/pkcs7-signature]
 #		application/x-sdp		[-> application/sdp]
+wz		application/x-wingz
 #		application/x-zip-compressed	[-> application/zip]
 
 # Image types
@@ -1065,6 +1070,7 @@ mpa2		audio/x-mpeg2
 #		text/directory			[-> text/x-directory]
 #		text/htmlh			[-> text/x-htmlh]
 #		text/mathml			[-> text/x-mathml]
+#		text/spreadsheet		[-> text/x-spreadsheet]
 #		text/x-abiword			[-> application/x-abiword]
 #		text/x-applix-word		[-> application/x-applix-word]
 #??		text/x-authors
@@ -1092,6 +1098,8 @@ mml		text/x-mathml
 #		text/x-python			[-> application/x-python]
 #??		text/x-readme
 #		text/x-scheme			[-> application/vnd.lotus-screencam]
+slk		text/x-spreadsheet
+sylk		text/x-spreadsheet
 stx		text/x-setext
 #		text/x-sh			[-> application/x-sh]
 #??		text/x-speech
@@ -1115,7 +1123,9 @@ gcrd		text/x-vcard
 #		application/msexcel		[-> application/vnd.ms-excel]
 #		application/mspowerpoint	[-> application/vnd.ms-powerpoint]
 pgp		application/pgp
-awb		application/x-abiword
+#		application/qif			[-> application/x-qif]
+wks		application/vnd.lotus-1-2-3
+abw		application/x-abiword
 as		application/x-applix-spreadsheet
 aw		application/x-applix-word
 arj		application/x-arj
@@ -1128,7 +1138,8 @@ cgi		application/x-cgi
 #		application/x-bzip-compressed-tar	[-> application/octet-stream]
 #??		application/x-cpio-compressed
 core		application/x-core-file
-deb		application/x-deb
+#		application/x-deb		[-> application/x-debian-package]
+dia		application/x-dia-diagram
 etheme		application/x-e-theme
 #??		application/x-executable-file	[-> application/octet-stream]
 afm		application/x-font-afm
@@ -1146,21 +1157,32 @@ ttf		application/x-font-ttf
 pfa		application/x-font-type1
 pfb		application/x-font-type1
 #??		application/x-font-vfont
+glade		application/x-glade
 desktop		application/x-gnome-app-info
 caves		application/x-gnome-stones
+gnucash		application/x-gnucash
+gnc		application/x-gnucash
+xac		application/x-gnucash
 gnumeric	application/x-gnumeric
-#??		application/x-java-byte-code
+#		application/x-java-byte-code	[-> application/x-java-vm]
+jpr		application/x-jbuilder-project
+jpx		application/x-jbuilder-project
 lha		application/x-lha
 lzh		application/x-lzh
 #		application/x-kde-app-info	[-> application/x-desktop]
 #??		application/x-ms-dos-executable
 o		application/x-object-file
 #		application/x-ogg		[-> audio/x-ogg]
+oleo		application/x-oleo
 #		application/x-palm-database	[-> application/vnd.palm]
 #??		application/x-pef-executable
 #		application/x-php		[-> application/x-httpd-php4]
-#??		application/x-profile
+out		application/x-profile
+qif		application/x-qif
+#		application/x-qw		[-> application/x-qif]
+sml		application/x-smil
 rar		application/x-rar
+#		application/x-rar-compressed	[-> application/x-rar]
 rej		application/x-reject
 rpm		application/x-rpm
 so		application/x-shared-library
@@ -1173,6 +1195,7 @@ theme		application/x-theme
 #??		application/x-troff-man-compressed
 a		application/x-unix-archive
 #		application/x-wordperfect	[-> application/wordperfect5.1]
+dbf		application/x-xbase
 zoo		application/x-zoo
 
 # Image types
@@ -1193,17 +1216,21 @@ lws		image/x-lws
 psd		image/x-psd
 svg		image/x-svg
 #		image/x-tga			[-> image/x-targa]
+wmf		image/x-wmf
 xcf		image/x-xcf
 fig		image/x-xfig
 
 # Audio types
 # -----------
 
+#		audio/ac3			[-> audio/x-ac3]
+ac3		audio/x-ac3
 it		audio/x-it
 #		audio/x-mp3			[-> audio/mpeg]
-#??		audio/x-mp3-playlist
+#		audio/x-mp3-playlist		[-> audio/x-mpegurl]
 m3u		audio/x-mpegurl
 ogg		audio/x-ogg
+#		audio/x-real-audio		[-> audio/vnd.rn-realaudio]
 #??		audio/x-riff
 #		audio/x-s3m			[-> audio/x-mod]
 #		audio/x-stm			[-> audio/x-mod]
@@ -1218,9 +1245,13 @@ xi		audio/x-xi
 #		video/isivideo			[-> video/x-isivideo]
 #		video/vivo			[-> video/vnd.vivo]
 #		video/wavelet			[-> video/x-wavelet]
+vob		video/mpeg
+dat		video/mpeg
 anim		video/x-anim
 #		video/x-avi			[-> video/x-msvideo]
 #??		video/x-isivideo
+#		video/x-ms-asf			[-> video/vnd.ms-asf]
+asx		video/vnd.ms-asf
 #??		video/x-wavelet
 #		video/x-real-video		[-> video/vnd.rn-realvideo]
 
@@ -1254,6 +1285,9 @@ anim		video/x-anim
 
 #		text/english			[-> text/plain]
 #??		text/xmcd
+H		text/x-c++hdr
+hpp		text/x-c++hdr
+hxx		text/x-c++hdr
 hh		text/x-c++hdr
 C		text/x-c++src
 cc		text/x-c++src
@@ -1348,8 +1382,7 @@ rm		application/vnd.rn-realmedia
 # Image types
 # -----------
 
-#		image/vnd.rn-realflash		[-> application/x-shockwave-flash2-preview]
-#		image/vnd.rn-realflash		[-> application/x-shockwave-flash]
+rf		image/vnd.rn-realflash
 rp		image/vnd.rn-realpix
 #		image/x-realaudio		[-> audio/vnd.rn-realaudio]
 
@@ -1379,7 +1412,7 @@ rv		video/vnd.rn-realvideo
 # -----------------
 
 swf		application/x-shockwave-flash
-rf		application/x-shockwave-flash2-preview
+#		application/x-shockwave-flash2-preview	[-> image/vnd.rn-realflash]
 
 # ======================================================================
 # Known unregistered MIME types from StarDivision
@@ -1398,6 +1431,33 @@ smf		application/x-smf
 sdw		application/x-swriter
 
 # ======================================================================
+# Known unregistered MIME types from Links
+# ======================================================================
+
+# Application types
+# -----------------
+
+#		application/x-debian-package	[-> application/x-deb]
+phtml		application/x-httpd-php
+pht		application/x-httpd-php
+#		application/x-maker		[-> application/vnd.framemaker]
+#		application/x-msdos-program	[-> application/octet-stream]
+#		text/comma-separated-values	[-> text/x-comma-separated-values]
+
+# Video types
+# -----------
+
+#		video/dl			[-> video/x-dl]
+dl		video/x-dl
+#		video/gl			[-> video/x-gl]
+gl		video/x-gl
+
+# Model types
+# -----------
+
+vrm		model/vrml
+
+# ======================================================================
 # Known unregistered MIME types from Anywhere
 # ======================================================================
 
diff --git a/mail/elm+ME/files/patch-ag b/mail/elm+ME/files/patch-ag
deleted file mode 100644
index bb132c1de1b9..000000000000
--- a/mail/elm+ME/files/patch-ag
+++ /dev/null
@@ -1,29 +0,0 @@
---- doc/Makefile.SH.orig	Tue Feb  6 19:48:15 2001
-+++ doc/Makefile.SH	Wed Feb 14 19:56:04 2001
-@@ -145,6 +145,8 @@
- 	$(SED) 's"#LIB#"$(LIB)"g;' < elmterminal.1 > elmterminal.1.subs
- frm.1.subs: frm.1
- 	$(SED) 's"#LIB#"$(LIB)"g;' < frm.1 > frm.1.subs
-+newalias.1.subs: newalias.1
-+	$(SED) 's"#LIB#"$(LIB)"g;' < newalias.1 > newalias.1.subs
- 
- formatted_pages: catman $(FORMATTED_PAGES_LIST)
- 
-@@ -220,7 +222,7 @@
- 				$(CP) $? $@
- 				$(CHMOD) u=rw,go=r $@
- 
--$(MAN)/newalias$(MANEXT):	newalias.1
-+$(MAN)/newalias$(MANEXT):	newalias.1.subs
- 				$(CP) $? $@
- 				$(CHMOD) u=rw,go=r $@
- 
-@@ -416,7 +418,7 @@
- 		true ; \
- 	fi
- 
--catman/newalias$(CATMANEXT)$(SUFFIX):		newalias.1
-+catman/newalias$(CATMANEXT)$(SUFFIX):		newalias.1.subs
- 	$(MANROFF) $(MANROFF_OPTS) -man $? > catman/newalias$(CATMANEXT)
- 	@if $(TEST) "$(PACKED)" = y ; then \
- 		$(RM) $@ ; \
diff --git a/mail/elm+ME/files/patch-ah b/mail/elm+ME/files/patch-ah
deleted file mode 100644
index bfec9b6a440e..000000000000
--- a/mail/elm+ME/files/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/newalias.1.orig	Fri Dec 29 20:56:44 2000
-+++ doc/newalias.1	Sun Jan  7 04:34:29 2001
-@@ -73,13 +73,13 @@
- .br
- $HOME/.elm/aliases              alias data file for user
- .br
--/usr/local/lib/aliases.text     alias source for system
-+#LIB#/aliases.text     alias source for system
- .br
--/usr/local/lib/aliases.dir      alias dbz directory for system
-+#LIB#/aliases.dir      alias dbz directory for system
- .br
--/usr/local/lib/aliases.pag      alias data hash table for system
-+#LIB#/aliases.pag      alias data hash table for system
- .br
--/usr/local/lib/aliases          alias data file for system
-+#LIB#/aliases          alias data file for system
- .SH AUTHOR
- Elm Development Group
- .SH SEE ALSO
diff --git a/mail/elm+ME/files/patch-newmbox.c b/mail/elm+ME/files/patch-newmbox.c
index 37a67784d66c..11e698e43474 100644
--- a/mail/elm+ME/files/patch-newmbox.c
+++ b/mail/elm+ME/files/patch-newmbox.c
@@ -1,11 +1,10 @@
---- src/newmbox.c.orig	Tue Feb  6 19:48:32 2001
-+++ src/newmbox.c	Sat May 12 21:28:05 2001
-@@ -568,6 +568,33 @@
- 		}	       
+--- src/newmbox.c.orig	Sun Aug 19 07:24:27 2001
++++ src/newmbox.c	Sun Aug 19 07:25:50 2001
+@@ -585,6 +585,36 @@
  	    }
  
-+	    else if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
-+							"Newsgroups"))) {	    
+ 	    if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
++							"Newsgroups"))) {
 +		struct addr_item * addrs = 
 +		    break_down_address(tmphdr->body,
 +				       !(current_header -> status & 
@@ -17,20 +16,24 @@
 +		    if (current_header->to)
 +			free_addr_items(current_header->to);
 +		    current_header->to = addrs;
-+		    if (debug > 15 && debugfile) {
++
++#if DEBUG
++		    if (Debug.active > 10) {
 +			struct addr_item * p;
 +			for (p =  current_header->to; p->addr; p++) {
-+			    elm_fprintf(debugfile,
-+					FRM("--   to[%d] addr='%s' comment='%S' fullname='%S'\n"),
-+					p - current_header->to,
-+					p->addr,
-+					p->comment,
-+					p->fullname);
++			    DPRINT(Debug,15,(&Debug, 
++					     "--   newsgroup[%d] addr='%s' comment='%S' fullname='%S'\n",
++					     p - current_header->to,
++					     p->addr,
++					     p->comment,
++					     p->fullname));
 +			}
 +		    }
++#endif
 +		}	       
 +	    }
 +
- 	    if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
++	    if (NULL != (tmphdr = locate_header_by_name(parsed_headers,
  							"Cc"))) {	    
  		struct addr_item * addrs = 
+ 		    break_down_address(tmphdr->body,
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 98fd03a9dc27..05c88e8e8b6b 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -31,9 +31,11 @@ etc/rc.d/00elm.sh
 %%LIB_SUBDIR%%/elmunidata
 %%LIB_SUBDIR%%/prlong
 %%SHLIB_SUBDIR%%/libelmme-base.so%%SO_REV%%
+%%SHLIB_SUBDIR%%/libelmme-iconv.so%%SO_REV%%
 %%SHLIB_SUBDIR%%/libelmme-tls.so%%SO_REV%%
 %%PORTDOCS%%%%DOC_SUBDIR%%/README.ME+.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/README.TLS.gz
+%%PORTDOCS%%%%DOC_SUBDIR%%/README.ICONV.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/Alias.fmtd.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/Config.fmtd.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/Cover.fmtd.gz
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index e7a7e28b7d24..4659273d3793 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,4 +1,4 @@
-#!/bin/sh -
+#!/bin/sh -e
 #
 #       pre-configure script for Elm port to FreeBSD
 #
@@ -6,6 +6,8 @@
 
 [ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
 
+d_shared_rev=${SO_REV:-$(awk '/SHAREDTAG:/{print $2}' ${WRKSRC}/hdrs/patchlevel.h)}
+
 [ -d  ${WRKSRC}/shlib ] || mkdir ${WRKSRC}/shlib
 
 cat > ${WRKSRC}/config.sh << EOF
@@ -33,7 +35,7 @@ d_connect_reopen='undef'
 d_netdb='define'
 d_netinet_in='define'
 d_use_aton='define'
-d_inttypes='$has_inttypes'
+d_inttypes='${has_inttypes}'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -121,7 +123,7 @@ vi
 '
 test='/bin/test'
 inews=''
-ispell='${PREFIX}/bin/ispell'
+ispell='${LOCALBASE}/bin/ispell'
 egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
@@ -131,7 +133,7 @@ mailx='mailx'
 mail=''
 cpp='/usr/bin/cpp'
 perl=''
-emacs='${PREFIX}/bin/emacs'
+emacs='${LOCALBASE}/bin/emacs'
 ls='/bin/ls'
 rmail='/bin/rmail'
 sendmail='/usr/sbin/sendmail'
@@ -195,7 +197,7 @@ i_term='define'
 d_index='undef'
 d_internet=''
 d_ispell='define'
-ispell_path='${PREFIX}/bin/ispell'
+ispell_path='${LOCALBASE}/bin/ispell'
 ispell_options='-x'
 d_locale='define'
 d_nl_types='define'
@@ -203,7 +205,7 @@ d_msgcat='define'
 d_usenls=''
 d_mallocvoid='define'
 d_mboxedit='define'
-metamail_path='${PREFIX}/bin/metamail'
+metamail_path='${LOCALBASE}/bin/metamail'
 d_8bitmime='define'
 d_binarymime='undef'
 d_dsn='define'
@@ -242,9 +244,9 @@ d_subshell='define'
 d_tempnam='define'
 d_setlinebuf='define'
 d_shared='define'
-d_shared_rev='${SO_REV}'
+d_shared_rev='${d_shared_rev}'
 d_dlopen_libs='define'
-shared_list='tls'
+shared_list='iconv tls'
 d_dynamic_main='define'
 dynamic_opt='-rdynamic'
 dlopen_lib=''
@@ -292,7 +294,7 @@ manroffopts=''
 suffix=''
 packer=''
 optimize='${CFLAGS}'
-ccflags=''
+ccflags='-D_LIBICONV_VERSION=200'
 cppflags=''
 ldflags='-s'
 cc='cc'
@@ -318,20 +320,32 @@ d_xenix='undef'
 d_bsd='define'
 locale='locale'
 d_pgp='define'
-pgp='${PREFIX}/bin/pgp'
-pgp2_path='${PREFIX}/bin/pgp'
-pgp5_dir='${PREFIX}/bin'
-gpg_path='${PREFIX}/bin/gpg'
+pgp='${LOCALBASE}/bin/pgp'
+pgp2_path='${LOCALBASE}/bin/pgp'
+pgp5_dir='${LOCALBASE}/bin'
+gpg_path='${LOCALBASE}/bin/gpg'
 special_path='/usr/bin'
 special_path2='${PREFIX}/bin'
 locale_dir='/usr/share/locale'
 CONFIG=true
-tls_ok='define'
 EOF
 
-mv  ${WRKSRC}/shared_libs/tls/README.ME+ ${WRKSRC}/shared_libs/tls/README.TLS
+mv ${WRKSRC}/shared_libs/iconv/README.ME+ \
+   ${WRKSRC}/shared_libs/iconv/README.ICONV
+
+tee -a ${WRKSRC}/config.sh > ${WRKSRC}/shared_libs/iconv/config.res << EOF
+#  Support for ICONV
+iconv_ok='define'
+iconv_dir='${LOCALBASE}'
+iconv_include_dir='${LOCALBASE}/include'
+iconv_lib_dir='${LOCALBASE}/lib'
+iconv_link='iconv'
+EOF
+
+mv ${WRKSRC}/shared_libs/tls/README.ME+ \
+   ${WRKSRC}/shared_libs/tls/README.TLS
 
-cat > ${WRKSRC}/shared_libs/tls/config.res << EOF
+tee -a ${WRKSRC}/config.sh > ${WRKSRC}/shared_libs/tls/config.res << EOF
 #  Support for TLS
 tls_ok='define'
 tls_dir='system'