From t.d.bishop@kent.ac.uk  Mon Nov  3 12:56:05 2003
Return-Path: <t.d.bishop@kent.ac.uk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D239416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Nov 2003 12:56:05 -0800 (PST)
Received: from pat.kent.ac.uk (pat.ukc.ac.uk [129.12.21.15])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 967B243F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  3 Nov 2003 12:56:04 -0800 (PST)
	(envelope-from t.d.bishop@kent.ac.uk)
Received: from pendennis.ukc.ac.uk ([129.12.3.232])
	by pat.kent.ac.uk with esmtp (Exim 4.22)
	id 1AGljh-0006ZH-QT; Mon, 03 Nov 2003 20:55:41 +0000
Received: from tdb by pendennis.ukc.ac.uk with local (Exim 4.24; FreeBSD 4.9)
	id 1AGljh-0005yS-Hx; Mon, 03 Nov 2003 20:55:41 +0000
Message-Id: <E1AGljh-0005yS-Hx@pendennis.ukc.ac.uk>
Date: Mon, 03 Nov 2003 20:55:41 +0000
From: Tim Bishop <tim@bishnet.net>
Sender: "T.D.Bishop" <T.D.Bishop@kent.ac.uk>
Reply-To: Tim Bishop <tim@bishnet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: tim@bishnet.net, autrijus@autrijus.org
Subject: Tweak port: www/rt3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58895
>Category:       ports
>Synopsis:       Tweak port: www/rt3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 03 13:00:42 PST 2003
>Closed-Date:    Thu Nov 20 02:13:54 PST 2003
>Last-Modified:  Thu Nov 20 02:13:54 PST 2003
>Originator:     Tim Bishop
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #5: Wed Sep 17 15:50:07 BST 2003 tdb@pendennis.ukc.ac.uk:/usr/obj/usr/src/sys/PENDENNIS i386

>Description:
	Some time ago I submitted pr/53205 which was added to this
	port. At some point one of the fixes added by that pr became
	part of RT, so it's no longer needed here. This pr removes
	it again.

	[cc'd to maintainer for approval]

>How-To-Repeat:
>Fix:
	Apply patch below.

--- rt3-3.0.6-ap2fix.diff begins here ---
diff -ruN rt3.bak/Makefile rt3/Makefile
--- rt3.bak/Makefile	Sun Oct 26 15:51:29 2003
+++ rt3/Makefile	Mon Nov  3 20:44:03 2003
@@ -135,7 +135,6 @@
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README
-	@${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin
 .if !defined(INITIAL_INSTALL)
 	@echo Upgrade of RT3 complete.
 .else
diff -ruN rt3.bak/files/ap2mp2-fix.pl rt3/files/ap2mp2-fix.pl
--- rt3.bak/files/ap2mp2-fix.pl	Fri Jun 20 09:41:24 2003
+++ rt3/files/ap2mp2-fix.pl	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
-# temp fix for mp2-09... make a dummy Apache->request
-require Apache::RequestUtil;
-no warnings 'redefine';
-my $sub = *Apache::request{CODE};
-*Apache::request = sub {
-     my $r;
-     eval { $r = $sub->('Apache'); };
-     # warn $@ if $@;
-     return $r;
-};
diff -ruN rt3.bak/pkg-message rt3/pkg-message
--- rt3.bak/pkg-message	Fri Jun 20 09:41:24 2003
+++ rt3/pkg-message	Mon Nov  3 20:43:24 2003
@@ -6,12 +6,9 @@
    the default config file (%%RT_PATH%%/etc/RT_Config.pm).
 2. Configure the email and web gateways.  Please refer to
    'SETTING UP THE MAIL GATEWAY' in %%RT_PATH%%/README
-3. For Apache2/mod_perl2 you'll probably need to add the
-   following line above the webmux.pl line in httpd.conf:
-     PerlRequire %%RT_PATH%%/bin/ap2mp2-fix.pl
-4. Restart Apache.
-5. Do remember to *CHANGE* the root's password for the web interface.
+3. Restart Apache.
+4. Do remember to *CHANGE* the root's password for the web interface.
    The default is "password" (without the quotes.)
-6. Configure RT per the instructions at http://www.fsck.com/rtfm/.
+5. Configure RT per the instructions at http://www.fsck.com/rtfm/.
 
 =====================================================================
diff -ruN rt3.bak/pkg-plist rt3/pkg-plist
--- rt3.bak/pkg-plist	Sat Oct 11 00:23:48 2003
+++ rt3/pkg-plist	Mon Nov  3 20:45:39 2003
@@ -1,5 +1,4 @@
 rt3/README
-rt3/bin/ap2mp2-fix.pl
 rt3/bin/mason_handler.fcgi
 rt3/bin/mason_handler.scgi
 rt3/bin/mason_handler.svc
--- rt3-3.0.6-ap2fix.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Tim Bishop <tim@bishnet.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: ports/58895: Tweak port: www/rt3
Date: Wed, 5 Nov 2003 18:16:40 +0000

 This didn't seem to make it on to the correct PR.
 
 Tim.
 
 ----- Forwarded message from Autrijus Tang <autrijus@autrijus.org> -----
 
 Date: Tue, 4 Nov 2003 11:05:54 +0800
 From: Autrijus Tang <autrijus@autrijus.org>
 To: Tim Bishop <tim@bishnet.net>
 Cc: FreeBSD-gnats-submit@freebsd.org, autrijus@autrijus.org
 Subject: Re: Tweak port: www/rt3
 In-Reply-To: <E1AGljh-0005yS-Hx@pendennis.ukc.ac.uk>
 User-Agent: Mutt/1.3.99i
 X-Copyright: Copyright 2003 by Autrijus Tang. All rights reserved.
 X-Public-Key: http://autrijus.org/pubkey.asc
 X-Notice: Forwarding of this mail prohibited without written consent.
 X-Bishnet-MailScanner-Information: Contact postmaster@bishnet.net
 X-Bishnet-MailScanner-VirusCheck: Found to be clean
 X-Aliased: tim@bishnet.net
 
 On Mon, Nov 03, 2003 at 08:55:41PM +0000, Tim Bishop wrote:
 > >Description:
 > 	Some time ago I submitted pr/53205 which was added to this
 > 	port. At some point one of the fixes added by that pr became
 > 	part of RT, so it's no longer needed here. This pr removes
 > 	it again.
 > 	[cc'd to maintainer for approval]
 
 Approved.  I was the one who've added your fix into the mainline.
 
 Thanks for the reminder! :-)
 
 Cheers,
 /Autrijus/
 
 ----- End forwarded message -----
 
 -- 
 Tim Bishop
 http://www.bishnet.net/tim
 PGP Key: 0x5AE7D984
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Nov 20 02:13:41 PST 2003 
State-Changed-Why:  
Closed on submitter's request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58895 
>Unformatted:
