summaryrefslogtreecommitdiff
path: root/mail/elm/patches/patch-ae
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-04-23 14:36:36 +0000
committerjschauma <jschauma@pkgsrc.org>2003-04-23 14:36:36 +0000
commit57c3a14ce927bacc14980d42d847e87d98b3e475 (patch)
tree523601081142af8308c3de541f7f155e2457a2a8 /mail/elm/patches/patch-ae
parent9f56040e31eff8b8bc4a80060af50dbd8c4b2313 (diff)
downloadpkgsrc-57c3a14ce927bacc14980d42d847e87d98b3e475.tar.gz
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.
Diffstat (limited to 'mail/elm/patches/patch-ae')
-rw-r--r--mail/elm/patches/patch-ae70
1 files changed, 65 insertions, 5 deletions
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)
+