upgrade to +54

8 files changed, 38 insertions, 32 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 37a887626cad..878d5d23ee72 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -4,10 +4,10 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.50 1998/09/10 08:08:24 asami Exp $
+# $Id: Makefile,v 1.51 1998/09/19 00:16:08 hoek Exp $
 #
 
-DISTNAME=       elm-2.4ME+43
+DISTNAME=       elm-2.4ME+54
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,7 +15,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.43
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.54
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 		printmail.1 readmsg.1
@@ -26,6 +26,9 @@ CONFIGURE_SCRIPT= Configure
 CONFIGURE_ENV=  PREFIX="${PREFIX}"
 CONFIGURE_ARGS= -S
 
+post-configure:
+	cp ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+
 post-install:
 	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 3a0d7b220e4a..48c30b072c8c 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+43.tar.gz) = 9456cd74f6bc8564197a9e354f9af9a6
+MD5 (elm-2.4ME+54.tar.gz) = 189b1bd3ed6f1c8c0e8a116a201ab49e
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 55a0598ca360..a4cd02519650 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -13,10 +13,11 @@ bin/newmail
 bin/printmail
 bin/readmsg
 lib/prlong
+lib/elm.mimecharsets
 lib/elm.mimetypes
 lib/elmrc-info
 lib/elm-help.0
 lib/elm-help.1
 lib/elm-help.2
 lib/elm-help.3
-share/nls/C/elm2.4.cat
+share/nls/C/elm2.4me+.cat
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 9d75e3fece6b..a7939ea085b3 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.15 1996/12/22 06:53:00 obrien Exp $
+#	$Id: pre-configure,v 1.16 1996/12/23 06:08:21 ache Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -20,12 +20,11 @@ cppstdin='/usr/bin/cpp'
 cppminus=''
 d_getopt='define'
 d_memcpy='define'
-d_mkdir='define'
 d_rename='define'
 d_symlink='define'
 d_whoami='undef'
-d_poll='undef'
-d_inttypes='undef'
+d_poll='define'
+d_inttypes='define'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -62,7 +61,6 @@ mv='/bin/mv'
 cp='/bin/cp'
 tail=''
 tr='/usr/bin/tr'
-mkdir=''
 sort=''
 uniq=''
 grep='/usr/bin/grep'
@@ -78,6 +76,7 @@ ispell
 line
 lint
 lp
+locale
 lpr
 mailx
 metamail
@@ -148,7 +147,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='intl nls'
 noaddlib='yes'
-c_date='Mon Dec 23 07:44:59 MSK 1996'
+c_date='Wed Apr  7 21:35:37 MSD 1999'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -163,7 +162,7 @@ d_domname='define'
 d_usegetdom='undef'
 d_errlst='define'
 d_flock='define'
-d_dotlock='undef'
+d_dotlock='define'
 d_fcntlock='undef'
 has_flock='define'
 has_fcntl='define'
@@ -185,7 +184,6 @@ d_msgcat='define'
 d_usenls='undef'
 d_mallocvoid='define'
 d_mboxedit='define'
-d_mime='define'
 metamail_path='none'
 defencoding=''
 d_8bitmime='define'
@@ -231,7 +229,6 @@ tempnamo=''
 tempnamc=''
 d_termio='undef'
 d_termios='define'
-d_useembed='define'
 d_utimbuf='define'
 d_vfork='define'
 defbatsub='no subject (file transmission)'
@@ -251,7 +248,7 @@ i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
 lib="${PREFIX}/lib"
-libc='/usr/lib/libc.so.3.0'
+libc='/usr/lib/libc.so'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
@@ -283,7 +280,7 @@ nametype='bsd'
 d_passnames='define'
 d_berknames='define'
 d_usgnames='undef'
-passcat='cat /etc/passwd'
+# passcat='cat /etc/passwd'
 rmttape='unknown-remote-tape-unit'
 roff='/usr/bin/troff'
 roffopts=''
@@ -298,9 +295,11 @@ xencf=''
 xenlf=''
 d_xenix='undef'
 d_bsd='define'
+locale='/usr/share/locale'
 d_pgp='define'
 pgp="${PREFIX}/bin/pgp"
 pgp_path="${PREFIX}/bin/pgp"
+special_path='/usr/local/bin'
 d_remailer='define'
 finger='/usr/bin/finger'
 finger_path='/usr/bin/finger'
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 37a887626cad..878d5d23ee72 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,10 +4,10 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.50 1998/09/10 08:08:24 asami Exp $
+# $Id: Makefile,v 1.51 1998/09/19 00:16:08 hoek Exp $
 #
 
-DISTNAME=       elm-2.4ME+43
+DISTNAME=       elm-2.4ME+54
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
@@ -15,7 +15,7 @@ MASTER_SITES=   ftp://ftp.ozone.fmi.fi/KEH/ \
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.43
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.54
 MAN1=           answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
 		frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
 		printmail.1 readmsg.1
@@ -26,6 +26,9 @@ CONFIGURE_SCRIPT= Configure
 CONFIGURE_ENV=  PREFIX="${PREFIX}"
 CONFIGURE_ARGS= -S
 
+post-configure:
+	cp ${FILESDIR}/elm.mimecharsets ${WRKSRC}/bin
+
 post-install:
 	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 3a0d7b220e4a..48c30b072c8c 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+43.tar.gz) = 9456cd74f6bc8564197a9e354f9af9a6
+MD5 (elm-2.4ME+54.tar.gz) = 189b1bd3ed6f1c8c0e8a116a201ab49e
diff --git a/mail/elm/pkg-plist b/mail/elm/pkg-plist
index 55a0598ca360..a4cd02519650 100644
--- a/mail/elm/pkg-plist
+++ b/mail/elm/pkg-plist
@@ -13,10 +13,11 @@ bin/newmail
 bin/printmail
 bin/readmsg
 lib/prlong
+lib/elm.mimecharsets
 lib/elm.mimetypes
 lib/elmrc-info
 lib/elm-help.0
 lib/elm-help.1
 lib/elm-help.2
 lib/elm-help.3
-share/nls/C/elm2.4.cat
+share/nls/C/elm2.4me+.cat
diff --git a/mail/elm/scripts/pre-configure b/mail/elm/scripts/pre-configure
index 9d75e3fece6b..a7939ea085b3 100644
--- a/mail/elm/scripts/pre-configure
+++ b/mail/elm/scripts/pre-configure
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	pre-configure script for Elm port to FreeBSD 2.0
-#	$Id: pre-configure,v 1.15 1996/12/22 06:53:00 obrien Exp $
+#	$Id: pre-configure,v 1.16 1996/12/23 06:08:21 ache Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -20,12 +20,11 @@ cppstdin='/usr/bin/cpp'
 cppminus=''
 d_getopt='define'
 d_memcpy='define'
-d_mkdir='define'
 d_rename='define'
 d_symlink='define'
 d_whoami='undef'
-d_poll='undef'
-d_inttypes='undef'
+d_poll='define'
+d_inttypes='define'
 d_nointtypes='undef'
 n='-n'
 c=''
@@ -62,7 +61,6 @@ mv='/bin/mv'
 cp='/bin/cp'
 tail=''
 tr='/usr/bin/tr'
-mkdir=''
 sort=''
 uniq=''
 grep='/usr/bin/grep'
@@ -78,6 +76,7 @@ ispell
 line
 lint
 lp
+locale
 lpr
 mailx
 metamail
@@ -148,7 +147,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='intl nls'
 noaddlib='yes'
-c_date='Mon Dec 23 07:44:59 MSK 1996'
+c_date='Wed Apr  7 21:35:37 MSD 1999'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -163,7 +162,7 @@ d_domname='define'
 d_usegetdom='undef'
 d_errlst='define'
 d_flock='define'
-d_dotlock='undef'
+d_dotlock='define'
 d_fcntlock='undef'
 has_flock='define'
 has_fcntl='define'
@@ -185,7 +184,6 @@ d_msgcat='define'
 d_usenls='undef'
 d_mallocvoid='define'
 d_mboxedit='define'
-d_mime='define'
 metamail_path='none'
 defencoding=''
 d_8bitmime='define'
@@ -231,7 +229,6 @@ tempnamo=''
 tempnamc=''
 d_termio='undef'
 d_termios='define'
-d_useembed='define'
 d_utimbuf='define'
 d_vfork='define'
 defbatsub='no subject (file transmission)'
@@ -251,7 +248,7 @@ i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
 lib="${PREFIX}/lib"
-libc='/usr/lib/libc.so.3.0'
+libc='/usr/lib/libc.so'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
@@ -283,7 +280,7 @@ nametype='bsd'
 d_passnames='define'
 d_berknames='define'
 d_usgnames='undef'
-passcat='cat /etc/passwd'
+# passcat='cat /etc/passwd'
 rmttape='unknown-remote-tape-unit'
 roff='/usr/bin/troff'
 roffopts=''
@@ -298,9 +295,11 @@ xencf=''
 xenlf=''
 d_xenix='undef'
 d_bsd='define'
+locale='/usr/share/locale'
 d_pgp='define'
 pgp="${PREFIX}/bin/pgp"
 pgp_path="${PREFIX}/bin/pgp"
+special_path='/usr/local/bin'
 d_remailer='define'
 finger='/usr/bin/finger'
 finger_path='/usr/bin/finger'