diff options
Diffstat (limited to 'www/rt3')
| -rw-r--r-- | www/rt3/Makefile | 11 | ||||
| -rw-r--r-- | www/rt3/files/ap2mp2-fix.pl | 10 | ||||
| -rw-r--r-- | www/rt3/pkg-message | 9 | ||||
| -rw-r--r-- | www/rt3/pkg-plist | 4 |
4 files changed, 23 insertions, 11 deletions
diff --git a/www/rt3/Makefile b/www/rt3/Makefile index e274b960c4ef..00b7d0462391 100644 --- a/www/rt3/Makefile +++ b/www/rt3/Makefile @@ -7,7 +7,7 @@ PORTNAME= rt3 PORTVERSION= 3.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES?= http://www.fsck.com/pub/rt/release/ \ ftp://ftp.eu.uu.net/pub/unix/ticketing/rt/ @@ -21,10 +21,7 @@ BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ ${SITE_PERL}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session \ ${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache \ ${SITE_PERL}/CGI/Cookie.pm:${PORTSDIR}/www/p5-CGI.pm \ - ${SITE_PERL}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \ - ${SITE_PERL}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \ ${ARCH_PERL}/DBI.pm:${PORTSDIR}/databases/p5-DBI \ - ${SITE_PERL}/DBIx/DataSource.pm:${PORTSDIR}/databases/p5-DBIx-DataSource \ ${SITE_PERL}/DBIx/SearchBuilder.pm:${PORTSDIR}/databases/p5-DBIx-SearchBuilder \ ${ARCH_PERL}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \ ${SITE_PERL}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class \ @@ -32,7 +29,7 @@ BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ ${SITE_PERL}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \ ${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \ ${ARCH_PERL}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \ - ${SITE_PERL}/HTML/Formatter.pm:${PORTSDIR}/textproc/p5-HTML-Format \ + ${SITE_PERL}/HTML/FormatText.pm:${PORTSDIR}/textproc/p5-HTML-Format \ ${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \ ${SITE_PERL}/Locale/Maketext.pm:${PORTSDIR}/devel/p5-Locale-Maketext \ ${SITE_PERL}/Locale/Maketext/Fuzzy.pm:${PORTSDIR}/devel/p5-Locale-Maketext-Fuzzy \ @@ -50,7 +47,6 @@ BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \ ${SITE_PERL}/Text/Quoted.pm:${PORTSDIR}/textproc/p5-Text-Quoted \ ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \ ${SITE_PERL}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper \ - ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash \ ${ARCH_PERL}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \ ${SITE_PERL}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time-modules \ ${SITE_PERL}/WWW/Mechanize.pm:${PORTSDIR}/www/p5-WWW-Mechanize @@ -81,6 +77,8 @@ BUILD_DEPENDS+= ${SITE_PERL}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI .if defined(WITH_APACHE2) APACHE_PORT?= ${PORTSDIR}/www/apache2 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache2/mod_perl.so:${PORTSDIR}/www/mod_perl2 +DEPENDS_ARGS+= WITHOUT_MODPERL=yes +DEPENDS_ARGS+= WITH_MODPERL2=yes .else APACHE_PORT?= ${PORTSDIR}/www/apache13 BUILD_DEPENDS+= ${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl @@ -133,6 +131,7 @@ pre-install: post-install: @${INSTALL_DATA} ${WRKSRC}/README ${RT_PATH}/README + @${INSTALL_SCRIPT} ${FILESDIR}/ap2mp2-fix.pl ${RT_PATH}/bin .if defined(UPGRADE) @echo Upgrade of RT3 complete. .else diff --git a/www/rt3/files/ap2mp2-fix.pl b/www/rt3/files/ap2mp2-fix.pl new file mode 100644 index 000000000000..fb04960150c0 --- /dev/null +++ b/www/rt3/files/ap2mp2-fix.pl @@ -0,0 +1,10 @@ +# 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 --git a/www/rt3/pkg-message b/www/rt3/pkg-message index 414f02c0b294..6501c1edfa9a 100644 --- a/www/rt3/pkg-message +++ b/www/rt3/pkg-message @@ -6,9 +6,12 @@ To complete the installation of this port, please follow these steps: 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. Restart Apache. -4. Do remember to *CHANGE* the root's password for the web interface. +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. The default is "password" (without the quotes.) -5. Configure RT per the instructions at http://www.fsck.com/rtfm/. +6. Configure RT per the instructions at http://www.fsck.com/rtfm/. ===================================================================== diff --git a/www/rt3/pkg-plist b/www/rt3/pkg-plist index 23740c9e2afe..45ff6ded7cc2 100644 --- a/www/rt3/pkg-plist +++ b/www/rt3/pkg-plist @@ -1,5 +1,4 @@ rt3/etc/RT_Config.pm -rt3/etc/RT_SiteConfig.pm rt3/etc/initialdata rt3/etc/schema.SQLite rt3/etc/schema.Pg @@ -344,6 +343,7 @@ rt3/lib/RT/Attachment.pm rt3/lib/RT/Attachment_Overlay.pm rt3/lib/RT.pm.in rt3/lib/RT.pm +rt3/bin/ap2mp2-fix.pl rt3/bin/rt-crontool rt3/bin/webmux.pl rt3/bin/mason_handler.svc @@ -352,7 +352,6 @@ rt3/bin/rt-mailgate rt3/sbin/rt-test-dependencies rt3/sbin/rt-setup-database rt3/README - @dirrm rt3/var/session_data @dirrm rt3/var/mason_data/obj @dirrm rt3/var/mason_data/etc @@ -390,6 +389,7 @@ rt3/README @dirrm rt3/sbin @dirrm rt3/local/po @dirrm rt3/local/html +@dirrm rt3/local/etc @dirrm rt3/local @dirrm rt3/lib/t/regression @dirrm rt3/lib/t/data |