Upgrade to v12 (most of my patches applied by maintainer)

5 files changed, 15 insertions, 78 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index fdde0e574b2f..86f4969f99b5 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    elm
-# Version required:     2.4.25.ME+.11
+# Version required:     2.4.25.ME+.12
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.17 1996/02/29 21:35:46 ache Exp $
+# $Id: Makefile,v 1.18 1996/03/06 07:16:41 asami Exp $
 #
 
-DISTNAME=       elm-2.4ME+11
+DISTNAME=       elm-2.4ME+12
 CATEGORIES+=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.kiae.su/unix/mail/
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.11
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.12
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 58123d1872a1..fe7e8344728f 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+11.tar.gz) = a6dec164ef4666080ec2258fcba85971
+MD5 (elm-2.4ME+12.tar.gz) = b2d6c2a1eefd962ed508162cefb46dc6
diff --git a/mail/elm+ME/files/patch-ac b/mail/elm+ME/files/patch-ac
index c9257e1db754..e4e265215fff 100644
--- a/mail/elm+ME/files/patch-ac
+++ b/mail/elm+ME/files/patch-ac
@@ -1,11 +1,8 @@
-*** Configure.orig	Sun Feb 18 20:24:15 1996
---- Configure	Mon Feb 26 03:07:58 1996
+*** Configure.bak	Mon Mar 11 18:47:43 1996
+--- Configure	Tue Mar 12 14:52:18 1996
 ***************
-*** 15,28 ****
-  # working with this copy of Configure, you may wish to get metaconfig.)
-  
-  : sanity checks
-! PATH=".:/bin:/usr/bin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
+*** 18,28 ****
+  PATH=".:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
   export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
   
 - if test ! -t 0; then
@@ -16,33 +13,7 @@
   (alias) >/dev/null 2>&1 && \
       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.)"
---- 15,23 ----
-  # working with this copy of Configure, you may wish to get metaconfig.)
-  
-  : sanity checks
-! PATH=".:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
-  export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
-  
-  (alias) >/dev/null 2>&1 && \
-      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.)"
-***************
-*** 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
+--- 18,23 ----
 ***************
 *** 2278,2284 ****
   
@@ -63,37 +34,3 @@
       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
-+ elif $test -d /var/spool/lock ; then
-+     lock_dir=/var/spool/lock
-  elif $test -d /var/spool/locks ; then
-      lock_dir=/var/spool/locks
-  elif $test -d /var/spool/uucp ; then
-***************
-*** 3364,3373 ****
-  	$cat <<EOM
-  
-  The Character Set which your terminals support. You could set this
-! to one of the ISO-8859 charsets, even if you set the default for
-! the Text Messages to US-ASCII, as the ISO-8859 charsets could display
-! US-ASCII as well. For a X-Windows environment, ISO-8859-1 would be 
-! a convenient value.
-  
-  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
-! to one of the ISO-8859 charsets or KOI8-R charset, even if you set
-! the default for the Text Messages to US-ASCII, as the ISO-8859 and
-! KOI8-R charsets could display US-ASCII as well. For a X-Windows
-! environment, ISO-8859-1 would be a convenient value.
-  
-  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/Makefile b/mail/elm/Makefile
index fdde0e574b2f..86f4969f99b5 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    elm
-# Version required:     2.4.25.ME+.11
+# Version required:     2.4.25.ME+.12
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.17 1996/02/29 21:35:46 ache Exp $
+# $Id: Makefile,v 1.18 1996/03/06 07:16:41 asami Exp $
 #
 
-DISTNAME=       elm-2.4ME+11
+DISTNAME=       elm-2.4ME+12
 CATEGORIES+=	mail
 MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 		ftp://ftp.kiae.su/unix/mail/
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-WRKSRC=         ${WRKDIR}/elm2.4.ME+.11
+WRKSRC=         ${WRKDIR}/elm2.4.ME+.12
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 58123d1872a1..fe7e8344728f 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+11.tar.gz) = a6dec164ef4666080ec2258fcba85971
+MD5 (elm-2.4ME+12.tar.gz) = b2d6c2a1eefd962ed508162cefb46dc6