Attachment #70763 for bug #103177

View | Details | Raw Unified | Return to bug 103177
Collapse All | Expand All

Lines 296-302 Link Here

(-)vpopmail/Makefile (-1 / +1 lines)
296	#	296	#
297		297
298	pre-configure:	298	pre-configure:
299	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}	299	@PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL}
300	.if defined(WITH_PGSQL)	300	.if defined(WITH_PGSQL)
301	.if defined(WITH_PGSQL_DB)	301	.if defined(WITH_PGSQL_DB)
302	${REINPLACE_CMD} -E -e "s/(#define DB.)vpopmail(.)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h	302	${REINPLACE_CMD} -E -e "s/(#define DB.)vpopmail(.)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h

Lines 50-56 Link Here

(-)vpopmail/pkg-install (-2 / +2 lines)
50	do checkrpw; # May exit	50	do checkrpw; # May exit
51		51
52	$x = "-u $uids{'alias'}";	52	$x = "-u $uids{'alias'}";
53	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");	53	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/vpopmail/alias\" -s /nonexistent $x");
54	if ($result) {	54	if ($result) {
55	die "Failed to add user alias as uid $uids{'alias'}\n";	55	die "Failed to add user alias as uid $uids{'alias'}\n";
56	}	56	}
Lines 61-67 Link Here
61	do checkrpw; # May exit	61	do checkrpw; # May exit
62		62
63	$x = "-u $uids{$user}";	63	$x = "-u $uids{$user}";
64	$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");	64	$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}/vpopmail\" -s /nonexistent $x");
65	if ($result) {	65	if ($result) {
66	die "Failed to add user $user as uid $uids{$user}\n";	66	die "Failed to add user $user as uid $uids{$user}\n";
67	}	67	}

Lines 269-275 Link Here

(-)vpopmail-devel/Makefile (-1 / +1 lines)
269	#	269	#
270		270
271	pre-configure:	271	pre-configure:
272	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}	272	@PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL}
273	.if defined(WITH_PGSQL)	273	.if defined(WITH_PGSQL)
274	.if defined(WITH_PGSQL_DB)	274	.if defined(WITH_PGSQL_DB)
275	${REINPLACE_CMD} -E -e "s/(#define DB.)vpopmail(.)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h	275	${REINPLACE_CMD} -E -e "s/(#define DB.)vpopmail(.)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h

Lines 50-56 Link Here

(-)vpopmail-devel/pkg-install (-2 / +2 lines)
50	do checkrpw; # May exit	50	do checkrpw; # May exit
51		51
52	$x = "-u $uids{'alias'}";	52	$x = "-u $uids{'alias'}";
53	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");	53	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/vpopmail/alias\" -s /nonexistent $x");
54	if ($result) {	54	if ($result) {
55	die "Failed to add user alias as uid $uids{'alias'}\n";	55	die "Failed to add user alias as uid $uids{'alias'}\n";
56	}	56	}
Lines 61-67 Link Here
61	do checkrpw; # May exit	61	do checkrpw; # May exit
62		62
63	$x = "-u $uids{$user}";	63	$x = "-u $uids{$user}";
64	$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");	64	$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}/vpopmail\" -s /nonexistent $x");
65	if ($result) {	65	if ($result) {
66	die "Failed to add user $user as uid $uids{$user}\n";	66	die "Failed to add user $user as uid $uids{$user}\n";
67	}	67	}

Return to bug 103177