diff options
| author | roam <roam@FreeBSD.org> | 2006-09-23 20:38:02 +0800 |
|---|---|---|
| committer | roam <roam@FreeBSD.org> | 2006-09-23 20:38:02 +0800 |
| commit | 48c1c30f5f65c4e95b4c454f398e67045dcc6eaf (patch) | |
| tree | 60244572b39ece209e2e7aa0f9e505c27c99c241 /mail/vpopmail | |
| parent | 14a5d38c0d30a527a2eb5e7de4cbe6100cfefc35 (diff) | |
| download | freebsd-ports-graphics-48c1c30f5f65c4e95b4c454f398e67045dcc6eaf.tar.gz freebsd-ports-graphics-48c1c30f5f65c4e95b4c454f398e67045dcc6eaf.tar.zst freebsd-ports-graphics-48c1c30f5f65c4e95b4c454f398e67045dcc6eaf.zip | |
Fix package installation - in most cases, the vpopmail package (if built)
would be installed with the wrong home directory for the vpopmail user.
PR: 103177
Submitted by: oliver
Diffstat (limited to 'mail/vpopmail')
| -rw-r--r-- | mail/vpopmail/Makefile | 2 | ||||
| -rw-r--r-- | mail/vpopmail/pkg-install | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index ca793c5159a..c54b3678e42 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -296,7 +296,7 @@ CONFIGURE_ARGS+= --enable-spamassassin=${LOCALBASE}/bin/spamc \ # pre-configure: - @PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL} + @PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} .if defined(WITH_PGSQL) .if defined(WITH_PGSQL_DB) ${REINPLACE_CMD} -E -e "s/(#define DB.*)vpopmail(.*)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h diff --git a/mail/vpopmail/pkg-install b/mail/vpopmail/pkg-install index 10160247277..f435231eea4 100644 --- a/mail/vpopmail/pkg-install +++ b/mail/vpopmail/pkg-install @@ -50,7 +50,7 @@ if (! getpwnam ("alias")) { do checkrpw; # May exit $x = "-u $uids{'alias'}"; - $result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x"); + $result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/vpopmail/alias\" -s /nonexistent $x"); if ($result) { die "Failed to add user alias as uid $uids{'alias'}\n"; } @@ -61,7 +61,7 @@ foreach $user (keys %users) { do checkrpw; # May exit $x = "-u $uids{$user}"; - $result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x"); + $result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}/vpopmail\" -s /nonexistent $x"); if ($result) { die "Failed to add user $user as uid $uids{$user}\n"; } |