diff options
| author | jschauma <jschauma> | 2003-01-20 22:55:43 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2003-01-20 22:55:43 +0000 |
| commit | a989c8298e7e2047464bc46bf384810978ad6103 (patch) | |
| tree | 313a8e830f7a7c812f8133ef2e85296c56ea9e08 | |
| parent | 5a094f6ea75b48657a7ff019f099d75b437088a7 (diff) | |
| download | pkgsrc-a989c8298e7e2047464bc46bf384810978ad6103.tar.gz | |
Make this use ${CHMOD} rather than 'chmod', which may be in different
locations (and thus not even in the PATH), depending on the platform.
This partly adresses PR pkg/19804.
| -rw-r--r-- | mail/procmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/procmail/distinfo | 4 | ||||
| -rw-r--r-- | mail/procmail/patches/patch-ae | 20 |
3 files changed, 19 insertions, 9 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index b1b1a0e5619..463ffcf4001 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2002/10/21 07:22:10 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2003/01/20 22:55:43 jschauma Exp $ # DISTNAME= procmail-3.22 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.procmail.org/ COMMENT= Local mail delivery agent USE_BUILDLINK2= YES -MAKE_ENV= SHELL=${SH} +MAKE_ENV+= SHELL=${SH} CHMOD=${CHMOD} INSTALL_TARGET= install-suid install.man .include "../../mk/bsd.prefs.mk" diff --git a/mail/procmail/distinfo b/mail/procmail/distinfo index 1e11d41774a..f32eb8e3a38 100644 --- a/mail/procmail/distinfo +++ b/mail/procmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2001/11/08 12:05:58 bouyer Exp $ +$NetBSD: distinfo,v 1.7 2003/01/20 22:55:43 jschauma Exp $ SHA1 (procmail-3.22.tar.gz) = cd4e44c15559816453fd60349e5a32289f6f2965 Size (procmail-3.22.tar.gz) = 226817 bytes @@ -6,4 +6,4 @@ SHA1 (patch-aa) = 29d0b8bc73313fe655c97f7d5adafab5b9104309 SHA1 (patch-ab) = 5233a6033198dc2baec135a6fba987e7e2b89ff2 SHA1 (patch-ac) = fe2350e704546c2262d546bb615175dd0591ba8b SHA1 (patch-ad) = 569d357c6afb9d7644c8094878aec08d22ae609d -SHA1 (patch-ae) = 8c08d3e5f0eb01ce087aea2f94dbbc7bebf8d787 +SHA1 (patch-ae) = 91a3f83d41ba84e218a14c8bfc262fdbb1bc252c diff --git a/mail/procmail/patches/patch-ae b/mail/procmail/patches/patch-ae index c8f28e382e8..bb4cd9aebda 100644 --- a/mail/procmail/patches/patch-ae +++ b/mail/procmail/patches/patch-ae @@ -1,9 +1,18 @@ -$NetBSD: patch-ae,v 1.5 2001/06/29 17:19:08 wiz Exp $ +$NetBSD: patch-ae,v 1.6 2003/01/20 22:55:44 jschauma Exp $ -If these lines stay, `make install; make deinstall; make install' fails. +If the ``Housekeeping'' lines stay, `make install; make deinstall; make install' fails. ---- Makefile.1.orig Fri Jun 29 04:20:17 2001 -+++ Makefile.1 +--- Makefile.1.orig Tue Sep 11 00:53:09 2001 ++++ Makefile.1 Mon Jan 20 17:21:22 2003 +@@ -88,7 +88,7 @@ + @-$(MKDIRS) $(MAN1DIR) 2>$(DEVNULL); exit 0 + @-test -d $(MAN5DIR) || $(RM) $(MAN5DIR); exit 0 + @-$(MKDIRS) $(MAN5DIR) 2>$(DEVNULL); exit 0 +- @chmod 0644 $(MANS) ++ @${CHMOD} 0644 $(MANS) + @for a in $(MANS1S); \ + do $(INSTALL) new/$$a.1 $(MAN1DIR)/$$a.$(MAN1SUFFIX) || exit 1; \ + if test "X$(MANCOMPRESS)" != "X"; \ @@ -101,14 +101,12 @@ then $(MANCOMPRESS) -c new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \ else :; fi; \ @@ -12,7 +21,8 @@ If these lines stay, `make install; make deinstall; make install' fails. install.bin: $(BINS) $(BASENAME) @-$(MKDIRS) $(BINDIR) 2>$(DEVNULL); exit 0 - @chmod 0755 $(BINS) +- @chmod 0755 $(BINS) ++ @${CHMOD} 0755 $(BINS) $(INSTALL) $(BINS) $(BINDIR) @-dirname / >$(DEVNULL) || $(INSTALL) examples/dirname $(BINDIR) - echo Housekeeping file >install.bin |