diff options
| author | jmmv <jmmv> | 2003-07-02 11:32:35 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-07-02 11:32:35 +0000 |
| commit | 4f348cb08a259cb5a979e67077d0929d6e0b0a8b (patch) | |
| tree | 6b25fc79e3fc4f59cef36b9c242291ffad5e525b /mail | |
| parent | ac7f9e623af95ddb5c15773a555eb25d718e105f (diff) | |
| download | pkgsrc-4f348cb08a259cb5a979e67077d0929d6e0b0a8b.tar.gz | |
Avoid hardcoding /usr/pkg in patch files.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/deliver/Makefile | 7 | ||||
| -rw-r--r-- | mail/deliver/distinfo | 4 | ||||
| -rw-r--r-- | mail/deliver/patches/patch-af | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile index 35e2d31594b..3d2c5320175 100644 --- a/mail/deliver/Makefile +++ b/mail/deliver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/06/02 01:18:49 jschauma Exp $ +# $NetBSD: Makefile,v 1.3 2003/07/02 11:32:35 jmmv Exp $ DISTNAME= deliver-2.1.14 CATEGORIES= mail @@ -19,11 +19,12 @@ DELIVER_SUID?= NO # identify the "sys", "post", and "err" delivery files as owned by deliver. DELIVER_CONF_PREFIX?= ${PREFIX}/etc/deliver/ -post-patch: +pre-configure: cd ${WRKSRC}; \ - for FILE in config.h deliver.8; do \ + for FILE in config.h deliver.8 conf/os-netbsd.h; do \ ${MV} $${FILE} $${FILE}.bak; \ ${SED} -e 's#@DELIVER_CONF_PREFIX@#${DELIVER_CONF_PREFIX}#g' \ + -e 's#@PREFIX@#${PREFIX}#g' \ < $${FILE}.bak > $${FILE}; \ done; \ ${MV} deliver.8 deliver.1 diff --git a/mail/deliver/distinfo b/mail/deliver/distinfo index edb846191d3..a544a28733d 100644 --- a/mail/deliver/distinfo +++ b/mail/deliver/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2003/02/08 17:23:07 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2003/07/02 11:32:36 jmmv Exp $ SHA1 (deliver-2.1.14.tar.gz) = 77d591f29b8829b3c347eb107a427ad826ffca99 Size (deliver-2.1.14.tar.gz) = 80892 bytes @@ -7,6 +7,6 @@ SHA1 (patch-ab) = 719d400005844fe824bab7106c97f66e4c8867b3 SHA1 (patch-ac) = 2f47891e3bc46aec12c93a647fbd751397b7d9fe SHA1 (patch-ad) = 0404e117fda6f03ddc99c819353925c8714fced2 SHA1 (patch-ae) = a4e478765a240a2099c101ddd2d6abf3ddcf0ba2 -SHA1 (patch-af) = 88f00520492a1906e81627e4e4cd9ba6c3858eef +SHA1 (patch-af) = e232661038a8b33d7abdf8aead754a38143011f4 SHA1 (patch-ag) = 1ea8ca73ce2f930444cdcb3a09f49a11926bf3da SHA1 (patch-ah) = 380e17b0e1dc659013be50e75ea0141b94081681 diff --git a/mail/deliver/patches/patch-af b/mail/deliver/patches/patch-af index 9b816f4faab..aab0535623e 100644 --- a/mail/deliver/patches/patch-af +++ b/mail/deliver/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/04/27 14:06:06 wiz Exp $ +$NetBSD: patch-af,v 1.2 2003/07/02 11:32:36 jmmv Exp $ --- /dev/null Sat Jan 29 20:16:40 2000 +++ conf/os-netbsd.h Sat Jan 29 20:47:21 2000 @@ -15,7 +15,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/04/27 14:06:06 wiz Exp $ +/* Then again... */ + +#undef SAFEPATH -+#define SAFEPATH "/bin:/usr/bin:/usr/pkg/bin" /* Safe dirs for PATH */ ++#define SAFEPATH "/bin:/usr/bin:@PREFIX@/bin" /* Safe dirs for PATH */ + +#undef SYSV_USRMAIL /* Mailboxes in /usr/mail, as per SysV */ +#define MBX_DIR "/var/mail" |