Update to version 2.05

PR: 25262
Submitted by: MAINTAINER

4 files changed, 34 insertions, 46 deletions

diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index 8065cd179ef3..25b57fa9d5c0 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	reportmagic
-PORTVERSION=	2.04
+PORTVERSION=	2.05
 CATEGORIES=	www
 MASTER_SITES=	http://www.reportmagic.com/
 DISTNAME=	rmagic-${PORTVERSION}
@@ -20,28 +20,16 @@ RUN_DEPENDS=	analog:${PORTSDIR}/www/analog \
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-pre-fetch:
-
-	@${ECHO} -n "Report Magic will use FreeType if the GD library "
-	@${ECHO} "is compiled with it in."
-	@${ECHO} -n "GD is already listed as a LIB_DEPENDS, but in the "
-	@${ECHO} "event that GD is already "
-	@${ECHO} -n "installed *without* FreeType, you won't be able to "
-	@${ECHO} "use it.  If you want"
-	@${ECHO} -n "FreeType support, please (re)make ${PORTSDIR}/graphics/gd "
-	@${ECHO} "with -DWITH_X11."
-	@${ECHO}
-
-do-build:
+NO_BUILD=	YES
 
 do-install:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Install.PL -no_modules
 
 post-install:
 	@${ECHO}
-	@${ECHO} "You must agree to the [GPL] license agreement at"
-	@${ECHO} "${PREFIX}/share/doc/reportmagic/license.html"
-	@${ECHO} "before using Report Magic."
+	@${ECHO} "You must agree to the [Artistic] license agreement at"
+	@${ECHO} "${PREFIX}/share/doc/reportmagic/license.html before"
+	@${ECHO} "using Report Magic."
 	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/www/reportmagic/distinfo b/www/reportmagic/distinfo
index 1f6bc3e864da..18cf6238e773 100644
--- a/www/reportmagic/distinfo
+++ b/www/reportmagic/distinfo
@@ -1 +1 @@
-MD5 (rmagic-2.04.tar.gz) = 47b8d2bdb703e69e3b5d89eb842c0eaf
+MD5 (rmagic-2.05.tar.gz) = 81891c2bd169a53b3bcb05ddb2c92b58
diff --git a/www/reportmagic/pkg-message b/www/reportmagic/pkg-message
index 9bc74127ce77..8d714deefc8c 100644
--- a/www/reportmagic/pkg-message
+++ b/www/reportmagic/pkg-message
@@ -1,3 +1,3 @@
-You must agree to the [GPL] license agreement at
-/usr/local/share/doc/reportmagic/license.html
-before using Report Magic.
+You must agree to the [Artistic] license agreement at
+/usr/local/share/doc/reportmagic/license.html before
+using Report Magic.
diff --git a/www/reportmagic/pkg-plist b/www/reportmagic/pkg-plist
index 50ab90225e9a..90b8c4d97873 100644
--- a/www/reportmagic/pkg-plist
+++ b/www/reportmagic/pkg-plist
@@ -1,18 +1,10 @@
 reportmagic/README
-reportmagic/rmlogo.gif
 reportmagic/analogo.gif
-reportmagic/samples/corpimg.ini
-reportmagic/samples/fineprint.html
-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/rmagic.pl
 reportmagic/rmagic.sample
+reportmagic/rmlogo.gif
 reportmagic/sample.dat
+reportmagic/lang/INDEX.txt
 reportmagic/lang/ca/cdata.ini
 reportmagic/lang/ca/lang.ini
 reportmagic/lang/ca/rdata.ini
@@ -37,7 +29,6 @@ reportmagic/lang/hu/cdata.ini
 reportmagic/lang/hu/lang.ini
 reportmagic/lang/hu/rdata.ini
 reportmagic/lang/hu/rmagic.ini
-reportmagic/lang/INDEX.txt
 reportmagic/lang/it/cdata.ini
 reportmagic/lang/it/lang.ini
 reportmagic/lang/it/rdata.ini
@@ -49,20 +40,29 @@ reportmagic/lang/sv/rmagic.ini
 reportmagic/lang/zh/cdata.ini
 reportmagic/lang/zh/lang.ini
 reportmagic/lang/zh/rdata.ini
-reportmagic/rmagic.pl
+reportmagic/samples/corpimg.ini
+reportmagic/samples/fineprint.html
+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/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/Report.pm
-reportmagic/wadg/rm/Settings.pm
 share/doc/reportmagic/advanced.html
 share/doc/reportmagic/changes.html
 share/doc/reportmagic/changes0.html
@@ -73,8 +73,6 @@ share/doc/reportmagic/config.html
 share/doc/reportmagic/datefmts.html
 share/doc/reportmagic/faq.html
 share/doc/reportmagic/filefmts.html
-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_src.html
@@ -88,17 +86,19 @@ share/doc/reportmagic/samples.html
 share/doc/reportmagic/siteindex.html
 share/doc/reportmagic/thanks.html
 share/doc/reportmagic/whatsnew.html
+share/doc/reportmagic/images/logo.gif
+share/doc/reportmagic/images/title.gif
 @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/sv
 @dirrm reportmagic/lang/zh
+@dirrm reportmagic/lang/sv
+@dirrm reportmagic/lang/it
+@dirrm reportmagic/lang/hu
+@dirrm reportmagic/lang/fr
+@dirrm reportmagic/lang/es
+@dirrm reportmagic/lang/en
+@dirrm reportmagic/lang/de
+@dirrm reportmagic/lang/ca
 @dirrm reportmagic/lang
 @dirrm reportmagic/wadg/rm/Report
 @dirrm reportmagic/wadg/rm