Index: vpopmail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- vpopmail/Makefile	17 Jul 2006 05:51:32 -0000	1.65
+++ vpopmail/Makefile	12 Sep 2006 05:34:43 -0000
@@ -296,7 +296,7 @@
 #
 
 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
Index: vpopmail/pkg-install
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- vpopmail/pkg-install	4 Jul 2001 15:34:48 -0000	1.2
+++ vpopmail/pkg-install	12 Sep 2006 05:34:43 -0000
@@ -50,7 +50,7 @@
 	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 @@
 		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";
 		}
Index: vpopmail-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail-devel/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- vpopmail-devel/Makefile	10 May 2006 22:37:04 -0000	1.51
+++ vpopmail-devel/Makefile	12 Sep 2006 05:34:44 -0000
@@ -269,7 +269,7 @@
 #
 
 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
Index: vpopmail-devel/pkg-install
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail-devel/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- vpopmail-devel/pkg-install	4 Jul 2001 15:34:48 -0000	1.2
+++ vpopmail-devel/pkg-install	12 Sep 2006 05:34:44 -0000
@@ -50,7 +50,7 @@
 	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 @@
 		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";
 		}