Index: head/mail/vqadmin/Makefile
===================================================================
--- head/mail/vqadmin/Makefile	(revision 398719)
+++ head/mail/vqadmin/Makefile	(revision 398720)
@@ -1,35 +1,33 @@
 # Created by: nbm
 # $FreeBSD$
 
 PORTNAME=	vqadmin
 PORTVERSION=	2.3.6
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI-based Virtual Qmail Domains Administrator
 
 BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 
 GNU_CONFIGURE=	YES
 
 USES=		qmail:vars
 
 CGIBINDIR?=	www/cgi-bin-dist
 WEBDATADIR?=	www/data-dist
 
 CONFIGURE_ARGS=	--enable-cgibindir=${STAGEDIR}${PREFIX}/${CGIBINDIR} \
 		--enable-htmldir=${STAGEDIR}${PREFIX}/${WEBDATADIR} \
 		--enable-qmaildir=${QMAIL_PREFIX}
 
-.include <bsd.port.pre.mk>
-
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} WEBDATADIR=${WEBDATADIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/mail/vqadmin/files/patch-Makefile.in
===================================================================
--- head/mail/vqadmin/files/patch-Makefile.in	(revision 398719)
+++ head/mail/vqadmin/files/patch-Makefile.in	(revision 398720)
@@ -1,11 +1,44 @@
---- Makefile.in.orig	Sat Jan 18 12:25:01 2003
-+++ Makefile.in	Sat Jan 18 12:26:45 2003
-@@ -120,7 +120,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I. 
+--- Makefile.in.orig	2003-09-17 21:21:38 UTC
++++ Makefile.in
+@@ -120,7 +120,7 @@ vqadmin_LDFLAGS =
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
 +LIBS = -L%%LOCALBASE%%/lib @LIBS@
  depcomp =
  am__depfiles_maybe =
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -527,32 +527,12 @@ install-data-local:
+ 		cp vqadmin.acl     @cgibindir@/vqadmin ; \
+ 	fi
+ 
+-	chown              @vpopuser@ @cgibindir@/vqadmin
+-	chgrp              @vpopgroup@ @cgibindir@/vqadmin
+-	chown -R           @vpopuser@ @cgibindir@/vqadmin/*
+-	chgrp -R           @vpopgroup@ @cgibindir@/vqadmin/*
+-	chown root         @cgibindir@/vqadmin/vqadmin.cgi
+-	chgrp `id -g root` @cgibindir@/vqadmin/vqadmin.cgi
+-	chmod u+s,g+s      @cgibindir@/vqadmin/vqadmin.cgi 
+-	chmod 755          @cgibindir@/vqadmin
+-	chmod 755          @cgibindir@/vqadmin/html
+-
+-	chown              @vpopuser@ @wwwroot@/images/vqadmin
+-	chgrp              @vpopgroup@ @wwwroot@/images/vqadmin
+-	chown -R           @vpopuser@ @wwwroot@/images/vqadmin/*
+-	chgrp -R           @vpopgroup@ @wwwroot@/images/vqadmin/*
+-	chmod 755          @wwwroot@/images/vqadmin
+-
+ 	if test -f @cgibindir@/vqadmin/.htaccess ; then \
+ 		echo ".htaccess file already in place" ; \
+ 	else \
+ 		cp htaccess        @cgibindir@/vqadmin/.htaccess ; \
+ 	fi
+ 
+-	chown nobody       @cgibindir@/vqadmin/.htaccess
+-	chmod u+rw         @cgibindir@/vqadmin/.htaccess
+-	chmod go+r         @cgibindir@/vqadmin/.htaccess
+-
+ acl.o: config.h
+ cedit.o: config.h
+ cgi.o: config.h
Index: head/mail/vqadmin/pkg-plist
===================================================================
--- head/mail/vqadmin/pkg-plist	(revision 398719)
+++ head/mail/vqadmin/pkg-plist	(revision 398720)
@@ -1,41 +1,48 @@
 bin/vqadmin
-%%CGIBINDIR%%/vqadmin/.htaccess
+@owner vpopmail
+@group vchkpw
+@(nobody,,644) %%CGIBINDIR%%/vqadmin/.htaccess
 %%CGIBINDIR%%/vqadmin/html/add_alias_domain.html
 %%CGIBINDIR%%/vqadmin/html/add_domain.html
 %%CGIBINDIR%%/vqadmin/html/add_domain_body.html
 %%CGIBINDIR%%/vqadmin/html/add_domain_foot.html
 %%CGIBINDIR%%/vqadmin/html/add_domain_head.html
 %%CGIBINDIR%%/vqadmin/html/add_user.html
 %%CGIBINDIR%%/vqadmin/html/auth_failed.html
 %%CGIBINDIR%%/vqadmin/html/br
 %%CGIBINDIR%%/vqadmin/html/control.html
 %%CGIBINDIR%%/vqadmin/html/ctrl_file.html
 %%CGIBINDIR%%/vqadmin/html/de
 %%CGIBINDIR%%/vqadmin/html/del_domain.html
 %%CGIBINDIR%%/vqadmin/html/del_user.html
 %%CGIBINDIR%%/vqadmin/html/en
 %%CGIBINDIR%%/vqadmin/html/en-us
 %%CGIBINDIR%%/vqadmin/html/error.html
 %%CGIBINDIR%%/vqadmin/html/fi
 %%CGIBINDIR%%/vqadmin/html/fr
 %%CGIBINDIR%%/vqadmin/html/info_user.html
 %%CGIBINDIR%%/vqadmin/html/init_error.html
 %%CGIBINDIR%%/vqadmin/html/hu
 %%CGIBINDIR%%/vqadmin/html/it
 %%CGIBINDIR%%/vqadmin/html/ja
 %%CGIBINDIR%%/vqadmin/html/main.html
 %%CGIBINDIR%%/vqadmin/html/mod_domain.html
 %%CGIBINDIR%%/vqadmin/html/mod_user.html
 %%CGIBINDIR%%/vqadmin/html/my_main.html
 %%CGIBINDIR%%/vqadmin/html/nl
 %%CGIBINDIR%%/vqadmin/html/pl
 %%CGIBINDIR%%/vqadmin/html/qmail_controls_bottom.html
 %%CGIBINDIR%%/vqadmin/html/qmail_controls_middle.html
 %%CGIBINDIR%%/vqadmin/html/qmail_controls_top.html
 %%CGIBINDIR%%/vqadmin/html/show_domains.html
 %%CGIBINDIR%%/vqadmin/html/show_users.html
 %%CGIBINDIR%%/vqadmin/html/view_domain.html
 %%CGIBINDIR%%/vqadmin/html/view_user.html
 %%CGIBINDIR%%/vqadmin/vqadmin.acl
-%%CGIBINDIR%%/vqadmin/vqadmin.cgi
+@(root,wheel,6755) %%CGIBINDIR%%/vqadmin/vqadmin.cgi
 %%WEBDATADIR%%/images/vqadmin/vqadmin.css
+@dir(,,755) %%WEBDATADIR%%/images/vqadmin
+@dir(,,755) %%CGIBINDIR%%/vqadmin/html
+@dir(,,755) %%CGIBINDIR%%/vqadmin
+@owner
+@group