3 files changed, 49 insertions, 31 deletions

diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 35c2ecc6e442..83bb3dbc0231 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	qmailadmin
-PORTVERSION=	0.45
+PORTVERSION=	1.0.1
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.inter7.com/qmailadmin/
 
-MAINTAINER=	nbm@FreeBSD.org
+MAINTAINER=	roam@FreeBSD.org
 
 BUILD_DEPENDS= \
 	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
@@ -36,12 +36,20 @@ USE_GMAKE=	YES
 # WEBDATASUBDIR - subdirectory to place html files in (not working yet)
 #
 
-CGIBINDIR?=	${PREFIX}/www/cgi-bin.default
+CGIBINDIR?=	www/cgi-bin.default
 CGIBINSUBDIR?=	qmailadmin
 CGIBINURL?=	cgi-bin
-WEBDATADIR?=	${PREFIX}/www/data.default
+WEBDATADIR?=	www/data.default
 WEBDATASUBDIR?=
 
+# I'm working on this..
+.if ${WEBDATASUBDIR} != ""
+BROKEN=	do not set WEBDATASUBDIR: qmailadmin is a bit buggy in that respect
+.endif
+
+PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
+		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
+
 #
 # QMAIL_DIR     - location of qmail directory
 #
@@ -55,8 +63,8 @@ QMAIL_DIR?=	/var/qmail
 # End of user-configurable variables
 
 CONFIGURE_ARGS+=	\
-	--enable-htmldir=${WEBDATADIR}/${WEBDATASUBDIR} \
-	--enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \
+	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
+	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 	--with-htmllibdir=${PREFIX}/share/qmailadmin \
 	--enable-cgipath=/${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \
 	--enable-ezmlmidx=y
diff --git a/mail/qmailadmin/distinfo b/mail/qmailadmin/distinfo
index 4736ffdc7aac..f199b112ef67 100644
--- a/mail/qmailadmin/distinfo
+++ b/mail/qmailadmin/distinfo
@@ -1 +1 @@
-MD5 (qmailadmin-0.45.tar.gz) = cd649c1e60c8fba4725bd0c251254b53
+MD5 (qmailadmin-1.0.1.tar.gz) = 87ddbcb911738b528f5f840315396d6f
diff --git a/mail/qmailadmin/pkg-plist b/mail/qmailadmin/pkg-plist
index e5385db07114..72769eabe4a4 100644
--- a/mail/qmailadmin/pkg-plist
+++ b/mail/qmailadmin/pkg-plist
@@ -1,4 +1,5 @@
 share/qmailadmin/html/add_alias.html
+share/qmailadmin/html/add_alias.html~
 share/qmailadmin/html/add_autorespond.html
 share/qmailadmin/html/add_forward.html
 share/qmailadmin/html/add_listmod.html
@@ -6,54 +7,63 @@ share/qmailadmin/html/add_listuser.html
 share/qmailadmin/html/add_mailinglist-idx.html
 share/qmailadmin/html/add_mailinglist-no-idx.html
 share/qmailadmin/html/add_user.html
+share/qmailadmin/html/colortable
 share/qmailadmin/html/de
 share/qmailadmin/html/del_alias_confirm.html
 share/qmailadmin/html/del_autorespond_confirm.html
 share/qmailadmin/html/del_forward_confirm.html
+share/qmailadmin/html/del_listmod.html
+share/qmailadmin/html/del_listuser.html
 share/qmailadmin/html/del_mailinglist_confirm.html
+share/qmailadmin/html/del_mod.html
 share/qmailadmin/html/del_user_confirm.html
 share/qmailadmin/html/en
 share/qmailadmin/html/es
+share/qmailadmin/html/footer.html
 share/qmailadmin/html/fr
+share/qmailadmin/html/header.html
+share/qmailadmin/html/it
 share/qmailadmin/html/ja
 share/qmailadmin/html/main_menu.html
-share/qmailadmin/html/main_table.html
 share/qmailadmin/html/mod_autorespond.html
 share/qmailadmin/html/mod_dotqmail.html
+share/qmailadmin/html/mod_mailinglist-idx.html
 share/qmailadmin/html/mod_user.html
 share/qmailadmin/html/no
 share/qmailadmin/html/pt-BR
 share/qmailadmin/html/ru
+share/qmailadmin/html/setremotecatchall.html
 share/qmailadmin/html/show_alias.html
 share/qmailadmin/html/show_autorespond.html
 share/qmailadmin/html/show_forwards.html
 share/qmailadmin/html/show_login.html
 share/qmailadmin/html/show_mailinglist.html
-share/qmailadmin/html/show_redirect.html
+share/qmailadmin/html/show_moderators.html
+share/qmailadmin/html/show_subscribers.html
 share/qmailadmin/html/show_users.html
 share/qmailadmin/html/sv
 share/qmailadmin/html/tr
-www/cgi-bin.default/qmailadmin/qmailadmin
-www/data.default/images/qmailadmin/delete.gif
-www/data.default/images/qmailadmin/lowerleft.gif
-www/data.default/images/qmailadmin/lowermiddle.gif
-www/data.default/images/qmailadmin/lowerright.gif
-www/data.default/images/qmailadmin/main1.gif
-www/data.default/images/qmailadmin/main2.gif
-www/data.default/images/qmailadmin/middleleft1.gif
-www/data.default/images/qmailadmin/middleleft2.gif
-www/data.default/images/qmailadmin/middlelogin.gif
-www/data.default/images/qmailadmin/middleright1.gif
-www/data.default/images/qmailadmin/pixel.gif
-www/data.default/images/qmailadmin/upperleft.gif
-www/data.default/images/qmailadmin/uppermiddle1.gif
-www/data.default/images/qmailadmin/uppermiddle2.gif
-www/data.default/images/qmailadmin/upperright.gif
-@dirrm www/data.default/images/qmailadmin
-@dirrm www/data.default/images
-@unexec /bin/rmdir %D/www/data.default 2> /dev/null || true
-@dirrm www/cgi-bin.default/qmailadmin
-@unexec /bin/rmdir %D/www/cgi-bin.default 2> /dev/null || true
-@unexec /bin/rmdir %D/www 2> /dev/null || true
+%%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/delete.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/disabled.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowermiddle.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middlelogin.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleright1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/pixel.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperright.png
+@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin
+@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
+@unexec /bin/rmdir %%WEBDATADIR%% 2> /dev/null || true
+@dirrm %%CGIBINDIR%%/%%CGIBINSUBDIR%%
+@unexec /bin/rmdir %%CGIBINDIR%% 2> /dev/null || true
 @dirrm share/qmailadmin/html
 @dirrm share/qmailadmin