5 files changed, 108 insertions, 37 deletions

diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index 1212068f4d00..4f802f0efad9 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -6,19 +6,34 @@
 #
 
 PORTNAME=	vqadmin
-PORTVERSION=	2.2
+PORTVERSION=	2.3.5
 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
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A 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
+LIB_DEPENDS=	getline.1:${PORTSDIR}/devel/libgetline
+BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/www/cgi-bin.default/
+USE_REINPLACE=	YES
+
+CGIBINDIR?=	${PREFIX}/www/cgi-bin.default
+WEBDATADIR?=	${PREFIX}/www/data.default
+
+CONFIGURE_ARGS=	--enable-cgibindir=${CGIBINDIR} \
+		--enable-htmldir=${WEBDATADIR}
+
+.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>
diff --git a/mail/vqadmin/distinfo b/mail/vqadmin/distinfo
index 49d624061109..67194c46c97c 100644
--- a/mail/vqadmin/distinfo
+++ b/mail/vqadmin/distinfo
@@ -1 +1 @@
-MD5 (vqadmin-2.2.tar.gz) = 1584061e56a6bc7b5d4c5175c6b0cba6
+MD5 (vqadmin-2.3.5.tar.gz) = 38636d74f6d919e97bbe55c3a096444b
diff --git a/mail/vqadmin/files/patch-Makefile.in b/mail/vqadmin/files/patch-Makefile.in
new file mode 100644
index 000000000000..b176820633d2
--- /dev/null
+++ b/mail/vqadmin/files/patch-Makefile.in
@@ -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 --git a/mail/vqadmin/files/patch-configure b/mail/vqadmin/files/patch-configure
new file mode 100644
index 000000000000..d2d4f823f804
--- /dev/null
+++ b/mail/vqadmin/files/patch-configure
@@ -0,0 +1,31 @@
+--- configure.orig	Fri Feb 21 18:40:17 2003
++++ configure	Fri Feb 21 18:43:08 2003
+@@ -1389,19 +1389,17 @@
+ cgibindir=""
+ wwwroot=""
+ 
+-for f in /home/httpd /usr/local/apache /usr/local/www /var/lib/httpd /var/www /usr/local/www /var/www
+-do
+-    if test -d $f/html
+-    then 
+-        wwwroot=$f/html
+-    fi
++if test "${enable_htmldir+set}" = set; then
++  enableval="$enable_htmldir"
++  wwwroot="$enableval"
++else
+ 
+-    if test -d $f/cgi-bin
+-    then
+-        cgibindir=$f/cgi-bin
+-    fi
+-done
++        if test "$wwwroot" = ""
++        then
++            { echo "configure: error: Unable to find your html directory, specify --enable-htmldir." 1>&2; exit 1; }
++        fi
+ 
++fi
+ 
+ 
+ # Check whether --enable-cgibindir or --disable-cgibindir was given.
diff --git a/mail/vqadmin/pkg-plist b/mail/vqadmin/pkg-plist
index 5968455558eb..cf78e7549656 100644
--- a/mail/vqadmin/pkg-plist
+++ b/mail/vqadmin/pkg-plist
@@ -1,27 +1,41 @@
-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 %%CGIBINDIR%%
+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/qmail_controls_bottom.html
+vqadmin/html/qmail_controls_middle.html
+vqadmin/html/qmail_controls_top.html
+vqadmin/html/show_domains.html
+vqadmin/html/show_users.html
+vqadmin/html/view_domain.html
+vqadmin/html/view_user.html
+vqadmin/vqadmin.acl
+vqadmin/vqadmin.cgi
+@dirrm vqadmin/html
+@dirrm vqadmin
+@cwd %%WEBDATADIR%%
+images/vqadmin/vqadmin.css
+@dirrm images/vqadmin
+@dirrm images