diff options
| author | schmonz <schmonz> | 2006-01-11 05:48:19 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2006-01-11 05:48:19 +0000 |
| commit | 68547a9d41b3a095364545eeb7d6bf41abfb0201 (patch) | |
| tree | b02ddcd69fbb65f4095a958bbb5beec6f7364b5e | |
| parent | 8308b7d02f9f5d9f5e9b0ebe0316d802b05c7f12 (diff) | |
| download | pkgsrc-68547a9d41b3a095364545eeb7d6bf41abfb0201.tar.gz | |
Since qmail and related packages install into ${PREFIX} (and have
for a while now), we no longer need to add ${QMAILDIR} in PLIST_SUBST
or MESSAGE_SUBST. Noticed by jlam.
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d5824eb209c..3ab3ccd800e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1785 2006/01/05 23:18:26 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1786 2006/01/11 05:48:19 schmonz Exp $ # # This file is in the public domain. # @@ -498,7 +498,6 @@ PLIST_SUBST+= OPSYS=${OPSYS:Q} \ RMDIR=${RMDIR:Q} \ RM=${RM:Q} \ TRUE=${TRUE:Q} \ - QMAILDIR=${QMAILDIR:Q} \ PKGMANDIR=${PKGMANDIR:Q} # Handle alternatives @@ -552,8 +551,7 @@ MESSAGE_SUBST+= PKGNAME=${PKGNAME} \ X11BASE=${X11BASE} \ PKG_SYSCONFDIR=${PKG_SYSCONFDIR} \ ROOT_GROUP=${ROOT_GROUP} \ - ROOT_USER=${ROOT_USER} \ - QMAILDIR=${QMAILDIR} + ROOT_USER=${ROOT_USER} MESSAGE_SUBST_SED= ${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/} .endif |