Update rt-mysql and rt-pgsql to rt-mysql-2.0.15 and rt-pgsql-2.0.15

Various changes from 2.0.13, most obvious of which appears to be that
RT no longer causes problems with the HTML::Mason in pkgsrc.
Also add a note as to how to get an Apache configuration which does not
ignore POSTs. Still some configuration issues, but we are now _nearly_
working without some small hacking, as opposed to completely broken.

4 files changed, 58 insertions, 60 deletions

diff --git a/devel/rt-mysql/Makefile.common b/devel/rt-mysql/Makefile.common
index 5e62ef3b457..0a890210c6d 100644
--- a/devel/rt-mysql/Makefile.common
+++ b/devel/rt-mysql/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/02/04 22:19:09 abs Exp $
 
-DISTNAME=      	rt-2-0-13
+DISTNAME=      	rt-2-0-15
 CATEGORIES=	devel
 MASTER_SITES=	http://www.fsck.com/pub/rt/release/
 
diff --git a/devel/rt-mysql/distinfo b/devel/rt-mysql/distinfo
index 4c3304e860d..75313f9613a 100644
--- a/devel/rt-mysql/distinfo
+++ b/devel/rt-mysql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/19 21:40:45 atatat Exp $
+$NetBSD: distinfo,v 1.2 2004/02/04 22:19:09 abs Exp $
 
-SHA1 (rt-2-0-13.tar.gz) = 7e7a5ec27d463bd0683242cbc7f8e0f7cbe6ea38
-Size (rt-2-0-13.tar.gz) = 346050 bytes
-SHA1 (patch-aa) = 0d79c39dc73a8c4f9672e853ddae6c50fd23035a
+SHA1 (rt-2-0-15.tar.gz) = 9469f83b383f4c62e952d43ce3d63413ff5d4656
+Size (rt-2-0-15.tar.gz) = 356046 bytes
+SHA1 (patch-aa) = e05e449de52e4500965f9310d16154c956720eb3
diff --git a/devel/rt-mysql/files/README b/devel/rt-mysql/files/README
index 92c909c8e17..c26a7e1fe21 100644
--- a/devel/rt-mysql/files/README
+++ b/devel/rt-mysql/files/README
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: README,v 1.1.1.1 2002/09/19 21:40:45 atatat Exp $
+$NetBSD: README,v 1.2 2004/02/04 22:19:10 abs Exp $
 
 You must now do post-installation configuration:
 
@@ -14,4 +14,22 @@ file.  This covers issues such as how to configure your web server
 for use with rt, how to set up aliases for the email gateway, and
 cron jobs for cleaning out stale data.
 
+If you are using Apache you will need to install www/ap-fastcgi, and
+the following may prove useful to avoid an issue with the POST from
+the initial Login screen being ignored:
+
+    LoadModule perl_module lib/httpd/mod_perl.so
+    LoadModule fastcgi_module lib/httpd/mod_fastcgi.so
+    AddHandler fastcgi-script fcgi
+    #
+    <VirtualHost YOUR_SERVER_NAME>
+	ServerName YOUR_SERVER_NAME
+	DocumentRoot @RT_PATH@/WebRT/html
+	PerlModule Apache::DBI
+	PerlRequire @RT_PATH@/bin/webmux.pl
+	FastCgiServer @RT_PATH@/bin/mason_handler.fcgi
+	Alias /NoAuth/images/ @RT_PATH@/WebRT/html/NoAuth/images/
+	ScriptAlias / @RT_PATH@/bin/mason_handler.fcgi/
+    </VirtualHost>
+
 ===========================================================================
diff --git a/devel/rt-mysql/patches/patch-aa b/devel/rt-mysql/patches/patch-aa
index 7b9ea7b7cb7..65969780847 100644
--- a/devel/rt-mysql/patches/patch-aa
+++ b/devel/rt-mysql/patches/patch-aa
@@ -1,21 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/19 21:40:46 atatat Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/04 22:19:10 abs Exp $
 
-This patch basically just rips up the standard rt Makefile so that
-we can do the two stages (installation and database configuration)
-in two completely separate steps.
-
---- Makefile.orig	Wed Mar 27 22:59:34 2002
+--- Makefile.orig	Fri Oct  4 19:48:46 2002
 +++ Makefile
 @@ -2,7 +2,7 @@
- # Request Tracker is Copyright 1996-2002 Jesse Vincent <jessebestpractical.com>
- # RT is distributed under the terms of the GNU General Public License, version 2
+ # RT is Copyright 1996-2002 Jesse Vincent <jesse@bestpractical.com>
+ # It is distributed under the terms of the GNU General Public License, version 2
  
 -PERL			= 	/usr/bin/perl
 +PERL			= 	@PREFIX@/bin/perl
  
  RT_VERSION_MAJOR	=	2
  RT_VERSION_MINOR	=	0
-@@ -15,7 +15,7 @@
+@@ -15,7 +15,7 @@ TAG 	   =	rt-$(RT_VERSION_MAJOR)-$(RT_VE
  BRANCH			=	HEAD
  
  # This is the group that all of the installed files will be chgrp'ed to.
@@ -24,7 +20,7 @@ in two completely separate steps.
  
  
  # User which should own rt binaries.
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ DESTDIR			=	
  # RT_PATH is the name of the directory you want make to install RT in
  # RT must be installed in its own directory (don't set this to /usr/local)
  
@@ -33,15 +29,15 @@ in two completely separate steps.
  
  # The rest of these paths are all configurable, but you probably don't want to 
  # put them elsewhere
-@@ -48,6 +48,7 @@
- RT_LIB_PATH		=	$(RT_PATH)/lib
+@@ -49,6 +49,7 @@ RT_LIB_PATH		=	$(RT_PATH)/lib
  RT_ETC_PATH		=	$(RT_PATH)/etc
+ RT_CONFIG_PATH		=	$(RT_ETC_PATH)
  RT_BIN_PATH		=	$(RT_PATH)/bin
 +WRAPPED_RT_BIN_PATH	=	$(RT_BIN_PATH)/real
  RT_MAN_PATH		=	$(RT_PATH)/man
  MASON_HTML_PATH		=	$(RT_PATH)/WebRT/html
  
-@@ -59,10 +60,10 @@
+@@ -60,10 +61,10 @@ MASON_LOCAL_HTML_PATH	=	$(RT_PATH)/local
  
  # RT needs to be able to write to MASON_DATA_PATH and MASON_SESSION_PATH
  # RT will create and chown these directories. Don't just set them to /tmp
@@ -55,7 +51,7 @@ in two completely separate steps.
  
  # RT_READABLE_DIR_MODE is the mode of directories that are generally meant
  # to be accessable
-@@ -78,17 +79,22 @@
+@@ -79,17 +80,22 @@ RT_MODPERL_HANDLER	=	$(RT_BIN_PATH)/webm
  
  # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
  # THIS HANDLER IS NOT CURRENTLY SUPPORTED
@@ -83,7 +79,7 @@ in two completely separate steps.
  
  # }}}
  
-@@ -100,13 +106,13 @@
+@@ -101,13 +107,13 @@ RT_MAILGATE_BIN		=	$(RT_BIN_PATH)/rt-mai
  # "Pg" is known to work
  # "Oracle" is in the early stages of working.
  
@@ -99,7 +95,7 @@ in two completely separate steps.
  
  # Set DBA to the name of a unix account with the proper permissions and 
  # environment to run your commandline SQL tools
-@@ -119,21 +125,21 @@
+@@ -120,21 +126,21 @@ DB_HOME			= /usr
  # For Pg, you probably want 'postgres' 
  # For oracle, you want 'system'
  
@@ -125,7 +121,7 @@ in two completely separate steps.
  
  #
  # Set this to the canonical name of the interface RT will be talking to the 
-@@ -143,21 +149,21 @@
+@@ -144,21 +150,21 @@ DB_PORT			=	
  # to grant those database rights by hand.
  #
  
@@ -151,7 +147,7 @@ in two completely separate steps.
  
  # }}}
  
-@@ -166,8 +172,8 @@
+@@ -167,8 +173,8 @@ DB_RT_PASS		=	rt_pass
  # The user your webserver runs as. needed so that webrt can cache mason
  # objectcode
  
@@ -162,29 +158,16 @@ in two completely separate steps.
  
  # }}}
  
-@@ -180,7 +186,7 @@
+@@ -181,7 +187,7 @@ default:
  	@echo "Please read RT's readme before installing. Not doing so could"
  	@echo "be dangerous."
  
 -install: dirs initialize.$(DB_TYPE) upgrade insert instruct
-+install: dirs initialize.$(DB_TYPE) upgrade insert
++install: dirs initialize.$(DB_TYPE) upgrade insert-install
  
  instruct:
  	@echo "Congratulations. RT has been installed. "
-@@ -189,9 +195,11 @@
- 
- 
- insert: insert-install
-+
-+XXX-insert:					# post pkg install
- 	$(PERL) $(RT_ETC_PATH)/insertdata
- 
--upgrade: dirs config-replace upgrade-noclobber  upgrade-instruct
-+upgrade: dirs config-replace upgrade-noclobber
- 
- upgrade-instruct: 
- 	@echo "Congratulations. RT has been upgraded. You should now check-over"
-@@ -200,7 +208,7 @@
+@@ -201,7 +207,7 @@ upgrade-instruct: 
  	@echo "	   $(RT_ETC_PATH)/insertdata <version>"
  	@echo "where <version> is the version of RT you're upgrading from."
  
@@ -193,7 +176,7 @@ in two completely separate steps.
  
  nondestruct: fixperms
  
-@@ -212,8 +220,8 @@
+@@ -213,8 +219,8 @@ fixdeps:
  
  
  
@@ -204,7 +187,7 @@ in two completely separate steps.
  
  fixperms:
  	# Make the libraries readable
-@@ -228,40 +236,54 @@
+@@ -229,40 +235,54 @@ fixperms:
  	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
  	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)	
  
@@ -271,7 +254,7 @@ in two completely separate steps.
  
  	# Make the web ui readable by all. 
  	chmod -R  u+rwX,go-w,go+rX 	$(DESTDIR)/$(MASON_HTML_PATH) \
-@@ -271,6 +293,7 @@
+@@ -272,6 +292,7 @@ fixperms:
  	chgrp -R $(LIBS_GROUP) 	$(DESTDIR)/$(MASON_HTML_PATH) \
  				$(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
  
@@ -279,11 +262,8 @@ in two completely separate steps.
  	# Make the web ui's data dir writable
  	chmod 0770  	$(DESTDIR)/$(MASON_DATA_PATH) \
  			$(DESTDIR)/$(MASON_SESSION_PATH)
-@@ -278,27 +301,36 @@
+@@ -281,25 +302,33 @@ fixperms:
  				$(DESTDIR)/$(MASON_SESSION_PATH)
- 	chgrp -R $(WEB_GROUP) 	$(DESTDIR)/$(MASON_DATA_PATH) \
- 				$(DESTDIR)/$(MASON_SESSION_PATH)
-+
  dirs:
  	mkdir -p $(DESTDIR)/$(RT_BIN_PATH)
 +	mkdir -p $(DESTDIR)/$(WRAPPED_RT_BIN_PATH)
@@ -303,11 +283,11 @@ in two completely separate steps.
 +
 +perl-build:
  	( cd ./lib; \
--	  $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
-+	  $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" RT.pm \
-+	    && $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
- 			      INSTALLMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
- 			      INSTALLMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
+-	  $(PERL) Makefile.PL INSTALLSITELIB=$(RT_LIB_PATH) \
++	  $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" RT.pm && \
++	  $(PERL) Makefile.PL INSTALLSITELIB=$(DESTDIR)/$(RT_LIB_PATH) \
+ 			      INSTALLMAN1DIR=$(RT_MAN_PATH)/man1 \
+ 			      INSTALLMAN3DIR=$(RT_MAN_PATH)/man3 \
  	    && make \
  	    && make test \
 -	    && $(PERL) -p -i -e " s'!!RT_VERSION!!'$(RT_VERSION)'g;" blib/lib/RT.pm ;\
@@ -316,9 +296,9 @@ in two completely separate steps.
 +perl-install:
 +	( cd ./lib; \
  	    make install \
- 			   INSTALLSITEMAN1DIR=$(DESTDIR)/$(RT_MAN_PATH)/man1 \
- 			   INSTALLSITEMAN3DIR=$(DESTDIR)/$(RT_MAN_PATH)/man3 \
-@@ -320,13 +352,16 @@
+ 			   INSTALLSITEMAN1DIR=$(RT_MAN_PATH)/man1 \
+ 			   INSTALLSITEMAN3DIR=$(RT_MAN_PATH)/man3 \
+@@ -322,13 +351,16 @@ initialize.mysql: createdb acls initdb.r
  initialize.Oracle: acls initdb.rtuser
  
  acls:
@@ -342,7 +322,7 @@ in two completely separate steps.
  	bin/initacls.$(DB_TYPE) '$(DB_HOME)' '$(DB_HOST)' '$(DB_PORT)' '$(DB_DBA)' '$(DB_DBA_PASSWORD)' '$(DB_DATABASE)' '$(DESTDIR)/$(RT_ETC_PATH)/acl.$(DB_TYPE)' 
  
  
-@@ -336,21 +371,35 @@
+@@ -338,21 +370,35 @@ dropdb: 
  
  
  createdb: 
@@ -379,7 +359,7 @@ in two completely separate steps.
  
  bin-install:
  	cp -p ./bin/webmux.pl $(DESTDIR)/$(RT_MODPERL_HANDLER)
-@@ -359,6 +408,11 @@
+@@ -361,6 +407,11 @@ bin-install:
  	cp -p ./bin/rt $(DESTDIR)/$(RT_CLI_BIN)
  	cp -p ./bin/mason_handler.fcgi $(DESTDIR)/$(RT_FASTCGI_HANDLER)
  	cp -p ./bin/mason_handler.scgi $(DESTDIR)/$(RT_SPEEDYCGI_HANDLER)
@@ -391,7 +371,7 @@ in two completely separate steps.
  
  	$(PERL) -p -i -e "s'!!RT_PATH!!'"$(RT_PATH)"'g;\
  				s'!!PERL!!'"$(PERL)"'g;\
-@@ -377,7 +431,7 @@
+@@ -379,7 +430,7 @@ config-replace:
  	-[ -f $(DESTDIR)/$(RT_CONFIG) ] && \
  		mv $(DESTDIR)/$(RT_CONFIG) $(DESTDIR)/$(RT_CONFIG).old && \
  	 	chmod 000 $(DESTDIR)/$(RT_CONFIG).old
@@ -400,7 +380,7 @@ in two completely separate steps.
  	$(PERL) -p -i -e "\
  	s'!!DB_TYPE!!'"$(DB_TYPE)"'g;\
  	s'!!DB_HOST!!'"$(DB_HOST)"'g;\
-@@ -391,7 +445,7 @@
+@@ -393,7 +444,7 @@ config-replace:
  	s'!!MASON_DATA_PATH!!'"$(MASON_DATA_PATH)"'g;\
  	s'!!RT_LOG_PATH!!'"$(RT_LOG_PATH)"'g;\
  	s'!!RT_VERSION!!'"$(RT_VERSION)"'g;\