From owner-freebsd-ports  Wed Sep 19  0:40:15 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E1D8C37B41D
	for <freebsd-ports@hub.freebsd.org>; Wed, 19 Sep 2001 00:40:01 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f8J7e1Z90614;
	Wed, 19 Sep 2001 00:40:01 -0700 (PDT)
	(envelope-from gnats)
Received: from rucus.ru.ac.za (rucus.ru.ac.za [146.231.29.2])
	by hub.freebsd.org (Postfix) with SMTP id 3671937B418
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Sep 2001 00:38:25 -0700 (PDT)
Received: (qmail 73343 invoked by uid 479); 19 Sep 2001 07:38:22 -0000
Message-Id: <20010919073822.73342.qmail@rucus.ru.ac.za>
Date: 19 Sep 2001 07:38:22 -0000
From: guy@rucus.ru.ac.za
Reply-To: guy@rucus.ru.ac.za
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/30667: port update: ezmlm-web
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         30667
>Category:       ports
>Synopsis:       update port: mail/ezmlm-web - config file location
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 19 00:40:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Guy Antony Halse
>Release:        FreeBSD 4.3-RELEASE i386
>Organization:
Rhodes University Computer Users Society
>Environment:
System: FreeBSD rucus.ru.ac.za 4.3-RELEASE FreeBSD 4.3-RELEASE #3: Wed Jul 11 19:01:49 SAST 2001 drs@rucus.ru.ac.za:/usr/build/src/sys/compile/RUCUS-SMP i386

>Description:
	update port: mail/ezmlm-web
   - change config file location to the correct place

>How-To-Repeat:

>Fix:

diff -urN ezmlm-web.old/Makefile ezmlm-web/Makefile
--- ezmlm-web.old/Makefile	Wed Sep 19 09:22:18 2001
+++ ezmlm-web/Makefile	Wed Sep 19 09:23:57 2001
@@ -7,7 +7,7 @@
 
 PORTNAME=	ezmlm-web
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://rucus.ru.ac.za/pub/mail/ezmlm/
 
diff -urN ezmlm-web.old/files/patch-aa ezmlm-web/files/patch-aa
--- ezmlm-web.old/files/patch-aa	Wed Sep 19 09:22:54 2001
+++ ezmlm-web/files/patch-aa	Wed Sep 19 09:20:18 2001
@@ -1,6 +1,17 @@
---- ezmlm-web.cgi.orig	Thu Mar 15 11:48:46 2001
-+++ ezmlm-web.cgi	Thu Mar 15 11:50:47 2001
-@@ -281,13 +281,13 @@
+--- ezmlm-web.cgi.orig	Mon Sep 25 21:58:08 2000
++++ ezmlm-web.cgi	Wed Sep 19 09:19:05 2001
+@@ -76,6 +76,10 @@
+    require "$opt_C"; # Command Line
+ } elsif(-e "$HOME_DIR/.ezmlmwebrc") {
+    require "$HOME_DIR/.ezmlmwebrc"; # User
++} elsif(-e "/usr/local/etc/ezmlm/ezmlmwebrc") {
++   require "/usr/local/etc/ezmlm/ezmlmwebrc"; # FreeBSD
++} elsif(-e "/usr/local/etc/ezmlmwebrc") {
++   require "/usr/local/etc/ezmlmwebrc"; # FreeBSD alt
+ } elsif(-e "/etc/ezmlm/ezmlmwebrc") {
+    require "/etc/ezmlm/ezmlmwebrc"; # System
+ } elsif(-e "./ezmlmwebrc") {
+@@ -281,13 +285,13 @@
     print $q->startform;
     print $q->hidden(-name=>'state', -default=>'select');
     print '<CENTER><TABLE BORDER="0" CELLPADDING="10"><TR><TD ALIGN="center" VALIGN="top" ROWSPAN="2">';
@@ -18,7 +29,7 @@
     print '</TD></TR><TR><TD> </TD></TR></TABLE></CENTER>';
     print $q->endform;
  }
-@@ -332,10 +332,10 @@
+@@ -332,10 +336,10 @@
     print '<CENTER><TABLE ALIGN="center" CELLPADDING="10"><TR><TD ROWSPAN="2" VALIGN="top" ALIGN="center">';
     print $q->hidden(-name=>'state', -default=>'edit');
     print $q->hidden(-name=>'list', -default=>$Q::list);
@@ -32,7 +43,7 @@
     print $q->textfield(-name=>'addsubscriber', -size=>'40'), ' <IMG SRC="', $HELP_ICON_URL, '" ALT="', $HELPER{'addaddress'}, '"><BR>';
     print $q->filefield(-name=>'addfile', -size=>20, -maxlength=>100), ' <IMG SRC="', $HELP_ICON_URL, '" ALT="', $HELPER{'addaddressfile'}, '"><br>' if ($FILE_UPLOAD);
     print $q->submit(-name=>'action', -value=>"[$BUTTON{'addaddress'}]"), '<P>';
-@@ -447,7 +447,7 @@
+@@ -447,7 +451,7 @@
        die "File upload must be of type text/*" unless($q->uploadInfo($q->param('addfile'))->{'Content-Type'} =~ m{^text/});
  
        # Handle file uploads of addresses
@@ -41,7 +52,7 @@
        return unless (defined($fh));
        while (<$fh>) {
           next if (/^\s*$/ or /^#/); # blank, comments
-@@ -563,9 +563,9 @@
+@@ -563,9 +567,9 @@
     print '<CENTER><TABLE ALIGN="center" CELLPADDING="10"><TR><TD ROWSPAN="2" VALIGN="top" ALIGN="center">';
     print $q->hidden(-name=>'state', -default=>$part);
     print $q->hidden(-name=>'list', -default=>$Q::list), "\n";
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message