6 files changed, 94 insertions, 70 deletions

diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index 8784035e582d..e62e89914029 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	vqadmin
-PORTVERSION=	2.3.5
+PORTVERSION=	2.3.6
 CATEGORIES=	mail
-MASTER_SITES= 	http://www.inter7.com/devel/ \
-		http://www.inter7.com/vqadmin/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	vqadmin
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A cgi-based Virtual Qmail Domains Administrator
@@ -19,13 +19,14 @@ BUILD_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS=	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 
 GNU_CONFIGURE=	YES
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	YES
 
-CGIBINDIR?=	${PREFIX}/www/cgi-bin.default
-WEBDATADIR?=	${PREFIX}/www/data.default
+CGIBINDIR?=	www/cgi-bin-dist
+WEBDATADIR?=	www/data-dist
 
-CONFIGURE_ARGS=	--enable-cgibindir=${CGIBINDIR} \
-		--enable-htmldir=${WEBDATADIR}
+CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR} \
+		--enable-htmldir=${PREFIX}/${WEBDATADIR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/mail/vqadmin/distinfo b/mail/vqadmin/distinfo
index 02244d1b9656..95a1535807d0 100644
--- a/mail/vqadmin/distinfo
+++ b/mail/vqadmin/distinfo
@@ -1,2 +1,2 @@
-MD5 (vqadmin-2.3.5.tar.gz) = 9e902db9b8143bc81485c80b00cd01e9
-SIZE (vqadmin-2.3.5.tar.gz) = 83717
+MD5 (vqadmin-2.3.6.tar.gz) = b808aabaf3f6eee8633217b50cb40f25
+SIZE (vqadmin-2.3.6.tar.gz) = 155771
diff --git a/mail/vqadmin/files/patch-Makefile.in b/mail/vqadmin/files/patch-Makefile.in
index b176820633d2..734cd2117e71 100644
--- a/mail/vqadmin/files/patch-Makefile.in
+++ b/mail/vqadmin/files/patch-Makefile.in
@@ -1,11 +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 @@
- 
+@@ -120,7 +120,7 @@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I. 
  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 = 
+ depcomp =
+ am__depfiles_maybe =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/mail/vqadmin/files/patch-config.h.in b/mail/vqadmin/files/patch-config.h.in
new file mode 100644
index 000000000000..861d3791060e
--- /dev/null
+++ b/mail/vqadmin/files/patch-config.h.in
@@ -0,0 +1,21 @@
+--- config.h.in.orig	Sun Apr 18 13:58:25 2004
++++ config.h.in	Sun Apr 18 13:58:49 2004
+@@ -61,18 +61,6 @@
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+-/* Define to the full name of this package. */
+-#undef PACKAGE_NAME
+-
+-/* Define to the full name and version of this package. */
+-#undef PACKAGE_STRING
+-
+-/* Define to the one symbol short name of this package. */
+-#undef PACKAGE_TARNAME
+-
+-/* Define to the version of this package. */
+-#undef PACKAGE_VERSION
+-
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
diff --git a/mail/vqadmin/files/patch-configure b/mail/vqadmin/files/patch-configure
index d2d4f823f804..5cbe4776d914 100644
--- a/mail/vqadmin/files/patch-configure
+++ b/mail/vqadmin/files/patch-configure
@@ -1,30 +1,30 @@
---- configure.orig	Fri Feb 21 18:40:17 2003
-+++ configure	Fri Feb 21 18:43:08 2003
-@@ -1389,19 +1389,17 @@
+--- configure.orig	Wed Sep 17 23:21:39 2003
++++ configure	Sun Apr 18 13:50:48 2004
+@@ -3355,19 +3355,15 @@
  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 
+-    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
- 
+-
++if test "${enable_htmldir+set}" = set; then
++  enableval="$enable_htmldir"
++  wwwroot="$enableval"
++else
++  if test "$wwwroot" = ""
++  then
++  { echo "configure: error: Unable to find your html directory, specify --enable-htmldir." 1>&2; exit 1; }
++  fi
 +fi
  
  
diff --git a/mail/vqadmin/pkg-plist b/mail/vqadmin/pkg-plist
index c468a1dd378b..c0580387f690 100644
--- a/mail/vqadmin/pkg-plist
+++ b/mail/vqadmin/pkg-plist
@@ -1,43 +1,45 @@
 bin/vqadmin
-@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/hu
-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
+%%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
+%%WEBDATADIR%%/images/vqadmin/vqadmin.css
+@dirrm %%CGIBINDIR%%/vqadmin/html
+@dirrm %%CGIBINDIR%%/vqadmin
+@dirrm %%WEBDATADIR%%/images/vqadmin
+@dirrm %%WEBDATADIR%%/images