Rework patches to remove fuzz.

4 files changed, 48 insertions, 90 deletions

diff --git a/mail/elm/files/patch-sum b/mail/elm/files/patch-sum
index caf6e4367cd..f0c02406b57 100644
--- a/mail/elm/files/patch-sum
+++ b/mail/elm/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/10/25 14:38:39 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/18 14:54:50 agc Exp $
 
-MD5 (patch-ab) = e273d71fe1bb6842840f342999574f41
-MD5 (patch-ac) = 50b949b887c14702ea9c82358008920d
+MD5 (patch-aa) = d54d6460531cf84d5845d858ef14ef5c
+MD5 (patch-ab) = b20a89a01b99c2bfe5dc21abe15b557a
+MD5 (patch-ac) = 9e92f0eba5fcd5b03272e8712195a4d9
 MD5 (patch-ad) = 3d90d8158227eeca1c55d918cb2d72d1
diff --git a/mail/elm/patches/patch-aa b/mail/elm/patches/patch-aa
new file mode 100644
index 00000000000..55e74cb7ecf
--- /dev/null
+++ b/mail/elm/patches/patch-aa
@@ -0,0 +1,17 @@
+$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
diff --git a/mail/elm/patches/patch-ab b/mail/elm/patches/patch-ab
index f4e02a45352..d36f5da8693 100644
--- a/mail/elm/patches/patch-ab
+++ b/mail/elm/patches/patch-ab
@@ -1,51 +1,13 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:32 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/11/18 14:54:51 agc Exp $
 
-*** nls/Makefile.old	Thu Mar 10 20:21:47 1994
---- nls/Makefile	Fri Jul 28 06:55:04 1995
-***************
-*** 1,6 ****
-  LANGFILE=LANGS
-  CATNAME=elm2.4.cat
-! GENCAT=	nls/gencat
-  
-  HDIR=	../hdrs
-  SDIR=	C/C/C
---- 1,6 ----
-  LANGFILE=LANGS
-  CATNAME=elm2.4.cat
-! GENCAT= gencat
-  
-  HDIR=	../hdrs
-  SDIR=	C/C/C
-***************
-*** 39,45 ****
-  	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
-  
-  $(HFILES): $(MFILES)
-! 	gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
-  
-  clean: FRC
-  	/bin/rm -f $(MSGCAT)
---- 39,45 ----
-  	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
-  
-  $(HFILES): $(MFILES)
-! 	$(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
-  
-  clean: FRC
-  	/bin/rm -f $(MSGCAT)
-*** 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
+--- 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
+ 
+ HDIR=	../hdrs
+ SDIR=	C/C/C
diff --git a/mail/elm/patches/patch-ac b/mail/elm/patches/patch-ac
index 0fbffe53911..4ba513b4203 100644
--- a/mail/elm/patches/patch-ac
+++ b/mail/elm/patches/patch-ac
@@ -1,38 +1,16 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:09:32 agc Exp $
+$NetBSD: patch-ac,v 1.3 1999/11/18 14:54:51 agc Exp $
 
-*** Configure.bak	Mon Mar 11 18:47:43 1996
---- Configure	Tue Mar 12 14:52:18 1996
-***************
-*** 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
--     echo "Say 'sh Configure', not 'sh <Configure'"
--     exit 1
-- fi
-- 
-  (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.)"
---- 18,23 ----
-***************
-*** 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=''
+--- Configure.orig	Thu Nov 18 14:49:06 1999
++++ Configure	Thu Nov 18 14:49:06 1999
+@@ -15,11 +15,6 @@
+ 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 $$)
+ 
+-if test ! -t 0; then
+-    echo "Say 'sh Configure', not 'sh <Configure'"
+-    exit 1
+-fi
+-
+ (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.)"