diff -ruN vqadmin.old/Makefile /usr/ports/mail/vqadmin/Makefile
--- vqadmin.old/Makefile	Sat Mar 23 13:07:38 2002
+++ /usr/ports/mail/vqadmin/Makefile	Sat Jan 18 12:47:16 2003
@@ -6,18 +6,34 @@
 #
 
 PORTNAME=	vqadmin
-PORTVERSION=	2.2
+PORTVERSION=	2.3.4
 CATEGORIES=	mail
-MASTER_SITES= 	http://www.inter7.com/vqadmin/
+MASTER_SITES= 	http://www.inter7.com/devel/ \
+		http://www.inter7.com/vqadmin/
 
 MAINTAINER=	nbm@FreeBSD.org
 
+LIB_DEPENDS=	getline:${PORTSDIR}/devel/libgetline
 BUILD_DEPENDS= \
-        ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS= \
-        ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/www/cgi-bin.default/
+USE_REINPLACE=	YES
 
-.include <bsd.port.mk>
+CGI_ROOT?=${PREFIX}/www/cgi-bin.default
+DOC_ROOT?=${PREFIX}/www/htdocs
+
+CONFIGURE_ARGS=	--enable-cgibindir=${CGI_ROOT} \
+		--enable-htmldir=${DOC_ROOT}
+
+.include <bsd.port.pre.mk>
+
+PLIST_SUB+=	CGI_ROOT=${CGI_ROOT}
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.post.mk>
diff -ruN vqadmin.old/distinfo /usr/ports/mail/vqadmin/distinfo
--- vqadmin.old/distinfo	Sat Mar 23 13:07:38 2002
+++ /usr/ports/mail/vqadmin/distinfo	Sat Jan 18 12:14:34 2003
@@ -1 +1 @@
-MD5 (vqadmin-2.2.tar.gz) = 1584061e56a6bc7b5d4c5175c6b0cba6
+MD5 (vqadmin-2.3.4.tar.gz) = 0c285b0f4dbd481d09c77e1f4948dae6
diff -ruN vqadmin.old/files/patch-Makefile.in /usr/ports/mail/vqadmin/files/patch-Makefile.in
--- vqadmin.old/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ /usr/ports/mail/vqadmin/files/patch-Makefile.in	Sat Jan 18 12:27:10 2003
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Jan 18 12:25:01 2003
++++ Makefile.in	Sat Jan 18 12:26:45 2003
+@@ -96,7 +96,7 @@
+ 
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = -L%%LOCALBASE%%/lib -lgetline @LIBS@
+ vqadmin_OBJECTS =  vqadmin.o cgi.o template.o global.o acl.o misc.o \
+ domain.o lang.o user.o cedit.o
+ vqadmin_DEPENDENCIES = 
diff -ruN vqadmin.old/pkg-plist /usr/ports/mail/vqadmin/pkg-plist
--- vqadmin.old/pkg-plist	Sat Mar 23 13:07:38 2002
+++ /usr/ports/mail/vqadmin/pkg-plist	Sat Jan 18 12:48:19 2003
@@ -1,27 +1,35 @@
-bin/vqadmin
-www/cgi-bin.default/vqadmin/.htaccess
-www/cgi-bin.default/vqadmin/html/add_domain.html
-www/cgi-bin.default/vqadmin/html/add_user.html
-www/cgi-bin.default/vqadmin/html/auth_failed.html
-www/cgi-bin.default/vqadmin/html/br
-www/cgi-bin.default/vqadmin/html/del_domain.html
-www/cgi-bin.default/vqadmin/html/del_user.html
-www/cgi-bin.default/vqadmin/html/en
-www/cgi-bin.default/vqadmin/html/en-us
-www/cgi-bin.default/vqadmin/html/error.html
-www/cgi-bin.default/vqadmin/html/info_user.html
-www/cgi-bin.default/vqadmin/html/init_error.html
-www/cgi-bin.default/vqadmin/html/it
-www/cgi-bin.default/vqadmin/html/main.html
-www/cgi-bin.default/vqadmin/html/mod_domain.html
-www/cgi-bin.default/vqadmin/html/mod_user.html
-www/cgi-bin.default/vqadmin/html/show_domains.html
-www/cgi-bin.default/vqadmin/html/show_users.html
-www/cgi-bin.default/vqadmin/html/view_domain.html
-www/cgi-bin.default/vqadmin/html/view_user.html
-www/cgi-bin.default/vqadmin/vqadmin.acl
-www/cgi-bin.default/vqadmin/vqadmin.cgi
-@dirrm www/cgi-bin.default/vqadmin/html
-@dirrm www/cgi-bin.default/vqadmin
-@dirrm www/cgi-bin.default
-@dirrm www
+@cwd %%CGI_ROOT%%
+vqadmin/.htaccess
+vqadmin/html/add_alias_domain.html
+vqadmin/html/add_domain.html
+vqadmin/html/add_user.html
+vqadmin/html/auth_failed.html
+vqadmin/html/br
+vqadmin/html/control.html
+vqadmin/html/ctrl_file.html
+vqadmin/html/de
+vqadmin/html/del_domain.html
+vqadmin/html/del_user.html
+vqadmin/html/en
+vqadmin/html/en-us
+vqadmin/html/error.html
+vqadmin/html/fi
+vqadmin/html/fr
+vqadmin/html/info_user.html
+vqadmin/html/init_error.html
+vqadmin/html/it
+vqadmin/html/ja
+vqadmin/html/main.html
+vqadmin/html/mod_domain.html
+vqadmin/html/mod_user.html
+vqadmin/html/nl
+vqadmin/html/pl
+vqadmin/html/show_domains.html
+vqadmin/html/show_users.html
+vqadmin/html/view_domain.html
+vqadmin/html/view_user.html
+vqadmin/html/vqadmin.css
+vqadmin/vqadmin.acl
+vqadmin/vqadmin.cgi
+@dirrm vqadmin/html
+@dirrm vqadmin