>Number: 54577
>Category: ports
>Synopsis: [Update] Port: mail/qmailadmin
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 17 05:30:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Alex Dupre
>Release: FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Update from 1.0.12 to 1.0.24.
Use SourceForge as master sites.
Add WITH_MODIFY_QUOTA and WITH_DOMAIN_AUTOFILL knobs.
Make WEBDATASUBDIR and WEBDATAURL working.
>How-To-Repeat:
>Fix:
--- qmailadmin.diff begins here ---
diff -ruN qmailadmin.orig/Makefile qmailadmin/Makefile
--- qmailadmin.orig/Makefile Thu Jul 17 12:31:18 2003
+++ qmailadmin/Makefile Thu Jul 17 14:16:01 2003
@@ -6,12 +6,13 @@
#
PORTNAME= qmailadmin
-PORTVERSION= 1.0.12
+PORTVERSION= 1.0.24
CATEGORIES= mail www
-MASTER_SITES= http://www.inter7.com/devel/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roam at FreeBSD.org
-COMMENT= "CGI program for administering Qmail with vchkpw/vpopmail"
+COMMENT= CGI program for administering Qmail with vchkpw/vpopmail
BUILD_DEPENDS= \
${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
@@ -34,27 +35,29 @@
# CGIBINSUBDIR - subdirectory to place cgi scripts in
# CGIBINURL - location of your cgi directory in a URL
# WEBDATADIR - location of your html files
-# WEBDATASUBDIR - subdirectory to place html files in (not working yet)
+# WEBDATASUBDIR - subdirectory to place html files in
+# WEBDATAURL - location of your html files in a URL
#
# WITHOUT_IPAUTH - disable the IP address check after login
# WITHOUT_USER_INDEX - disable the user index display, which might
# confuse earlier versions of Internet Explorer
+# WITH_MODIFY_QUOTA - enable domain admin to modify user quotas
+# WITH_DOMAIN_AUTOFILL - autofill the domain on login page based on the
+# hostname
#
CGIBINDIR?= www/cgi-bin.default
CGIBINSUBDIR?= qmailadmin
-CGIBINURL?= cgi-bin
+CGIBINURL?= /cgi-bin
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
+WEBDATASUBDIR?= qmailadmin
+WEBDATAURL?=
PLIST_SUB+= CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
+.include <bsd.port.pre.mk>
+
#
# QMAIL_DIR - location of qmail directory
#
@@ -69,11 +72,14 @@
CONFIGURE_ARGS+= \
--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
- --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
- --with-htmllibdir=${PREFIX}/share/qmailadmin \
- --enable-cgipath=/${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \
- --enable-ezmlmidx=y
+ --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
+ --with-htmllibdir=${DATADIR} \
+ --enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
+ --enable-cgipath=${CGIBINURL}/${CGIBINSUBDIR}/qmailadmin \
+ --enable-vpopmaildir=${LOCALBASE}/vpopmail \
+ --enable-autoresponder-bin=${LOCALBASE}/bin \
+ --enable-ezmlmdir=${LOCALBASE}/bin
.if defined(WITHOUT_IPAUTH)
CONFIGURE_ARGS+= --enable-ipauth=n
@@ -83,7 +89,12 @@
CONFIGURE_ARGS+= --enable-user-index=n
.endif
-pre-install:
- @${MKDIR} ${PREFIX}/share/qmailadmin/html
+.if defined(WITH_MODIFY_QUOTA)
+CONFIGURE_ARGS+= --enable-modify-quota=y
+.endif
+
+.if defined(WITH_DOMAIN_AUTOFILL)
+CONFIGURE_ARGS+= --enable-domain-autofill=y
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN qmailadmin.orig/distinfo qmailadmin/distinfo
--- qmailadmin.orig/distinfo Thu Jul 17 12:31:18 2003
+++ qmailadmin/distinfo Thu Jul 17 12:32:48 2003
@@ -1 +1 @@
-MD5 (qmailadmin-1.0.12.tar.gz) = ca86deaf100296872391e40b2cb79325
+MD5 (qmailadmin-1.0.24.tar.gz) = 83c6936538c02c47a6f71caaa2665bf7
diff -ruN qmailadmin.orig/pkg-plist qmailadmin/pkg-plist
--- qmailadmin.orig/pkg-plist Thu Jul 17 12:31:18 2003
+++ qmailadmin/pkg-plist Thu Jul 17 14:11:55 2003
@@ -1,82 +1,75 @@
-share/qmailadmin/html/add_alias.html
-share/qmailadmin/html/add_autorespond.html
-share/qmailadmin/html/add_forward.html
-share/qmailadmin/html/add_listmod.html
-share/qmailadmin/html/add_listdig.html
-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_noquota.html
-share/qmailadmin/html/add_user_quota.html
-share/qmailadmin/html/colortable
-share/qmailadmin/html/da
-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_listdig.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/en-us
-share/qmailadmin/html/es
-share/qmailadmin/html/footer.html
-share/qmailadmin/html/fr
-share/qmailadmin/html/header.html
-share/qmailadmin/html/hu
-share/qmailadmin/html/it
-share/qmailadmin/html/ja
-share/qmailadmin/html/main_menu.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_quota.html
-share/qmailadmin/html/mod_user_noquota.html
-share/qmailadmin/html/no
-share/qmailadmin/html/pt-BR
-share/qmailadmin/html/pl
-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_digest_subscribers.html
-share/qmailadmin/html/show_forwards.html
-share/qmailadmin/html/show_login.html
-share/qmailadmin/html/show_login_help.html
-share/qmailadmin/html/show_mailinglist.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
+%%DATADIR%%/html/add_autorespond.html
+%%DATADIR%%/html/add_forward.html
+%%DATADIR%%/html/add_listmod.html
+%%DATADIR%%/html/add_listdig.html
+%%DATADIR%%/html/add_listuser.html
+%%DATADIR%%/html/add_mailinglist-idx.html
+%%DATADIR%%/html/add_mailinglist-no-idx.html
+%%DATADIR%%/html/add_user.html
+%%DATADIR%%/html/colortable
+%%DATADIR%%/html/da
+%%DATADIR%%/html/de
+%%DATADIR%%/html/del_autorespond_confirm.html
+%%DATADIR%%/html/del_forward_confirm.html
+%%DATADIR%%/html/del_listdig.html
+%%DATADIR%%/html/del_listmod.html
+%%DATADIR%%/html/del_listuser.html
+%%DATADIR%%/html/del_mailinglist_confirm.html
+%%DATADIR%%/html/del_user_confirm.html
+%%DATADIR%%/html/en
+%%DATADIR%%/html/es
+%%DATADIR%%/html/footer.html
+%%DATADIR%%/html/fr
+%%DATADIR%%/html/header.html
+%%DATADIR%%/html/hu
+%%DATADIR%%/html/it
+%%DATADIR%%/html/ja
+%%DATADIR%%/html/main_menu.html
+%%DATADIR%%/html/mod_autorespond.html
+%%DATADIR%%/html/mod_dotqmail.html
+%%DATADIR%%/html/mod_mailinglist-idx.html
+%%DATADIR%%/html/mod_user.html
+%%DATADIR%%/html/nl
+%%DATADIR%%/html/no
+%%DATADIR%%/html/pt-BR
+%%DATADIR%%/html/pl
+%%DATADIR%%/html/ru
+%%DATADIR%%/html/setremotecatchall.html
+%%DATADIR%%/html/show_autorespond.html
+%%DATADIR%%/html/show_digest_subscribers.html
+%%DATADIR%%/html/show_forwards.html
+%%DATADIR%%/html/show_login.html
+%%DATADIR%%/html/show_mailinglist.html
+%%DATADIR%%/html/show_moderators.html
+%%DATADIR%%/html/show_subscribers.html
+%%DATADIR%%/html/show_users.html
+%%DATADIR%%/html/sk
+%%DATADIR%%/html/sv
+%%DATADIR%%/html/tr
%%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/modify.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/pixel.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-on.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-off.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/trash.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
- at dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowermiddle.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middlelogin.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleright1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/modify.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/pixel.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-on.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-off.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/trash.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperright.png
@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
@unexec /bin/rmdir %%WEBDATADIR%% 2> /dev/null || true
@dirrm %%CGIBINDIR%%/%%CGIBINSUBDIR%%
@unexec /bin/rmdir %%CGIBINDIR%% 2> /dev/null || true
- at dirrm share/qmailadmin/html
- at dirrm share/qmailadmin
+ at dirrm %%DATADIR%%/html
+ at dirrm %%DATADIR%%
--- qmailadmin.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: