[pkgsrc/trunk]: pkgsrc/mail/metamail Use ${MAKE} and ${INSTALL} instead of ma...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/673fdb2157b1
branches:  trunk
changeset: 463278:673fdb2157b1
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Nov 04 19:03:53 2003 +0000

description:
Use ${MAKE} and ${INSTALL} instead of make and install.
Also don't check for /usr/X11R6 before running mkfontdir.  This
package is already marked as USE_X11.  Fixes install on
Solaris and other systems which use bmake instead of make.

diffstat:

 mail/metamail/distinfo         |   6 +++---
 mail/metamail/patches/patch-aa |  15 +++++++++++----
 mail/metamail/patches/patch-ad |   6 +++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r a651fea509f7 -r 673fdb2157b1 mail/metamail/distinfo
--- a/mail/metamail/distinfo    Tue Nov 04 18:13:20 2003 +0000
+++ b/mail/metamail/distinfo    Tue Nov 04 19:03:53 2003 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2003/10/03 18:20:53 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
-SHA1 (patch-aa) = 9586ae34132f5c831473c5244187a7c7c66ad5bb
+SHA1 (patch-aa) = 5b03f920e11554af5f776ff352c85c06e2f8f8de
 SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
 SHA1 (patch-ac) = c2e0c044df30c3cc33c7f3ff2c620cd29816e1d6
-SHA1 (patch-ad) = f722790d8e72f58a0b351715aec9407506b0443f
+SHA1 (patch-ad) = a46353a5f6677f2388c50471eaee7cdff9f697d9
 SHA1 (patch-ae) = 1b8f88c25eb3b8e4a89e0c94b49f35ba0d809aa8
 SHA1 (patch-af) = 2bba73c3a2b11b0234b197e0e2236b17c60d5acb
 SHA1 (patch-ag) = d7dcd95194fad57b2863d165af427dd0d2b49bd5
diff -r a651fea509f7 -r 673fdb2157b1 mail/metamail/patches/patch-aa
--- a/mail/metamail/patches/patch-aa    Tue Nov 04 18:13:20 2003 +0000
+++ b/mail/metamail/patches/patch-aa    Tue Nov 04 19:03:53 2003 +0000
@@ -1,8 +1,15 @@
-$NetBSD: patch-aa,v 1.5 2003/10/03 18:20:53 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2003/11/04 19:03:53 dmcmahill Exp $
 
---- Makefile.orig      1994-01-26 18:32:33.000000000 +0100
+--- Makefile.orig      1994-01-26 12:32:33.000000000 -0500
 +++ Makefile
-@@ -26,7 +26,7 @@ MAKE = make
+@@ -20,13 +20,13 @@ RM = rm
+ # RM = rm -f
+ 
+ # How to run Make 
+-MAKE = make
++#MAKE = make
+ 
+ # How to copy files
  CP = cp
  
  # How to compile C programs
@@ -40,7 +47,7 @@
  #
  #INSTALL = cp
 -INSTALL = install -c -s
-+INSTALL = install -c
++#INSTALL = install -c -s
  
  # Root of installation tree
 -INSTROOT = /usr/local
diff -r a651fea509f7 -r 673fdb2157b1 mail/metamail/patches/patch-ad
--- a/mail/metamail/patches/patch-ad    Tue Nov 04 18:13:20 2003 +0000
+++ b/mail/metamail/patches/patch-ad    Tue Nov 04 19:03:53 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:40 agc Exp $
+$NetBSD: patch-ad,v 1.3 2003/11/04 19:03:53 dmcmahill Exp $
 
 *** fonts/Makefile.orig        Mon May 31 22:49:27 1993
 --- fonts/Makefile     Thu May 18 21:55:42 1995
@@ -29,9 +29,9 @@
 + 
 + install:
 +      mkdir -p ${PREFIX}/lib/metamail/fonts
-+      install -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
++      ${INSTALL} -c heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} \
 +              heb8x13B.${FONTSUFFIX} fonts.alias ${PREFIX}/lib/metamail/fonts
-+      if [ -d /usr/X11R6 ]; then mkfontdir ${PREFIX}/lib/metamail/fonts ; fi
++      mkfontdir ${PREFIX}/lib/metamail/fonts 
   
   clean:
        rm -f heb6x13.${FONTSUFFIX} heb8x13.${FONTSUFFIX} heb8x13B.${FONTSUFFIX}  shownonascii mailto-hebrew fonts.dir