5 files changed, 83 insertions, 42 deletions

diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index 2c8a129a09bc..ab5780d45e5a 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	reportmagic
-PORTVERSION=	2.13
+PORTVERSION=	2.21
 CATEGORIES=	www
-MASTER_SITES=	http://www.reportmagic.com/	\
+MASTER_SITES=	http://www.reportmagic.org/	\
 		http://www.reportmagic.org.uk/	\
 		http://www.reportmagic.de/	\
 		http://be.reportmagic.org/
@@ -20,7 +20,8 @@ COMMENT=	A web site statistics post-processor for Analog
 RUN_DEPENDS=	analog:${PORTSDIR}/www/analog \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	YES
diff --git a/www/reportmagic/distinfo b/www/reportmagic/distinfo
index e8a8577ab430..07ba44186bad 100644
--- a/www/reportmagic/distinfo
+++ b/www/reportmagic/distinfo
@@ -1 +1 @@
-MD5 (rmagic-2.13.tar.gz) = 19e90fa82bb367eaa38390160c853bed
+MD5 (rmagic-2.21.tar.gz) = 23b109da43e34d2ee3b8390c20daa98a
diff --git a/www/reportmagic/files/patch-aa b/www/reportmagic/files/patch-aa
index 456dfbc19a29..7bdb922cae2f 100644
--- a/www/reportmagic/files/patch-aa
+++ b/www/reportmagic/files/patch-aa
@@ -1,6 +1,6 @@
---- Install.PL.orig	Fri Jan 18 04:13:00 2002
-+++ Install.PL	Mon Feb 25 16:40:33 2002
-@@ -56,13 +56,13 @@
+--- Install.PL.orig	Wed Apr  2 09:21:00 2003
++++ Install.PL	Fri Apr  4 19:59:41 2003
+@@ -59,13 +59,13 @@
  # example to use the version number in your path. 
  # Make sure this remains in single quotes.
  #
@@ -16,7 +16,7 @@
  
  
  #
-@@ -266,7 +266,6 @@
+@@ -269,7 +269,6 @@
  	$DOC = 'docs/' if defined $args{only_modules};
  	print "\nInstallation complete.\n";
  	print "For help on using Report Magic see $DOC"."index.html.\n";
@@ -24,7 +24,7 @@
  } # end if
  
  
-@@ -302,7 +301,6 @@
+@@ -305,7 +304,6 @@
  			chmod( $mode, $dest );
  		} else {
  			print "\t***Error: Can not copy $src to $dest. $!.\n";
diff --git a/www/reportmagic/pkg-descr b/www/reportmagic/pkg-descr
index 468950461625..074e9e1739a3 100644
--- a/www/reportmagic/pkg-descr
+++ b/www/reportmagic/pkg-descr
@@ -3,4 +3,4 @@ web site statistics software. Report Magic uses the statistics generated
 by Analog and formatting options set by you to make readable, presentable 
 reports of your Web site data.
 
-WWW:  http://www.reportmagic.com
+WWW:  http://www.reportmagic.org
diff --git a/www/reportmagic/pkg-plist b/www/reportmagic/pkg-plist
index fc8888de7e9f..849f6ead0cd8 100644
--- a/www/reportmagic/pkg-plist
+++ b/www/reportmagic/pkg-plist
@@ -1,9 +1,7 @@
 reportmagic/README
-reportmagic/analogo.gif
-reportmagic/rmagic.pl
-reportmagic/rmagic.sample
-reportmagic/rmlogo.gif
-reportmagic/sample.dat
+reportmagic/analogo.png
+reportmagic/lang/.root/cdata.ini
+reportmagic/lang/.root/rdata.ini
 reportmagic/lang/INDEX.txt
 reportmagic/lang/ca/cdata.ini
 reportmagic/lang/ca/lang.ini
@@ -21,6 +19,9 @@ reportmagic/lang/es/cdata.ini
 reportmagic/lang/es/lang.ini
 reportmagic/lang/es/rdata.ini
 reportmagic/lang/es/rmagic.ini
+reportmagic/lang/fi/cdata.ini
+reportmagic/lang/fi/lang.ini
+reportmagic/lang/fi/rdata.ini
 reportmagic/lang/fr/cdata.ini
 reportmagic/lang/fr/lang.ini
 reportmagic/lang/fr/rdata.ini
@@ -33,44 +34,77 @@ reportmagic/lang/it/cdata.ini
 reportmagic/lang/it/lang.ini
 reportmagic/lang/it/rdata.ini
 reportmagic/lang/it/rmagic.ini
+reportmagic/lang/ja/cdata.ini
+reportmagic/lang/ja/install_instruction.txt
+reportmagic/lang/ja/lang.ini
+reportmagic/lang/ja/rdata.ini
+reportmagic/lang/ja/rmagic.ini
+reportmagic/lang/no/cdata.ini
+reportmagic/lang/no/lang.ini
+reportmagic/lang/no/rdata.ini
+reportmagic/lang/no/rmagic.ini
 reportmagic/lang/pl/cdata.ini
 reportmagic/lang/pl/lang.ini
 reportmagic/lang/pl/rdata.ini
+reportmagic/lang/pt-BR/cdata.ini
+reportmagic/lang/pt-BR/lang.ini
+reportmagic/lang/pt-BR/rdata.ini
 reportmagic/lang/pt/cdata.ini
 reportmagic/lang/pt/lang.ini
 reportmagic/lang/pt/rdata.ini
-reportmagic/lang/pt-BR/lang.ini
-reportmagic/lang/pt-BR/cdata.ini
-reportmagic/lang/pt-BR/rdata.ini
 reportmagic/lang/ru/cdata.ini
+reportmagic/lang/ru/lang.ini
+reportmagic/lang/ru/rdata.ini
+reportmagic/lang/ru/rmagic.ini
 reportmagic/lang/sv/cdata.ini
 reportmagic/lang/sv/lang.ini
 reportmagic/lang/sv/rdata.ini
 reportmagic/lang/sv/rmagic.ini
+reportmagic/lang/zh/cdata.ini
+reportmagic/lang/zh/lang.ini
+reportmagic/lang/zh/rdata.ini
+reportmagic/rmagic.pl
+reportmagic/rmagic.sample
+reportmagic/rmlogo.png
+reportmagic/sample.dat
+reportmagic/samples/all-settings-ca.ini
+reportmagic/samples/all-settings-de.ini
+reportmagic/samples/all-settings-en.ini
+reportmagic/samples/all-settings-es.ini
+reportmagic/samples/all-settings-fr.ini
+reportmagic/samples/all-settings-hu.ini
+reportmagic/samples/all-settings-it.ini
+reportmagic/samples/all-settings-ja.ini
+reportmagic/samples/all-settings-no.ini
+reportmagic/samples/all-settings-ru.ini
+reportmagic/samples/all-settings-sv.ini
 reportmagic/samples/corpimg.ini
 reportmagic/samples/fineprint.html
-reportmagic/samples/manyfile.ini
-reportmagic/samples/noframes.ini
-reportmagic/samples/onefile.ini
-reportmagic/samples/report.dat
 reportmagic/samples/images/back.jpg
 reportmagic/samples/images/bullet.gif
 reportmagic/samples/images/bullet2.gif
 reportmagic/samples/images/layout.gif
+reportmagic/samples/manyfile.ini
+reportmagic/samples/noframes.ini
+reportmagic/samples/onefile.ini
+reportmagic/samples/report.dat
+reportmagic/samples/reportmagic-org.ini
 reportmagic/wadg/Errors.pm
 reportmagic/wadg/Formatter.pm
 reportmagic/wadg/HTMLWriter.pm
 reportmagic/wadg/rm/CROParser.pm
 reportmagic/wadg/rm/Graphs.pm
 reportmagic/wadg/rm/Report.pm
-reportmagic/wadg/rm/Settings.pm
 reportmagic/wadg/rm/Report/GeneralSummary.pm
 reportmagic/wadg/rm/Report/HierarchicalReport.pm
 reportmagic/wadg/rm/Report/QuickSummary.pm
 reportmagic/wadg/rm/Report/RangeReport.pm
 reportmagic/wadg/rm/Report/TimeReport.pm
 reportmagic/wadg/rm/Report/TimeSummary.pm
+reportmagic/wadg/rm/Settings.pm
+share/doc/reportmagic/FTL.txt
 share/doc/reportmagic/advanced.html
+share/doc/reportmagic/cgi.html
 share/doc/reportmagic/changes.html
 share/doc/reportmagic/changes0.html
 share/doc/reportmagic/changes1.html
@@ -80,10 +114,12 @@ share/doc/reportmagic/config.html
 share/doc/reportmagic/datefmts.html
 share/doc/reportmagic/faq.html
 share/doc/reportmagic/filefmts.html
-share/doc/reportmagic/FTL.txt
+share/doc/reportmagic/images/logo.gif
+share/doc/reportmagic/images/title.gif
 share/doc/reportmagic/index.html
 share/doc/reportmagic/inst_mac.html
 share/doc/reportmagic/inst_osx.html
+share/doc/reportmagic/inst_osx1.html
 share/doc/reportmagic/inst_src.html
 share/doc/reportmagic/inst_win.html
 share/doc/reportmagic/jpeg.txt
@@ -91,6 +127,7 @@ share/doc/reportmagic/libgd.txt
 share/doc/reportmagic/libpng.txt
 share/doc/reportmagic/license.html
 share/doc/reportmagic/map.html
+share/doc/reportmagic/numfmts.html
 share/doc/reportmagic/overview.html
 share/doc/reportmagic/repconf.html
 share/doc/reportmagic/reports.html
@@ -99,26 +136,29 @@ share/doc/reportmagic/siteindex.html
 share/doc/reportmagic/thanks.html
 share/doc/reportmagic/whatsnew.html
 share/doc/reportmagic/zlib.txt
-share/doc/reportmagic/images/logo.gif
-share/doc/reportmagic/images/title.gif
+@dirrm share/doc/reportmagic/images
+@dirrm share/doc/reportmagic
+@dirrm reportmagic/wadg/rm/Report
+@dirrm reportmagic/wadg/rm
+@dirrm reportmagic/wadg
 @dirrm reportmagic/samples/images
 @dirrm reportmagic/samples
-@dirrm reportmagic/lang/ca
-@dirrm reportmagic/lang/de
-@dirrm reportmagic/lang/en
-@dirrm reportmagic/lang/es
-@dirrm reportmagic/lang/fr
-@dirrm reportmagic/lang/hu
-@dirrm reportmagic/lang/it
-@dirrm reportmagic/lang/pl
-@dirrm reportmagic/lang/pt
-@dirrm reportmagic/lang/pt-BR
-@dirrm reportmagic/lang/ru
+@dirrm reportmagic/lang/zh
 @dirrm reportmagic/lang/sv
+@dirrm reportmagic/lang/ru
+@dirrm reportmagic/lang/pt-BR
+@dirrm reportmagic/lang/pt
+@dirrm reportmagic/lang/pl
+@dirrm reportmagic/lang/no
+@dirrm reportmagic/lang/ja
+@dirrm reportmagic/lang/it
+@dirrm reportmagic/lang/hu
+@dirrm reportmagic/lang/fr
+@dirrm reportmagic/lang/fi
+@dirrm reportmagic/lang/es
+@dirrm reportmagic/lang/en
+@dirrm reportmagic/lang/de
+@dirrm reportmagic/lang/ca
+@dirrm reportmagic/lang/.root
 @dirrm reportmagic/lang
-@dirrm reportmagic/wadg/rm/Report
-@dirrm reportmagic/wadg/rm
-@dirrm reportmagic/wadg
 @dirrm reportmagic
-@dirrm share/doc/reportmagic/images
-@dirrm share/doc/reportmagic