diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2004-01-31 15:27:22 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2004-01-31 15:27:22 +0000 |
| commit | 06a6053bab340c10a356f152c0dd445b0d5e7814 (patch) | |
| tree | deb46a8de2e3af52e979cc0d26b87b11e8356de7 /mail | |
| parent | - Update to version 2.0.6 (diff) | |
Fix creation of /var/log/exim, which I botched when making EXIM_USER
and EXIM_GROUP operator-overidable.
Submitted by: eik
Notes
Notes:
svn path=/head/; revision=99623
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/exim/Makefile | 14 | ||||
| -rw-r--r-- | mail/exim/pkg-install | 8 | ||||
| -rw-r--r-- | mail/exim/pkg-plist | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 30c1983fbeff..b83bfe3a0474 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -368,12 +368,16 @@ RC_SUFX= .sh SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ + -e 's,%%EXIM_USER%%,${EXIM_USER},g' \ + -e 's,%%EXIM_GROUP%%,${EXIM_GROUP},g' \ -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ -e 's,%%RC_DIR%%,${RC_DIR},g' \ -e 's,%%RC_SUFX%%,${RC_SUFX},g' PLIST_SUB+= RC_DIR=${RC_DIR} \ - RC_SUFX=${RC_SUFX} + RC_SUFX=${RC_SUFX} \ + EXIM_USER=${EXIM_USER} \ + EXIM_GROUP=${EXIM_GROUP} .if ${OSVERSION} < 400014 WITHOUT_IPV6= yes @@ -395,12 +399,8 @@ pre-everything:: do-configure: @${MKDIR} ${WRKSRC}/Local @${SED} ${SEDLIST} ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile - @${SED} -e 's/XX_EXIM_USER_XX/${EXIM_USER}/' \ - -e 's/XX_EXIM_GROUP_XX/${EXIM_GROUP}/' \ - < ${PKGDIR}/pkg-install > ${PKGINSTALL} - @${REINPLACE_CMD} -e 's/XX_EXIM_USER_XX/${EXIM_USER}/' \ - -e 's/XX_EXIM_GROUP_XX/${EXIM_GROUP}/' \ - ${WRKSRC}/src/configure.default + @${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-install > ${PKGINSTALL} + @${REINPLACE_CMD} ${SEDLIST} ${WRKSRC}/src/configure.default @${REINPLACE_CMD} -e 's/"(Exim $$version_number)\\n\\t"/"(Exim $$version_number; ${OPSYS})\\n\\t"/' \ ${WRKSRC}/src/globals.c @${REINPLACE_CMD} -e 's/^#include "cnumber\.h"$$/${PORTREVISION}/' ${WRKSRC}/src/version.c diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install index 81c3e5050026..d68718153f20 100644 --- a/mail/exim/pkg-install +++ b/mail/exim/pkg-install @@ -11,10 +11,10 @@ # $FreeBSD$ # -PKG_PREFIX=${PKG_PREFIX:=/usr/local} +PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -user=XX_EXIM_USER_XX -group=XX_EXIM_GROUP_XX +user=%%EXIM_USER%% +group=%%EXIM_GROUP%% if [ "$2" = "PRE-INSTALL" ]; then if ! /usr/bin/id ${user} > /dev/null; then @@ -25,6 +25,8 @@ if [ "$2" = "PRE-INSTALL" ]; then echo "Exim requires group ${group}. Please update your system." 1>&2 exit 1 fi + /bin/mkdir -p /var/log/exim + /usr/sbin/chown ${user}:${group} /var/log/exim fi if [ "$2" = "POST-INSTALL" ]; then diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index 352acdc0c6c5..f5f8d843bfe8 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -46,6 +46,4 @@ etc/exim/configure.default @unexec rmdir %B 2>/dev/null || true @cwd %%RC_DIR%% exim%%RC_SUFX%% -@exec mkdir -p /var/log/exim -@exec chown mailnull:mail /var/log/exim @unexec rmdir /var/log/exim 2>/dev/null || true |