[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/reportmagic update

To: ports_(_at_)_openbsd_(_dot_)_org
Subject: www/reportmagic update
From: Sam Smith <S_(_at_)_mSmith_(_dot_)_net>
Date: Mon, 12 Apr 2004 20:10:26 +0100 (BST)
Cc: Michael Flanagan <michael_(_at_)_visionquestsoftware_(_dot_)_com>
Update and Unbreak www/reportmagic

Sorry for the delay in updating; but the patches below
should make future updates a lot easier by modifying the 
way reportmagic goes about installing things. They will be
incorporated into the next reportmagic release (which isn't
imminent).

Comments welcome.

Regards
Sam

Index: www/reportmagic/Makefile
===================================================================
RCS file: /library/OpenBSD/ports/www/reportmagic/Makefile,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile
--- www/reportmagic/Makefile    18 Oct 2003 19:44:57 -0000      1.5
+++ www/reportmagic/Makefile    12 Apr 2004 19:02:30 -0000
@@ -1,12 +1,10 @@
 # $OpenBSD: Makefile,v 1.5 2003/10/18 19:44:57 sturm Exp $
 
-BROKEN=                "not functional; needs update"
-
 COMMENT=       "make pretty graphs from Analog logfiles"
 
-VERSION=       2.13
+VERSION=       2.21
 DISTNAME=      rmagic-${VERSION}
-PKGNAME=       reportmagic-${VERSION}p1
+PKGNAME=       reportmagic-${VERSION}
 CATEGORIES=    www
 
 HOMEPAGE=      http://www.reportmagic.org/
Index: www/reportmagic/distinfo
===================================================================
RCS file: /library/OpenBSD/ports/www/reportmagic/distinfo,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 distinfo
--- www/reportmagic/distinfo    27 Feb 2002 01:01:57 -0000      1.1.1.1
+++ www/reportmagic/distinfo    8 Apr 2004 16:44:33 -0000
@@ -1,3 +1,3 @@
-MD5 (rmagic-2.13.tar.gz) = 19e90fa82bb367eaa38390160c853bed
-RMD160 (rmagic-2.13.tar.gz) = 31951c896758d73047b92ea7e7a7d00dd5c56a74
-SHA1 (rmagic-2.13.tar.gz) = c51a63676ea104b96e978e3358eee23c843c586a
+MD5 (rmagic-2.21.tar.gz) = 23b109da43e34d2ee3b8390c20daa98a
+RMD160 (rmagic-2.21.tar.gz) = d73d766ed038c3ae35e5cfc2db0d14888f37d074
+SHA1 (rmagic-2.21.tar.gz) = 8ead933615963cf2632b8ba2faa12599ab17875d
Index: www/reportmagic/patches/patch-Install_PL
===================================================================
RCS file: /library/OpenBSD/ports/www/reportmagic/patches/patch-Install_PL,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-Install_PL
--- www/reportmagic/patches/patch-Install_PL    27 Feb 2002 01:01:57 -0000      1.1.1.1
+++ www/reportmagic/patches/patch-Install_PL    8 Apr 2004 18:15:46 -0000
@@ -1,16 +1,16 @@
 $OpenBSD: patch-Install_PL,v 1.1.1.1 2002/02/27 01:01:57 naddy Exp $
---- Install.PL.orig    Fri Jan 18 10:13:00 2002
-+++ Install.PL Wed Feb 27 01:50:29 2002
-@@ -43,7 +43,7 @@ use strict;
+--- Install.PL.orig    2003-04-02 10:21:00.000000000 +0100
++++ Install.PL 2004-04-08 17:49:53.000000000 +0100
+@@ -46,7 +46,7 @@ use strict;
  use File::Copy;
  use File::Path;
  use Cwd;
 -use vars qw( $DEST $DOC $FILE_MODE $EXEC_MODE );
-+use vars qw( $DEST $PERL_DEST $BIN_DEST $DOC $FILE_MODE $EXEC_MODE );
++use vars qw( $DEST $PERL_DEST $BIN_DEST $DOC_DEST $FILE_MODE $EXEC_MODE );
  
  #
  # The following configurations may be made to modify the install
-@@ -56,13 +56,15 @@ use vars qw( $DEST $DOC $FILE_MODE $EXEC
+@@ -59,13 +59,15 @@ use vars qw( $DEST $DOC $FILE_MODE $EXEC
  # example to use the version number in your path. 
  # Make sure this remains in single quotes.
  #
@@ -24,24 +24,35 @@
  # You can use string concatenation, as in this example, 
  # to install the docs below the program.
 -$DOC = $DEST . 'docs/';
-+$DOC = "$ENV{'PREFIX'}/share/doc/reportmagic/";
++$DOC_DEST = "$ENV{'PREFIX'}/share/doc/reportmagic/";
  
  
  #
-@@ -226,10 +228,10 @@ installing the necessary Perl modules no
- #
- unless( defined $args{only_modules} || $err_cnt ) {
-       chdir( $cwd );
--      print "Installing Report Magic files in $DEST.\n";
-+      print "Installing Report Magic files in $ENV{'TRUEPREFIX'}.\n";
-               # make sure $DEST exisits
-               if( !-d $DEST ) {
--                      print "... Path does not exits, making it.\n";
-+#                     print "... Path does not exits, making it.\n";
-                       mkpath( $DEST );
-               } # end if
-               &install( $FILE_MODE, 'README', $DEST ) || $err_cnt++;
-@@ -243,14 +245,14 @@ unless( defined $args{only_modules} || $
+@@ -100,19 +102,19 @@ foreach ( @ARGV ) {
+               $args{$k} = $v;
+       } else {
+               $DEST = $_;
+-              $DOC = $DEST . 'docs/';
++              $DOC_DEST = $DEST . 'docs/';
+       } # end if
+ } # end foreach
+ 
+ 
+ # Convert DEST, DOC
+ $DEST =~ s/\$\(VERSION\)/$VERSION/g;
+-$DOC =~ s/\$\(VERSION\)/$VERSION/g;
++$DOC_DEST=~ s/\$\(VERSION\)/$VERSION/g;
+ if( $DEST !~ m#/$# ) {
+       $DEST .= '/';
+ } # end if
+-if( $DOC !~ m#/$# ) {
+-      $DOC .= '/';
++if( $DOC_DEST !~ m#/$# ) {
++      $DOC_DEST .= '/';
+ } # end if
+ 
+ # Get CWD for later ('cause CPAN module is poorly behaved!)
+@@ -246,16 +247,16 @@ unless( defined $args{only_modules} || $
        print "... Installing Report Magic language files.\n";
                &install( $FILE_MODE, 'lang/', $DEST.'lang/' ) || $err_cnt++;
        print "... Installing Report Magic program files.\n";
@@ -55,13 +66,20 @@
        #
  
 -      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.\n";
-               &install( $FILE_MODE, 'docs/', $DOC ) || $err_cnt++;
-               &install( $FILE_MODE, 'docs/images/', $DOC.'images/' ) || $err_cnt++;
++              &install( $FILE_MODE, 'docs/', $DOC_DEST ) || $err_cnt++;
++              &install( $FILE_MODE, 'docs/images/', $DOC_DEST.'images/' ) || $err_cnt++;
+ 
+ } # end unless
  
-@@ -265,8 +267,6 @@ if( $err_cnt ) {
+@@ -266,10 +267,8 @@ if( $err_cnt ) {
+       print "correct the situation. Often, by reading the error \n";
+       print "messages you can determine what needs to be changed.\n";
  } else {
-       $DOC = 'docs/' if defined $args{only_modules};
+-      $DOC = 'docs/' if defined $args{only_modules};
++      $DOC_DEST = 'docs/' if defined $args{only_modules};
        print "\nInstallation complete.\n";
 -      print "For help on using Report Magic see $DOC"."index.html.\n";
 -      print "You must agree to the license agreement at $DOC"."license.html before using Report Magic.\n";
Index: www/reportmagic/patches/patch-rmagic_pl
===================================================================
RCS file: /library/OpenBSD/ports/www/reportmagic/patches/patch-rmagic_pl,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 patch-rmagic_pl
--- www/reportmagic/patches/patch-rmagic_pl     27 Feb 2002 01:01:57 -0000      1.1.1.1
+++ www/reportmagic/patches/patch-rmagic_pl     8 Apr 2004 18:09:46 -0000
@@ -1,17 +1,24 @@
 $OpenBSD: patch-rmagic_pl,v 1.1.1.1 2002/02/27 01:01:57 naddy Exp $
---- rmagic.pl.orig     Fri Jan 18 10:13:00 2002
-+++ rmagic.pl  Wed Feb 27 01:49:51 2002
-@@ -60,10 +60,11 @@ use File::Path;
- use File::Spec;
+--- rmagic.pl.orig     2003-04-02 10:21:00.000000000 +0100
++++ rmagic.pl  2004-04-08 17:49:15.000000000 +0100
+@@ -103,7 +103,9 @@ use File::Spec;
  
- # - Find execution directory
--use FindBin qw($RealBin);
-+#use FindBin qw($RealBin);
-+my $RealBin= '%%PREFIX%%/share/reportmagic/';
  
  # - Add execution directory to lib path, resolving symbolic refs
 -use lib $RealBin;
++#use lib $RealBin;
++$RealBin= '%%PREFIX%%/share/reportmagic/';
 +use lib '%%PREFIX%%/share/reportmagic/';
  
  # - Read INI files
  use Config::IniFiles;
+--- rmagic.pl.orig     Wed Apr  2 10:21:00 2003
++++ rmagic.pl  Thu Apr  8 19:09:29 2004
+@@ -101,6 +101,7 @@
+ # it ships with 5.005 and 5.6
+ use File::Spec;
+ 
++$RealBin= '%%TRUEPREFIX%%/share/reportmagic/';
+ 
+ # - Add execution directory to lib path, resolving symbolic refs
+ use lib $RealBin;
Index: www/reportmagic/pkg/PLIST
===================================================================
RCS file: /library/OpenBSD/ports/www/reportmagic/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PLIST
--- www/reportmagic/pkg/PLIST   27 Feb 2002 01:01:57 -0000      1.1.1.1
+++ www/reportmagic/pkg/PLIST   8 Apr 2004 17:59:21 -0000
@@ -15,6 +15,7 @@
 libdata/perl5/site_perl/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
@@ -29,6 +30,7 @@
 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
@@ -36,6 +38,7 @@
 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
@@ -45,7 +48,9 @@
 share/doc/reportmagic/whatsnew.html
 share/doc/reportmagic/zlib.txt
 share/reportmagic/README
-share/reportmagic/analogo.gif
+share/reportmagic/analogo.png
+share/reportmagic/lang/.root/cdata.ini
+share/reportmagic/lang/.root/rdata.ini
 share/reportmagic/lang/INDEX.txt
 share/reportmagic/lang/ca/cdata.ini
 share/reportmagic/lang/ca/lang.ini
@@ -63,6 +68,9 @@
 share/reportmagic/lang/es/lang.ini
 share/reportmagic/lang/es/rdata.ini
 share/reportmagic/lang/es/rmagic.ini
+share/reportmagic/lang/fi/cdata.ini
+share/reportmagic/lang/fi/lang.ini
+share/reportmagic/lang/fi/rdata.ini
 share/reportmagic/lang/fr/cdata.ini
 share/reportmagic/lang/fr/lang.ini
 share/reportmagic/lang/fr/rdata.ini
@@ -75,6 +83,15 @@
 share/reportmagic/lang/it/lang.ini
 share/reportmagic/lang/it/rdata.ini
 share/reportmagic/lang/it/rmagic.ini
+share/reportmagic/lang/ja/cdata.ini
+share/reportmagic/lang/ja/install_instruction.txt
+share/reportmagic/lang/ja/lang.ini
+share/reportmagic/lang/ja/rdata.ini
+share/reportmagic/lang/ja/rmagic.ini
+share/reportmagic/lang/no/cdata.ini
+share/reportmagic/lang/no/lang.ini
+share/reportmagic/lang/no/rdata.ini
+share/reportmagic/lang/no/rmagic.ini
 share/reportmagic/lang/pl/cdata.ini
 share/reportmagic/lang/pl/lang.ini
 share/reportmagic/lang/pl/rdata.ini
@@ -85,13 +102,30 @@
 share/reportmagic/lang/pt/lang.ini
 share/reportmagic/lang/pt/rdata.ini
 share/reportmagic/lang/ru/cdata.ini
+share/reportmagic/lang/ru/lang.ini
+share/reportmagic/lang/ru/rdata.ini
+share/reportmagic/lang/ru/rmagic.ini
 share/reportmagic/lang/sv/cdata.ini
 share/reportmagic/lang/sv/lang.ini
 share/reportmagic/lang/sv/rdata.ini
 share/reportmagic/lang/sv/rmagic.ini
+share/reportmagic/lang/zh/cdata.ini
+share/reportmagic/lang/zh/lang.ini
+share/reportmagic/lang/zh/rdata.ini
 share/reportmagic/rmagic.sample
-share/reportmagic/rmlogo.gif
+share/reportmagic/rmlogo.png
 share/reportmagic/sample.dat
+share/reportmagic/samples/all-settings-ca.ini
+share/reportmagic/samples/all-settings-de.ini
+share/reportmagic/samples/all-settings-en.ini
+share/reportmagic/samples/all-settings-es.ini
+share/reportmagic/samples/all-settings-fr.ini
+share/reportmagic/samples/all-settings-hu.ini
+share/reportmagic/samples/all-settings-it.ini
+share/reportmagic/samples/all-settings-ja.ini
+share/reportmagic/samples/all-settings-no.ini
+share/reportmagic/samples/all-settings-ru.ini
+share/reportmagic/samples/all-settings-sv.ini
 share/reportmagic/samples/corpimg.ini
 share/reportmagic/samples/fineprint.html
 share/reportmagic/samples/images/back.jpg
@@ -102,20 +136,26 @@
 share/reportmagic/samples/noframes.ini
 share/reportmagic/samples/onefile.ini
 share/reportmagic/samples/report.dat
+share/reportmagic/samples/reportmagic-org.ini
 @dirrm share/reportmagic/samples/images
 @dirrm share/reportmagic/samples
+_(_at_)_dirrm share/reportmagic/lang/zh
 @dirrm share/reportmagic/lang/sv
 @dirrm share/reportmagic/lang/ru
 @dirrm share/reportmagic/lang/pt-BR
 @dirrm share/reportmagic/lang/pt
 @dirrm share/reportmagic/lang/pl
+_(_at_)_dirrm share/reportmagic/lang/no
+_(_at_)_dirrm share/reportmagic/lang/ja
 @dirrm share/reportmagic/lang/it
 @dirrm share/reportmagic/lang/hu
 @dirrm share/reportmagic/lang/fr
+_(_at_)_dirrm share/reportmagic/lang/fi
 @dirrm share/reportmagic/lang/es
 @dirrm share/reportmagic/lang/en
 @dirrm share/reportmagic/lang/de
 @dirrm share/reportmagic/lang/ca
+_(_at_)_dirrm share/reportmagic/lang/.root
 @dirrm share/reportmagic/lang
 @dirrm share/reportmagic
 @dirrm share/doc/reportmagic/images
Prev by Date: FIX: memtest port.
Next by Date: Re: Perl subdirectory?
Previous by thread: Re: FIX: memtest port.
Next by thread: Testing: Evolution 1.5.6.2
Index(es):
- Date
- Thread
Visit your host, monkey.org