ports/50412: [UPDATE] www/reportmagic from 2.13 to 2.20

Martin Matuska martin at tradex.sk
Sat Mar 29 01:20:20 UTC 2003 

>Number:         50412
>Category:       ports
>Synopsis:       [UPDATE] www/reportmagic from 2.13 to 2.20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 28 17:20:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska <martin at tradex.sk>
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD tradex.sk 4.7-RELEASE-p2 FreeBSD 4.7-RELEASE-p2 #0: Tue Dec 3 13:13:38 CET 2002

>Description:
	Update to version 2.20
	MASTER_SITES updated
	Renamed and modified patch file
	Updated documentation to be PORTDOCS-compliant
	Added hint for international users of FreeBSD and perl 5.005_03
>How-To-Repeat:
>Fix:
Files (and/or directories) to remove:

www/reportmagic/files/patch-aa

Reason for file removal:
Modified not to install documentation by default, renamed to patch-Install.PL

Diff:

diff -Nbur www/reportmagic.old/Makefile www/reportmagic/Makefile
--- www/reportmagic.old/Makefile	Fri Mar 28 20:17:51 2003
+++ www/reportmagic/Makefile	Sat Mar 29 02:00:56 2003
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	reportmagic
-PORTVERSION=	2.13
+PORTVERSION=	2.20
 CATEGORIES=	www
-MASTER_SITES=	http://www.reportmagic.com/	\
-		http://www.reportmagic.org.uk/	\
-		http://www.reportmagic.de/	\
-		http://be.reportmagic.org/
+MASTER_SITES=	http://www.reportmagic.org/	\
+		http://uk.reportmagic.org/	\
+		http://be.reportmagic.org/	\
+		http://au.reportmagic.org/
 DISTNAME=	rmagic-${PORTVERSION}
+DISTFILES=	rmagic-2.20-2${EXTRACT_SUFX}
 
 MAINTAINER=	jeremy at external.org
 COMMENT=	A web site statistics post-processor for Analog
@@ -25,14 +26,30 @@
 WRKSRC=		${WRKDIR}/${DISTNAME}
 NO_BUILD=	YES
 
+DOCS=	FTL.txt advanced.html cgi.html changes.html changes0.html changes1.html columns.html commands.html config.html \
+	datefmts.html faq.html filefmts.html index.html inst_mac.html inst_osx.html inst_osx1.html inst_src.html \
+	inst_win.html jpeg.txt libgd.txt libpng.txt license.html map.html numfmts.html overview.html repconf.html \
+	reports.html samples.html siteindex.html thanks.html whatsnew.html zlib.txt
+
+DOCS_IMAGES= logo.gif title.gif
+
 do-install:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Install.PL -no_modules
 
 post-install:
-	@${ECHO}
-	@${ECHO} "You must agree to the [Artistic] license agreement at"
-	@${ECHO} "${PREFIX}/share/doc/reportmagic/license.html before"
-	@${ECHO} "using Report Magic."
-	@${ECHO}
+	@${CAT} ${PKGDIR}/pkg-message
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR} ${DOCSDIR}/images
+.for file in INSTALL README
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.for file in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
+.endfor
+.for file in ${DOCS_IMAGES}
+	@${INSTALL_DATA} ${WRKSRC}/docs/images/${file} ${DOCSDIR}/images
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff -Nbur www/reportmagic.old/distinfo www/reportmagic/distinfo
--- www/reportmagic.old/distinfo	Fri Mar 28 20:17:51 2003
+++ www/reportmagic/distinfo	Sat Mar 29 01:41:42 2003
@@ -1 +1 @@
-MD5 (rmagic-2.13.tar.gz) = 19e90fa82bb367eaa38390160c853bed
+MD5 (rmagic-2.20-2.tar.gz) = 0805393e2a4f8d7fd7b823f59d1e4b4a
diff -Nbur www/reportmagic.old/files/patch-Install.PL www/reportmagic/files/patch-Install.PL
--- www/reportmagic.old/files/patch-Install.PL	Thu Jan  1 01:00:00 1970
+++ www/reportmagic/files/patch-Install.PL	Sat Mar 29 01:41:42 2003
@@ -0,0 +1,24 @@
+--- Install.PL.orig	Tue Mar 25 10:20:00 2003
++++ Install.PL	Sat Mar 29 01:32:55 2003
+@@ -59,7 +59,7 @@
+ # example to use the version number in your path. 
+ # Make sure this remains in single quotes.
+ #
+-$DEST = '/usr/local/bin/rmagic-$(VERSION)/';
++$DEST = "$ENV{'PREFIX'}/reportmagic/";
+  
+ #
+ # Where do you want documentation to be installed?
+@@ -253,9 +253,9 @@
+ 	# Now install Report Magic Documentation
+ 	#
+ 
+-	print "Installing documentation in $DOC.\n";
+-		&install( $FILE_MODE, 'docs/', $DOC ) || $err_cnt++;
+-		&install( $FILE_MODE, 'docs/images/', $DOC.'images/' ) || $err_cnt++;
++#	print "Installing documentation in $DOC.\n";
++#		&install( $FILE_MODE, 'docs/', $DOC ) || $err_cnt++;
++#		&install( $FILE_MODE, 'docs/images/', $DOC.'images/' ) || $err_cnt++;
+ 
+ } # end unless
+ 
diff -Nbur www/reportmagic.old/pkg-message www/reportmagic/pkg-message
--- www/reportmagic.old/pkg-message	Fri Mar 28 20:17:51 2003
+++ www/reportmagic/pkg-message	Sat Mar 29 02:06:06 2003
@@ -1,3 +1,12 @@
 You must agree to the [Artistic] license agreement at
 /usr/local/share/doc/reportmagic/license.html before
 using Report Magic.
+
+Attention international users:
+If you encounter problems with FreeBSD 4.x and perl 5.005_03
+you might want to download Local.pm from
+
+http://www.reportmagic.org/dev/Local.pm
+
+and install it under Time/ in your reportmagic directory
+(example: /usr/local/reportmagic/Time/Local.pm)
diff -Nbur www/reportmagic.old/pkg-plist www/reportmagic/pkg-plist
--- www/reportmagic.old/pkg-plist	Fri Mar 28 20:17:51 2003
+++ www/reportmagic/pkg-plist	Sat Mar 29 01:41:42 2003
@@ -1,10 +1,12 @@
 reportmagic/README
-reportmagic/analogo.gif
+reportmagic/analogo.png
 reportmagic/rmagic.pl
 reportmagic/rmagic.sample
-reportmagic/rmlogo.gif
+reportmagic/rmlogo.png
 reportmagic/sample.dat
 reportmagic/lang/INDEX.txt
+reportmagic/lang/.root/cdata.ini
+reportmagic/lang/.root/rdata.ini
 reportmagic/lang/ca/cdata.ini
 reportmagic/lang/ca/lang.ini
 reportmagic/lang/ca/rdata.ini
@@ -21,6 +23,9 @@
 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,6 +38,15 @@
 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
@@ -43,10 +57,16 @@
 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/samples/corpimg.ini
 reportmagic/samples/fineprint.html
 reportmagic/samples/manyfile.ini
@@ -70,55 +90,68 @@
 reportmagic/wadg/rm/Report/RangeReport.pm
 reportmagic/wadg/rm/Report/TimeReport.pm
 reportmagic/wadg/rm/Report/TimeSummary.pm
-share/doc/reportmagic/advanced.html
-share/doc/reportmagic/changes.html
-share/doc/reportmagic/changes0.html
-share/doc/reportmagic/changes1.html
-share/doc/reportmagic/columns.html
-share/doc/reportmagic/commands.html
-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/index.html
-share/doc/reportmagic/inst_mac.html
-share/doc/reportmagic/inst_osx.html
-share/doc/reportmagic/inst_src.html
-share/doc/reportmagic/inst_win.html
-share/doc/reportmagic/jpeg.txt
-share/doc/reportmagic/libgd.txt
-share/doc/reportmagic/libpng.txt
-share/doc/reportmagic/license.html
-share/doc/reportmagic/map.html
-share/doc/reportmagic/overview.html
-share/doc/reportmagic/repconf.html
-share/doc/reportmagic/reports.html
-share/doc/reportmagic/samples.html
-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
+%%PORTDOCS%%share/doc/reportmagic/INSTALL
+%%PORTDOCS%%share/doc/reportmagic/README
+%%PORTDOCS%%share/doc/reportmagic/advanced.html
+%%PORTDOCS%%share/doc/reportmagic/cgi.html
+%%PORTDOCS%%share/doc/reportmagic/changes.html
+%%PORTDOCS%%share/doc/reportmagic/changes0.html
+%%PORTDOCS%%share/doc/reportmagic/changes1.html
+%%PORTDOCS%%share/doc/reportmagic/columns.html
+%%PORTDOCS%%share/doc/reportmagic/commands.html
+%%PORTDOCS%%share/doc/reportmagic/config.html
+%%PORTDOCS%%share/doc/reportmagic/datefmts.html
+%%PORTDOCS%%share/doc/reportmagic/faq.html
+%%PORTDOCS%%share/doc/reportmagic/filefmts.html
+%%PORTDOCS%%share/doc/reportmagic/FTL.txt
+%%PORTDOCS%%share/doc/reportmagic/index.html
+%%PORTDOCS%%share/doc/reportmagic/inst_mac.html
+%%PORTDOCS%%share/doc/reportmagic/inst_osx.html
+%%PORTDOCS%%share/doc/reportmagic/inst_osx1.html
+%%PORTDOCS%%share/doc/reportmagic/inst_src.html
+%%PORTDOCS%%share/doc/reportmagic/inst_win.html
+%%PORTDOCS%%share/doc/reportmagic/jpeg.txt
+%%PORTDOCS%%share/doc/reportmagic/libgd.txt
+%%PORTDOCS%%share/doc/reportmagic/libpng.txt
+%%PORTDOCS%%share/doc/reportmagic/license.html
+%%PORTDOCS%%share/doc/reportmagic/map.html
+%%PORTDOCS%%share/doc/reportmagic/numfmts.html
+%%PORTDOCS%%share/doc/reportmagic/overview.html
+%%PORTDOCS%%share/doc/reportmagic/repconf.html
+%%PORTDOCS%%share/doc/reportmagic/reports.html
+%%PORTDOCS%%share/doc/reportmagic/samples.html
+%%PORTDOCS%%share/doc/reportmagic/siteindex.html
+%%PORTDOCS%%share/doc/reportmagic/thanks.html
+%%PORTDOCS%%share/doc/reportmagic/whatsnew.html
+%%PORTDOCS%%share/doc/reportmagic/zlib.txt
+%%PORTDOCS%%share/doc/reportmagic/images/logo.gif
+%%PORTDOCS%%share/doc/reportmagic/images/title.gif
 @dirrm reportmagic/samples/images
 @dirrm reportmagic/samples
+ at dirrm reportmagic/lang/.root
 @dirrm reportmagic/lang/ca
 @dirrm reportmagic/lang/de
 @dirrm reportmagic/lang/en
 @dirrm reportmagic/lang/es
+ at dirrm reportmagic/lang/fi
 @dirrm reportmagic/lang/fr
 @dirrm reportmagic/lang/hu
 @dirrm reportmagic/lang/it
+ at dirrm reportmagic/lang/ja
+ at dirrm reportmagic/lang/no
 @dirrm reportmagic/lang/pl
 @dirrm reportmagic/lang/pt
 @dirrm reportmagic/lang/pt-BR
 @dirrm reportmagic/lang/ru
 @dirrm reportmagic/lang/sv
+ at dirrm reportmagic/lang/zh/BIG5
+ at dirrm reportmagic/lang/zh/ENGLISH
+ at dirrm reportmagic/lang/zh/GB
+ at dirrm reportmagic/lang/zh
 @dirrm reportmagic/lang
 @dirrm reportmagic/wadg/rm/Report
 @dirrm reportmagic/wadg/rm
 @dirrm reportmagic/wadg
 @dirrm reportmagic
- at dirrm share/doc/reportmagic/images
- at dirrm share/doc/reportmagic
+%%PORTDOCS%%@dirrm share/doc/reportmagic/images
+%%PORTDOCS%%@dirrm share/doc/reportmagic
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list