Rip out 'mmencode', so that we can now DEPEND on metamail rather than CONFLICT

with it.  This has the benefit that one can now install elm on systems that
have metamail installed (which, for example, is required by exmh).
Tested by jdolecek.  Bump PKGREVISION.

5 files changed, 147 insertions, 13 deletions

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index cb07e206455..cec1eb7c2d2 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2002/10/27 16:55:05 bouyer Exp $
+# $NetBSD: Makefile,v 1.25 2003/04/23 14:36:36 jschauma Exp $
 
 DISTNAME=		elm2.5.5
+PKGREVISION=		1
 PKGNAME=		elm-2.5.5
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.virginia.edu/pub/elm/
@@ -9,9 +10,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.instinct.org/elm/
 COMMENT=		ELM Mail User Agent (without ME extensions)
 
-CONFLICTS+=		mm-[0-9]* metamail-[0-9]*
+CONFLICTS+=		mm-[0-9]*
 CONFLICTS+=		elm-me-[0-9]*
 
+DEPENDS+=		metamail>=2.7:../../mail/metamail
+
 USE_BUILDLINK2=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
diff --git a/mail/elm/PLIST b/mail/elm/PLIST
index 067ded12a96..9e86f7caddd 100644
--- a/mail/elm/PLIST
+++ b/mail/elm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/23 14:36:36 jschauma Exp $
 bin/answer
 bin/checkalias
 bin/elm
@@ -7,7 +7,6 @@ bin/fastmail
 bin/frm
 bin/listalias
 bin/messages
-bin/mmencode
 bin/newalias
 bin/newmail
 bin/nfrm
@@ -34,7 +33,6 @@ man/man1/fastmail.1
 man/man1/frm.1
 man/man1/listalias.1
 man/man1/messages.1
-man/man1/mmencode.1
 man/man1/newalias.1
 man/man1/newmail.1
 man/man1/printmail.1
@@ -48,7 +46,6 @@ man/cat1/fastmail.1
 man/cat1/frm.1
 man/cat1/listalias.1
 man/cat1/messages.1
-man/cat1/mmencode.1
 man/cat1/newalias.1
 man/cat1/newmail.1
 man/cat1/printmail.1
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index d8a0a79c3c8..2fc7ff6266f 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/01/03 14:13:00 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/04/23 14:36:36 jschauma Exp $
 
 SHA1 (elm2.5.5.tar.gz) = 608f46d80a259eb3439b624d2947eede201a157d
 Size (elm2.5.5.tar.gz) = 605728 bytes
@@ -6,5 +6,6 @@ SHA1 (patch-aa) = b563de30ee117674419ec56074c0a94fbfbb6504
 SHA1 (patch-ab) = 0d3a39f6fb0179bf75095ed7aa1910d94506fbe8
 SHA1 (patch-ac) = 3216e1f8a00200efd93ada37c8250c5277abfbfe
 SHA1 (patch-ad) = de6e99072ad6379126bb1e6d798bc2cd851a92ed
-SHA1 (patch-ae) = c72dedb41a4a777af81a2351a7c7cd4d2c3b6137
+SHA1 (patch-ae) = 1d3fa90fbe037cc8f81202b6a1ad779b74298c4d
 SHA1 (patch-af) = 7e08a1595ff31bcb1f45433d20693b4e0c5bf824
+SHA1 (patch-ag) = e7bb5d94736a7a1dd8616a7e8f88c4c5c64059d1
diff --git a/mail/elm/patches/patch-ae b/mail/elm/patches/patch-ae
index 8943898a70c..f7c27887b1c 100644
--- a/mail/elm/patches/patch-ae
+++ b/mail/elm/patches/patch-ae
@@ -1,7 +1,8 @@
-$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 @@
+$NetBSD: patch-ae,v 1.4 2003/04/23 14:36:37 jschauma Exp $
+
+--- doc/Makefile.SH.orig	Wed Mar 24 09:13:56 1999
++++ doc/Makefile.SH
+@@ -101,6 +101,7 @@ TEST		=	$test
  SUFFIX		=	$suffix
  PACKED		=	$packed
  PACKER		=	$packer
@@ -9,7 +10,39 @@ $NetBSD: patch-ae,v 1.3 2001/07/18 20:04:14 martin Exp $
  
  !GROK!THIS!
  
-@@ -277,8 +278,8 @@
+@@ -118,7 +119,6 @@ MAN_LIST	=	$(MAN)/answer$(MANEXT)		\
+ 			$(MAN)/frm$(MANEXT)		\
+ 			$(MAN)/listalias$(MANEXT)	\
+ 			$(MAN)/messages$(MANEXT)	\
+-			$(MAN)/mmencode$(MANEXT)	\
+ 			$(MAN)/newalias$(MANEXT)	\
+ 			$(MAN)/newmail$(MANEXT)	\
+ 			$(MAN)/printmail$(MANEXT)	\
+@@ -133,7 +133,6 @@ CATMAN_LIST	=	$(CATMAN)/answer$(CATMANEX
+ 			$(CATMAN)/frm$(CATMANEXT)$(SUFFIX)	\
+ 			$(CATMAN)/listalias$(CATMANEXT)$(SUFFIX) \
+ 			$(CATMAN)/messages$(CATMANEXT)$(SUFFIX)	\
+-			$(CATMAN)/mmencode$(CATMANEXT)$(SUFFIX)	\
+ 			$(CATMAN)/newalias$(CATMANEXT)$(SUFFIX)	\
+ 			$(CATMAN)/newmail$(CATMANEXT)$(SUFFIX)	\
+ 			$(CATMAN)/printmail$(CATMANEXT)$(SUFFIX) \
+@@ -148,7 +147,6 @@ FORMATTED_PAGES_LIST =	catman/answer$(CA
+ 			catman/frm$(CATMANEXT)$(SUFFIX)		\
+ 			catman/listalias$(CATMANEXT)$(SUFFIX)	\
+ 			catman/messages$(CATMANEXT)$(SUFFIX)	\
+-			catman/mmencode$(CATMANEXT)$(SUFFIX)	\
+ 			catman/newalias$(CATMANEXT)$(SUFFIX)	\
+ 			catman/newmail$(CATMANEXT)$(SUFFIX)	\
+ 			catman/printmail$(CATMANEXT)$(SUFFIX)	\
+@@ -164,7 +162,6 @@ REMOTE_MAN_LIST	=	$(REMOTE)$(MAN)/answer
+ 			$(REMOTE)$(MAN)/frm$(MANEXT)		\
+ 			$(REMOTE)$(MAN)/listalias$(MANEXT)	\
+ 			$(REMOTE)$(MAN)/messages$(MANEXT)	\
+-			$(REMOTE)$(MAN)/mmencode$(MANEXT)	\
+ 			$(REMOTE)$(MAN)/newalias$(MANEXT)	\
+ 			$(REMOTE)$(MAN)/newmail$(MANEXT)	\
+ 			$(REMOTE)$(MAN)/printmail$(MANEXT)	\
+@@ -277,8 +274,8 @@ I_CHECK = if $(TEST) ! -f $@ ; then : ; 
  	fi
  
  I_DELETE = $(TEST) ! -f $@ || $(RM) $@
@@ -20,3 +53,30 @@ $NetBSD: patch-ae,v 1.3 2001/07/18 20:04:14 martin Exp $
  INST_LINK = $(I_DELETE) ; $(LN) $? $@
  
  #	Dependencies and rules for installing man pages and lib files
+@@ -291,7 +288,6 @@ $(MAN)/fastmail$(MANEXT):	fastmail.1		; 
+ $(MAN)/frm$(MANEXT):		frm.1			; $(INST_444)
+ $(MAN)/listalias$(MANEXT):	listalias.1		; $(INST_444)
+ $(MAN)/messages$(MANEXT):	messages.1		; $(INST_444)
+-$(MAN)/mmencode$(MANEXT):	mmencode.1		; $(INST_444)
+ $(MAN)/newalias$(MANEXT):	newalias.1		; $(INST_444)
+ $(MAN)/newmail$(MANEXT):	newmail.1		; $(INST_444)
+ $(MAN)/printmail$(MANEXT):	printmail.1		; $(INST_444)
+@@ -326,7 +322,6 @@ $(CATMAN)/fastmail$(CES):	catman/fastmai
+ $(CATMAN)/frm$(CES):		catman/frm$(CES)	; $(INST_644)
+ $(CATMAN)/listalias$(CES):	catman/listalias$(CES)	; $(INST_644)
+ $(CATMAN)/messages$(CES):	catman/messages$(CES)	; $(INST_644)
+-$(CATMAN)/mmencode$(CES):	catman/mmencode$(CES)	; $(INST_644)
+ $(CATMAN)/newalias$(CES):	catman/newalias$(CES)	; $(INST_644)
+ $(CATMAN)/newmail$(CES):	catman/newmail$(CES)	; $(INST_644)
+ $(CATMAN)/printmail$(CES):	catman/printmail$(CES)	; $(INST_644)
+@@ -370,10 +365,6 @@ catman/listalias$(CATMANEXT)$(SUFFIX):		
+ 	@ $(DO_PACK)
+ 
+ catman/messages$(CATMANEXT)$(SUFFIX):		messages.1
+-	$(DO_ROFF)
+-	@ $(DO_PACK)
+-
+-catman/mmencode$(CATMANEXT)$(SUFFIX):		mmencode.1
+ 	$(DO_ROFF)
+ 	@ $(DO_PACK)
+ 
diff --git a/mail/elm/patches/patch-ag b/mail/elm/patches/patch-ag
new file mode 100644
index 00000000000..ecc48ce0cd6
--- /dev/null
+++ b/mail/elm/patches/patch-ag
@@ -0,0 +1,73 @@
+$NetBSD: patch-ag,v 1.1 2003/04/23 14:36:37 jschauma Exp $
+
+--- utils/Makefile.SH.orig	Fri Apr  4 14:20:02 2003
++++ utils/Makefile.SH
+@@ -86,17 +86,12 @@ cat >Makefile <<'!NO!SUBS!'
+ 
+ SUBDIR		= utils
+ 
+-#	mmencode installation is optional
+-INSTALL_MMENCODE = $(DESTBIN)/mmencode
+-REMOTE_MMENCODE = $(REMOTE)/$(DESTBIN)/mmencode
+-
+ ALL	=	$(BINDIR)/answer	\
+ 		$(BINDIR)/checkalias	\
+ 		$(BINDIR)/elmalias	\
+ 		$(BINDIR)/fastmail	\
+ 		$(BINDIR)/frm		\
+ 		$(BINDIR)/listalias	\
+-		$(BINDIR)/mmencode	\
+ 		$(BINDIR)/messages	\
+ 		$(BINDIR)/newalias	\
+ 		$(BINDIR)/newmail	\
+@@ -124,7 +119,6 @@ SRCS	=	answer.c		\
+ 		elmalias.c		\
+ 		fastmail.c		\
+ 		from.c			\
+-		mmencode.c		\
+ 		newalias.c		\
+ 		newmail.c		\
+ 		readmsg.c		\
+@@ -134,7 +128,6 @@ OBJS	=	answer.o		\
+ 		elmalias.o		\
+ 		fastmail.o		\
+ 		from.o			\
+-		mmencode.o		\
+ 		newalias.o		\
+ 		newmail.o		\
+ 		readmsg.o		\
+@@ -158,7 +151,6 @@ LINT_LIST	=	answer_lint	\
+ 			elmalias_lint	\
+ 			fastmail_lint	\
+ 			frm_lint	\
+-			mmencode_lint	\
+ 			newalias_lint	\
+ 			newmail_lint	\
+ 			readmsg_lint	\
+@@ -179,8 +171,6 @@ FASTMAIL_SRC	=	fastmail.c
+ FASTMAIL_OBJ	=	fastmail.o
+ FRM_SRC		=	from.c
+ FRM_OBJ		=	from.o
+-MMENCODE_SRC	=	mmencode.c
+-MMENCODE_OBJ	=	mmencode.o
+ NEWALIAS_SRC	=	newalias.c
+ NEWALIAS_OBJ	=	newalias.o
+ NEWMAIL_SRC	=	newmail.c
+@@ -216,9 +206,6 @@ $(BINDIR)/fastmail:	$(FASTMAIL_OBJ) ../l
+ $(BINDIR)/frm:		$(FRM_OBJ) ../lib/libutil.a
+ 	$(CC) $(LFLAGS) -o $@ $(FRM_OBJ) ../lib/libutil.a $(LIBS)
+ 
+-$(BINDIR)/mmencode:	$(MMENCODE_OBJ) ../lib/libutil.a
+-	$(CC) $(LFLAGS) -o $@ $(MMENCODE_OBJ) ../lib/libutil.a $(LIBS)
+-
+ $(BINDIR)/newalias:	$(NEWALIAS_OBJ) ../lib/libutil.a
+ 	$(CC) $(LFLAGS) -o $@ $(NEWALIAS_OBJ) ../lib/libutil.a $(LIBS)
+ 
+@@ -244,7 +231,6 @@ $(DESTBIN)/frm:		$(BINDIR)/frm		; $(INST
+ $(DESTBIN)/nfrm:	$(DESTBIN)/frm		; $(INSTALL_LINK)
+ $(DESTBIN)/listalias:	$(BINDIR)/listalias	; $(INSTALL_EXE)
+ $(DESTBIN)/messages:	$(BINDIR)/messages	; $(INSTALL_EXE)
+-$(DESTBIN)/mmencode:	$(BINDIR)/mmencode	; $(INSTALL_EXE)
+ $(DESTBIN)/newalias:	$(BINDIR)/newalias	; $(INSTALL_EXE)
+ $(DESTBIN)/newmail:	$(BINDIR)/newmail	; $(INSTALL_EXE)
+ $(DESTBIN)/printmail:	$(BINDIR)/printmail	; $(INSTALL_EXE)