summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2012-06-23 21:57:21 +0000
committerdholland <dholland@pkgsrc.org>2012-06-23 21:57:21 +0000
commit81f663f01b09abcfd15a2b152d2cfd7f04b55145 (patch)
treeb8b8e216307958feb7ab8e2332c99d902ee2a258 /mail
parent9aabb9be3c492a22f31950f2d412dcf20c268ae9 (diff)
downloadpkgsrc-81f663f01b09abcfd15a2b152d2cfd7f04b55145.tar.gz
Avoid forcibly setting MAKE in makefiles; it breaks things.
Diffstat (limited to 'mail')
-rw-r--r--mail/elm-me/distinfo4
-rw-r--r--mail/elm-me/patches/patch-ae20
2 files changed, 18 insertions, 6 deletions
diff --git a/mail/elm-me/distinfo b/mail/elm-me/distinfo
index 576cd4823d3..6159084d07f 100644
--- a/mail/elm-me/distinfo
+++ b/mail/elm-me/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2010/04/15 08:13:34 dholland Exp $
+$NetBSD: distinfo,v 1.6 2012/06/23 21:57:21 dholland Exp $
SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24
-SHA1 (patch-ae) = 600dbb380442dcbaef51c69d81847b400538bf0f
+SHA1 (patch-ae) = d8b63984cf2bc367e311904f6d98e2b8790d3592
SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
diff --git a/mail/elm-me/patches/patch-ae b/mail/elm-me/patches/patch-ae
index 3f59ad3dd44..a5dc5bf1753 100644
--- a/mail/elm-me/patches/patch-ae
+++ b/mail/elm-me/patches/patch-ae
@@ -1,8 +1,20 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-ae,v 1.2 2012/06/23 21:57:21 dholland Exp $
---- Makefile.SH.orig Tue Jun 19 19:03:16 2001
-+++ Makefile.SH Wed Jul 18 19:29:21 2001
-@@ -54,12 +54,12 @@
+- don't misuse $(MAKEFLAGES)
+- don't try to explicitly set $(MAKE), make does that
+
+--- Makefile.SH.orig 2001-06-19 17:03:16.000000000 +0000
++++ Makefile.SH
+@@ -34,7 +34,7 @@ cat >Makefile <<!GROK!THIS!
+ CAT = $cat
+ GREP = $grep
+ ECHO = $echo
+-MAKE = $make
++#MAKE = $make
+ PR = $pr
+ SHAR = $shar -s 60000
+ SLEEP = $sleep
+@@ -54,12 +54,12 @@ default_target: all
# Targets that are simply executed in each subordinate makefile as is
all install uninstall lint clean: config.h config.sh Makefile