ports/58895: Tweak port: www/rt3

[Tim Bishop]

>Number:         58895
>Category:       ports
>Synopsis:       Tweak port: www/rt3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 03 13:00:42 PST 2003
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: