Switch to new Elm maintainer

6 files changed, 172 insertions, 32 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index d669ce0f87fe..d24a71c33c5d 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,25 +1,27 @@
 # New ports collection makefile for:    elm
-# Version required:     2.4 pl25 ME8b
+# Version required:     2.4.25.ME+.9
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.13 1995/12/21 10:47:59 ache Exp $
+# $Id: Makefile,v 1.14 1996/02/20 04:18:46 ache Exp $
 #
 
-DISTNAME=       elm-2.4pl24me8b
-VERSION=        2.4.25m8b          # allows to not edit elm+* Makefiles
-PKGNAME=        elm-${VERSION}
+DISTNAME=       elm-2.4ME+9
 CATEGORIES+=	mail
-MASTER_SITES=   ftp://ftp.kiae.su/unix/mail/ ftp://ftp.myxa.com/pub/elm/
-DISTFILES=      ${DISTNAME}${EXTRACT_SUFX} elm2.4.p25
-EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
+		ftp://ftp.kiae.su/unix/mail/
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.9
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-pre-patch:
-	-patch -d ${WRKSRC} -s -p -N -S + < ${PORTSDIR}/distfiles/elm2.4.p25
-
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
+	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+			${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \
+	else \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+			${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 5a47081bee3e..1940422766d4 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,2 +1 @@
-MD5 (elm-2.4pl24me8b.tar.gz) = aebac2163443b8f7f7d9714bdfedeade
-MD5 (elm2.4.p25) = 5ec93595c7573be4d0cb4ce7097b6e83
+MD5 (elm-2.4ME+9.tar.gz) = 06717f60bc24a275f9574c5d142d0951
diff --git a/mail/elm+ME/files/elm.mimetypes b/mail/elm+ME/files/elm.mimetypes
new file mode 100644
index 000000000000..f121812d6ec9
--- /dev/null
+++ b/mail/elm+ME/files/elm.mimetypes
@@ -0,0 +1,98 @@
+#       application/activemessage
+#       application/andrew-inset
+#       application/applefile
+#       application/atomicmail
+#       application/dca-rft
+#       application/dec-dx
+#       application/mac-binhex40
+#       application/macwriteii
+doc     application/msword
+#       application/news-message-id
+#       application/news-transmission
+bin     application/octet-stream
+exe     application/octet-stream
+oda     application/oda
+pdf     application/pdf
+ai      application/postscript
+eps     application/postscript
+ps      application/postscript
+#       application/remote-printing
+rtf     application/rtf
+#       application/slate
+mif     application/x-mif
+#       application/wita
+#       application/wordperfect5.1
+csh     application/x-csh
+dvi     application/x-dvi
+gz      application/x-gzip
+hdf     application/x-hdf
+latex   application/x-latex
+nc      application/x-netcdf
+cdf     application/x-netcdf
+sh      application/x-sh
+tcl     application/x-tcl
+tex     application/x-tex
+texi    application/x-texinfo
+texinfo application/x-texinfo
+t       application/x-troff
+tr      application/x-troff
+roff    application/x-troff
+man     application/x-troff-man
+me      application/x-troff-me
+ms      application/x-troff-ms
+src     application/x-wais-source
+zip     application/zip
+bcpio   application/x-bcpio
+cpio    application/x-cpio
+tgz     application/x-gtar
+shar    application/x-shar
+#       application/x-sv4cpio
+#       application/x-sv4crc
+tar     application/x-tar
+ustar   application/x-ustar
+au      audio/basic
+snd     audio/basic
+aif     audio/x-aiff
+aiff    audio/x-aiff
+aifc    audio/x-aiff
+wav     audio/x-wav
+gif     image/gif
+ief     image/ief
+jpeg    image/jpeg
+jpg     image/jpeg
+jpe     image/jpeg
+tiff    image/tiff
+tif     image/tiff
+ras     image/x-cmu-raster
+pnm     image/x-portable-anymap
+pbm     image/x-portable-bitmap
+pgm     image/x-portable-graymap
+ppm     image/x-portable-pixmap
+rgb     image/x-rgb
+xbm     image/x-xbitmap
+xpm     image/x-xpixmap
+xwd     image/x-xwindowdump
+#       message/external-body
+#       message/news
+#       message/partial
+#       message/rfc822
+#       multipart/alternative
+#       multipart/appledouble
+#       multipart/digest
+#       multipart/mixed
+#       multipart/parallel
+html    text/html
+htm     text/html
+txt     text/plain
+rtx     text/richtext
+tsv     text/tab-separated-values
+etx     text/x-setext
+mpeg    video/mpeg
+mpg     video/mpeg
+mpe     video/mpeg
+qt      video/quicktime
+mov     video/quicktime
+avi     video/x-msvideo
+movie   video/x-sgi-movie
+dl      video/x-dl
+fli     video/x-fli
diff --git a/mail/elm+ME/files/patch-ac b/mail/elm+ME/files/patch-ac
index 7ca86954d43f..c9257e1db754 100644
--- a/mail/elm+ME/files/patch-ac
+++ b/mail/elm+ME/files/patch-ac
@@ -1,5 +1,5 @@
-*** Configure.old	Thu Feb 22 22:56:56 1996
---- Configure	Thu Feb 22 22:58:51 1996
+*** Configure.orig	Sun Feb 18 20:24:15 1996
+--- Configure	Mon Feb 26 03:07:58 1996
 ***************
 *** 15,28 ****
   # working with this copy of Configure, you may wish to get metaconfig.)
@@ -27,8 +27,45 @@
       echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
       echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
 ***************
-*** 2473,2478 ****
---- 2468,2475 ----
+*** 719,725 ****
+  
+  : see if date exists, if so, init c_date
+  if $test ! "x$date" = "x" ; then
+!     c_date=`LANGUAGE= $date`
+  else
+      c_date='date was unavailable at configuration'
+  fi
+--- 714,720 ----
+  
+  : see if date exists, if so, init c_date
+  if $test ! "x$date" = "x" ; then
+!     c_date=`LANG= LC_TIME= $date`
+  else
+      c_date='date was unavailable at configuration'
+  fi
+***************
+*** 2278,2284 ****
+  
+  : see if crypt exists
+  echo " "
+! if $contains '^crypt$' libc.list >/dev/null 2>&1; then
+      echo 'crypt() found.'
+      d_crypt="$define"
+      cryptlib=''
+--- 2273,2282 ----
+  
+  : see if crypt exists
+  echo " "
+! if $test "$cryptlib" = -lcrypt; then
+!     echo 'crypt() found.'
+!     d_crypt="$define"
+! elif $contains '^crypt$' libc.list >/dev/null 2>&1; then
+      echo 'crypt() found.'
+      d_crypt="$define"
+      cryptlib=''
+***************
+*** 2477,2482 ****
+--- 2475,2482 ----
       lock_dir=/usr/spool/locks
   elif $test -d /usr/spool/uucp ; then
       lock_dir=/usr/spool/uucp
@@ -38,7 +75,7 @@
       lock_dir=/var/spool/locks
   elif $test -d /var/spool/uucp ; then
 ***************
-*** 3310,3319 ****
+*** 3364,3373 ****
   	$cat <<EOM
   
   The Character Set which your terminals support. You could set this
@@ -47,9 +84,9 @@
 ! US-ASCII as well. For a X-Windows environment, ISO-8859-1 would be 
 ! a convenient value.
   
-  EOM
-  	rp="Default Character Set which could be displayed [$dflt]"
---- 3307,3316 ----
+  Default Display Character Set is overriden by environment variable
+  \$MM_CHARSET if it is set (and \$NOMETAMAIL is not set.)
+--- 3364,3373 ----
   	$cat <<EOM
   
   The Character Set which your terminals support. You could set this
@@ -58,5 +95,5 @@
 ! KOI8-R charsets could display US-ASCII as well. For a X-Windows
 ! environment, ISO-8859-1 would be a convenient value.
   
-  EOM
-  	rp="Default Character Set which could be displayed [$dflt]"
+  Default Display Character Set is overriden by environment variable
+  \$MM_CHARSET if it is set (and \$NOMETAMAIL is not set.)
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 2b5b0d12769d..5d7b87ad4528 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -4,6 +4,7 @@ bin/answer
 bin/checkalias
 bin/elmalias
 bin/fastmail
+bin/filter
 bin/frm
 @exec ln -f %D/%F %D/bin/nfrm
 bin/listalias
@@ -14,7 +15,7 @@ bin/newmail
 bin/printmail
 bin/readmsg
 lib/prlong
-bin/filter
+lib/elm.mimetypes
 lib/elmrc-info
 lib/elm-help.0
 lib/elm-help.1
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index 41b807c40b10..51fafb1fff96 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.8 1996/01/12 01:54:50 ache Exp $
+#	$Id: pre-configure,v 1.9 1996/02/23 01:45:05 ache Exp $
 
 PortsDir=$PORTSDIR
   CurDir=$CURDIR
@@ -24,6 +24,7 @@ d_mkdir='define'
 d_rename='define'
 d_symlink='define'
 d_whoami='undef'
+d_poll='undef'
 n='-n'
 c=''
 orderlib='false'
@@ -80,6 +81,7 @@ lint
 lp
 lpr
 mailx
+metamail
 mips
 more
 nroff
@@ -146,7 +148,7 @@ pack='pack'
 compress='/usr/bin/compress'
 execmail=''
 libswanted='intl nls'
-c_date='Tue Jul  4 04:52:32 MSD 1995'
+c_date='Mon Feb 26 02:39:33 MSK 1996'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -154,7 +156,7 @@ calendar='calendar'
 d_chown_neg1='define'
 d_content='undef'
 d_crypt='define'
-cryptlib='/usr/lib/libcrypt.a'
+cryptlib='-lcrypt'
 d_cuserid='undef'
 d_disphost='undef'
 d_domname='define'
@@ -184,12 +186,13 @@ d_msgcat='define'
 d_usenls='undef'
 d_mallocvoid='define'
 d_mboxedit='define'
-d_mime='undef'
+d_mime='define'
+metamail_path='none'
 defencoding=''
-d_8bitmime='undef'
+d_8bitmime='define'
 d_binarymime='undef'
-defcharset='US-ASCII'
-defdispcharset='US-ASCII'
+defcharset='ISO-8859-1'
+defdispcharset='ISO-8859-1'
 d_mmdf='undef'
 d_newauto='define'
 d_noaddfrom='define'
@@ -247,7 +250,7 @@ i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
 lib='/usr/local/lib'
-libc='/usr/lib/libc.so.2.2'
+libc='/usr/lib/libc.so.3.0'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'