Update to elm-2.5.5 (the latest available official elm version).

Package provided by hiramatu@boreas.dti.ne.jp in PR pkg/13495.

This is no longer a ME extended version, which is now available as
pkgsrc/mail/elm-me.

6 files changed, 107 insertions, 63 deletions

diff --git a/mail/elm/patches/patch-aa b/mail/elm/patches/patch-aa
index 55e74cb7ecf..0a8a77f519c 100644
--- a/mail/elm/patches/patch-aa
+++ b/mail/elm/patches/patch-aa
@@ -1,17 +1,23 @@
-$NetBSD: patch-aa,v 1.1 1999/11/18 14:54:51 agc Exp $
-
-*** nls/LANGS.old	Sun Jun 28 04:32:25 1992
---- nls/LANGS	Fri Jul 28 06:48:31 1995
-***************
-*** 1,5 ****
-  # LANGS file
-  
-! C/C/C			/usr/local/nls/msg/C
-! english/us/ascii	/usr/local/nls/msg/english
-! french/canada/8859	/usr/local/nls/msg/french
---- 1,5 ----
-  # LANGS file
-  
-! C/C/C                   __PREFIX/share/nls/C
-! english/us/ascii        __PREFIX/share/nls/en_US.ISO_8859-1
-! french/canada/8859      __PREFIX/share/nls/fr_FR.ISO_8859-1
+$NetBSD: patch-aa,v 1.2 2001/07/18 20:04:13 martin Exp $
+--- Configure.orig	Sun Jul 15 23:32:27 2001
++++ Configure	Sun Jul 15 23:34:48 2001
+@@ -490,8 +490,8 @@
+     n=''
+     c='\c'
+ fi
+-echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
+-read ans
++#echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
++#read ans
+ rm -f .echotmp
+ 
+ : now set up to do reads with possible shell escape and default assignment
+@@ -5496,7 +5496,7 @@
+ echo "If you didn't make any mistakes, then just type a carriage return here."
+ rp="If you need to edit config.sh, do it as a shell escape here:"
+ $echo $n "$rp $c"
+-. UU/myread
++#. UU/myread
+ case "$ans" in
+ '') ;;
+ *) : in case they cannot read
diff --git a/mail/elm/patches/patch-ab b/mail/elm/patches/patch-ab
index d36f5da8693..dddac841182 100644
--- a/mail/elm/patches/patch-ab
+++ b/mail/elm/patches/patch-ab
@@ -1,13 +1,10 @@
-$NetBSD: patch-ab,v 1.4 1999/11/18 14:54:51 agc Exp $
-
---- nls/Makefile.orig	Thu Nov 18 14:41:07 1999
-+++ nls/Makefile	Thu Nov 18 14:46:27 1999
-@@ -3,7 +3,7 @@
- #
- LANGFILE=LANGS
- CATNAME=elm2.4me+.cat
--GENCAT=	nls/gencat
-+GENCAT=	gencat
+$NetBSD: patch-ab,v 1.5 2001/07/18 20:04:13 martin Exp $
+--- nls/LANGS.orig	Thu Apr 20 05:38:33 1995
++++ nls/LANGS	Wed Jul 18 06:58:32 2001
+@@ -1,5 +1,3 @@
+ # LANGS file
  
- HDIR=	../hdrs
- SDIR=	C/C/C
+-C/C/C			/usr/local/nls/msg/C
+-english/us/ascii	/usr/local/nls/msg/english
+-french/canada/8859	/usr/local/nls/msg/french
++C/C/C			__PREFIX/share/nls/C
diff --git a/mail/elm/patches/patch-ac b/mail/elm/patches/patch-ac
index db688b53a48..1870eb34eb6 100644
--- a/mail/elm/patches/patch-ac
+++ b/mail/elm/patches/patch-ac
@@ -1,13 +1,24 @@
-$NetBSD: patch-ac,v 1.4 2000/06/04 16:28:23 jdolecek Exp $
-
---- Configure.orig	Sun Jun  4 17:21:26 2000
-+++ Configure	Sun Jun  4 17:22:17 2000
-@@ -15,7 +15,7 @@
- PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
- export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
+$NetBSD: patch-ac,v 1.5 2001/07/18 20:04:13 martin Exp $
+--- nls/Makefile.orig	Mon Jul 16 00:30:02 2001
++++ nls/Makefile	Wed Jul 18 06:56:10 2001
+@@ -1,6 +1,6 @@
+ LANGFILE=LANGS
+ CATNAME=elm2.5.cat
+-GENCAT=	gencat/gencat
++GENCAT=	./gencat/gencat
  
--if test ! -t 0; then
-+if test "X$RUN_AS_BATCH" = "X" -a ! -t 0; then
-     echo "Say 'sh Configure', not 'sh <Configure'"
-     exit 1
- fi
+ HDIR=	../hdrs
+ SDIR=	C/C/C
+@@ -35,8 +35,11 @@
+ # same basename, so wait until install to put them somewhere.
+ all:
+ 
+-install:
++install: $(GENCAT)
+ 	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
++
++$(GENCAT):
++	cd gencat && $(MAKE) $(MFLAGS) $(MJ)
+ 
+ $(HFILES): $(MFILES)
+ 	gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
diff --git a/mail/elm/patches/patch-ad b/mail/elm/patches/patch-ad
index f6a6be7e318..945a085d970 100644
--- a/mail/elm/patches/patch-ad
+++ b/mail/elm/patches/patch-ad
@@ -1,22 +1,19 @@
-$NetBSD: patch-ad,v 1.5 2000/06/04 16:28:23 jdolecek Exp $
-
---- src/pgp.c.orig	Wed May 24 16:48:24 2000
-+++ src/pgp.c	Sun Jun  4 17:59:58 2000
-@@ -145,7 +145,7 @@
- 		char *path;
- 	    case pgp2:	
- 		
--		execl(pgp2_path, 
-+		execlp(pgp2_path, 
- 		      pgp2_path,"+verbose=0", "+language=en", "-kv", c, 
- 		      (char *)0);
- 		tmp = errno;
-@@ -160,7 +160,7 @@
- 		perror(path);
- 		break;
- 	    case gpg:
--		execl(gpg_path, 
-+		execlp(gpg_path, 
- 		      gpg_path,"--list-public-keys",c,(char *)0);
- 		tmp = errno;
- 		perror(path);
+$NetBSD: patch-ad,v 1.6 2001/07/18 20:04:13 martin Exp $
+--- Make.defs.SH.orig	Mon Jul 16 01:59:07 2001
++++ Make.defs.SH	Mon Jul 16 02:02:02 2001
+@@ -113,6 +113,7 @@
+ RM		= $rm
+ TEST		= $test
+ TOUCH		= $touch
++MKDIR		= mkdir
+ 
+ DESTBIN		= $installbin
+ DESTLIB		= $installlib
+@@ -143,6 +144,7 @@
+ 	$(RM) -f $@.old ; \
+ 	$(TEST) ! -f $@ || $(MV) $@ $@.old ; \
+ 	$(RM) -f $@.old ; \
++	$(MKDIR) -p `dirname $@` ; \
+ 	$(CP) $? $@ ; \
+ 	$(TEST) $(MAILERMODE) -lt 999 || $(CHGRP) $(MAILGRP) $@ ; \
+ 	$(CHMOD) $(MAILERMODE) $@
diff --git a/mail/elm/patches/patch-ae b/mail/elm/patches/patch-ae
new file mode 100644
index 00000000000..8943898a70c
--- /dev/null
+++ b/mail/elm/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.3 2001/07/18 20:04:14 martin Exp $
+--- doc/Makefile.SH.orig	Wed Mar 24 23:13:56 1999
++++ doc/Makefile.SH	Mon Jul 16 02:12:05 2001
+@@ -101,6 +101,7 @@
+ SUFFIX		=	$suffix
+ PACKED		=	$packed
+ PACKER		=	$packer
++MKDIR		=	mkdir
+ 
+ !GROK!THIS!
+ 
+@@ -277,8 +278,8 @@
+ 	fi
+ 
+ I_DELETE = $(TEST) ! -f $@ || $(RM) $@
+-INST_444 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 444 $@
+-INST_644 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 644 $@
++INST_444 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 444 $@
++INST_644 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 644 $@
+ INST_LINK = $(I_DELETE) ; $(LN) $? $@
+ 
+ #	Dependencies and rules for installing man pages and lib files
diff --git a/mail/elm/patches/patch-af b/mail/elm/patches/patch-af
new file mode 100644
index 00000000000..5a12b1d1640
--- /dev/null
+++ b/mail/elm/patches/patch-af
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.1 2001/07/18 20:04:14 martin Exp $
+--- Makefile.SH.orig	Fri Mar 15 02:27:09 1996
++++ Makefile.SH	Mon Jul 16 02:25:23 2001
+@@ -87,6 +87,7 @@
+ 	cd src && $(MAKE) $(MFLAGS) $(MJ) $@
+ 	cd utils && $(MAKE) $(MFLAGS) $(MJ) $@
+ 	cd doc && $(MAKE) $(MFLAGS) $(MJ) $@
++	cd nls && $(MAKE) $(MFLAGS) $(MJ) $@
+ 
+ #
+ # Ensure required subdirectories and their Makefiles exist.