5 files changed, 25 insertions, 50 deletions

diff --git a/mail/ezmlm-web/Makefile b/mail/ezmlm-web/Makefile
index 7ec12bb05622..2432dd523fd2 100644
--- a/mail/ezmlm-web/Makefile
+++ b/mail/ezmlm-web/Makefile
@@ -6,38 +6,42 @@
 #
 
 PORTNAME=	ezmlm-web
-PORTVERSION= 	2.0
+PORTVERSION= 	2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://rucus.ru.ac.za/pub/mail/ezmlm/
 
 MAINTAINER=	guy-ezmlm@rucus.ru.ac.za
 
-BUILD_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
+BUILD_DEPENDS=	${LOCALBASE}/${EZMLM_DIR}/bin/ezmlm-idx:${PORTSDIR}/mail/ezmlm-idx \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Ezmlm.pm:${PORTSDIR}/mail/p5-Mail-Ezmlm
-RUN_DEPENDS=	${LOCALBASE}/sbin/apache:${PORTSDIR}/www/apache13 \
+RUN_DEPENDS=	${LOCALBASE}/sbin/apachectl:${PORTSDIR}/www/apache13 \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
 
-CGI_BIN?=	/share/apache/cgi-bin/
-EZMLM_DIR?=	/
+# Change these to suit your setup. You can do this via the environment
+# CGI_BIN is the location relative to ${PREFIX} of your webservers' cgi-bin
+# EZMLM_DIR is the base relative to ${PREFIX} in which ezmlm was installed
+#
+CGI_BIN?=	www/cgi-bin.default
+EZMLM_DIR?=
 
 USE_PERL5=	YES
-PLIST_SUB=	CGI_BIN=${CGI_BIN:S/\///} EZMLM_DIR=${EZMLM_DIR:S/\///}
+PLIST_SUB=	CGI_BIN=${CGI_BIN:S/$/\//:S/^\///} EZMLM_DIR=${EZMLM_DIR:S/$/\//:S/^\///}
 
 do-build:
 	@cd ${WRKSRC}; ${MAKE} index; ${MV} index ezmlm-web
 
 do-install:
-	${MKDIR} ${LOCALBASE}${CGI_BIN} ${LOCALBASE}${EZMLM_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/ezmlm-web.cgi ${LOCALBASE}${EZMLM_DIR}/bin
-	${INSTALL_DATA} ${WRKSRC}/ezmlmwebrc ${LOCALBASE}${EZMLM_DIR}/etc/ezmlm
-	${INSTALL_PROGRAM} -o alias -g qmail -m 4755 ${WRKSRC}/ezmlm-web ${LOCALBASE}${CGI_BIN}
+	${MKDIR} ${PREFIX}/${CGI_BIN} ${PREFIX}/${EZMLM_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/ezmlm-web.cgi ${PREFIX}/${EZMLM_DIR}/bin
+	${INSTALL_DATA} ${WRKSRC}/ezmlmwebrc ${PREFIX}/${EZMLM_DIR}/etc/ezmlm/ezmlmwebrc.sample
+	${INSTALL_PROGRAM} -o alias -g qmail -m 4755 ${WRKSRC}/ezmlm-web ${PREFIX}/${CGI_BIN}
 	${MKDIR} ${PREFIX}/share/ezmlm-web
 .for file in CHANGES README index.c htaccess.sample webusers.sample
 	${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/share/ezmlm-web
 .endfor
 
 post-install:
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
+	@${SED} 's!%%PREFIX%%!${PREFIX}!g; s!%%EZMLM_DIR%%!${PREFIX}${EZMLM_DIR:S/^\///}!g' ${PKGMESSAGE}
 	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/mail/ezmlm-web/distinfo b/mail/ezmlm-web/distinfo
index 44320c16e0bf..1a5cea192a46 100644
--- a/mail/ezmlm-web/distinfo
+++ b/mail/ezmlm-web/distinfo
@@ -1 +1 @@
-MD5 (ezmlm-web-2.0.tar.gz) = 749a164c260f80857574f4dc1c0bb226
+MD5 (ezmlm-web-2.1.tar.gz) = 41d701bc509c1a7fbec42f954e3e4171
diff --git a/mail/ezmlm-web/files/patch-aa b/mail/ezmlm-web/files/patch-aa
deleted file mode 100644
index 8135b9e8bd5a..000000000000
--- a/mail/ezmlm-web/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
---- ezmlm-web.cgi.orig	Sat Jan 29 13:36:02 2000
-+++ ezmlm-web.cgi	Thu May 18 13:43:27 2000
-@@ -1,4 +1,10 @@
- #!/usr/bin/perl -wT
-+
-+#
-+# MODIFIED FOR FREEBSD PORTS
-+# Guy Antony Halse <guy@rucus.ru.ac.za>
-+#
-+
- #===========================================================================
- # ezmlm-web.cgi - version 2.0 - 29/01/2000
- # $Id: ezmlm-web.cgi,v 1.1 2000/01/29 11:35:40 guy Exp $
-@@ -76,8 +82,8 @@
-    require "$opt_C"; # Command Line
- } elsif(-e "$HOME_DIR/.ezmlmwebrc") {
-    require "$HOME_DIR/.ezmlmwebrc"; # User
--} elsif(-e "/etc/ezmlm/ezmlmwebrc") {
--   require "/etc/ezmlm/ezmlmwebrc"; # System
-+} elsif(-e "/usr/local/etc/ezmlm/ezmlmwebrc") {
-+   require "/usr/local/etc/ezmlm/ezmlmwebrc"; # System
- } elsif(-e "./ezmlmwebrc") {
-    require "./ezmlmwebrc"; # Install
- } else {
-@@ -604,8 +610,8 @@
-    my ($qmail, $listname, $options, $i);
-    
-    # Some taint checking ...
--   $qmail = $1 if $q->param('inlocal') =~ /-?([\w.+:]+)$/;
--   $listname = $q->param('list'); $listname =~ s/ /_/; # In case some git tries to put a space in the file name
-+   $qmail = $1 if $q->param('inlocal') =~ /(?:$USER-)?([^\<\>\\\/\s]+)$/;
-+   $listname = $q->param('list'); $listname =~ s/ /_/g; # In case some git tries to put a space in the file name
- 
-    # Sanity Checks ...
-    return 1 if ($listname eq '' || $qmail eq '');
diff --git a/mail/ezmlm-web/pkg-message b/mail/ezmlm-web/pkg-message
index b26c64ba35a6..1d952f1d677d 100644
--- a/mail/ezmlm-web/pkg-message
+++ b/mail/ezmlm-web/pkg-message
@@ -11,3 +11,9 @@ use a .htaccess file, or provide some other means of security.
 
 Have a look at the README file in %%PREFIX%%/share/ezmlm-web for
 more information. There are also some sample files there.
+
+In order to make ezmlm-web work properly, you will have to create
+a configuration file for it in %%EZMLM_DIR%%/etc/ezmlm.
+A sample ezmlmwebrc (ezmlmwebrc.sample) file is provided in that 
+directory. This sample will work `as is', but allows you to customise
+ezmlm-web to your liking. At a minimum just cp ezmlmwebrc.sample ezmlmwebrc
diff --git a/mail/ezmlm-web/pkg-plist b/mail/ezmlm-web/pkg-plist
index 87f10b4c4fbb..ece3aa6e9b1f 100644
--- a/mail/ezmlm-web/pkg-plist
+++ b/mail/ezmlm-web/pkg-plist
@@ -4,6 +4,6 @@ share/ezmlm-web/index.c
 share/ezmlm-web/htaccess.sample
 share/ezmlm-web/webusers.sample
 @dirrm share/ezmlm-web
-%%EZMLM_DIR%%/bin/ezmlm-web.cgi
-%%EZMLM_DIR%%/etc/ezmlm/ezmlmwebrc
-%%CGI_BIN%%/ezmlm-web
+%%EZMLM_DIR%%bin/ezmlm-web.cgi
+%%EZMLM_DIR%%etc/ezmlm/ezmlmwebrc.sample
+%%CGI_BIN%%ezmlm-web