CVS commit: pkgsrc/time/titrax

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Mar  1 12:23:07 UTC 2024

Modified Files:
        pkgsrc/time/titrax: Makefile distinfo
        pkgsrc/time/titrax/patches: patch-sumtitra patch-weekno.perl

Log Message:
time/titrax: replace the old perl ' module separator with ::.

Newer perl now complains if ' is used as module separator.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/time/titrax/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/time/titrax/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/titrax/patches/patch-sumtitra \
    pkgsrc/time/titrax/patches/patch-weekno.perl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/time/titrax/Makefile
diff -u pkgsrc/time/titrax/Makefile:1.40 pkgsrc/time/titrax/Makefile:1.41
--- pkgsrc/time/titrax/Makefile:1.40    Tue Jun 28 11:36:59 2022
+++ pkgsrc/time/titrax/Makefile Fri Mar  1 12:23:07 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2022/06/28 11:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2024/03/01 12:23:07 he Exp $
 #
 
 DISTNAME=              titrax-1.98
-PKGREVISION=           17
+PKGREVISION=           18
 CATEGORIES=            x11 time
 MASTER_SITES=          ${MASTER_SITE_XCONTRIB:=office/}
 

Index: pkgsrc/time/titrax/distinfo
diff -u pkgsrc/time/titrax/distinfo:1.12 pkgsrc/time/titrax/distinfo:1.13
--- pkgsrc/time/titrax/distinfo:1.12    Tue Oct 26 11:24:44 2021
+++ pkgsrc/time/titrax/distinfo Fri Mar  1 12:23:07 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:24:44 nia Exp $
+$NetBSD: distinfo,v 1.13 2024/03/01 12:23:07 he Exp $
 
 BLAKE2s (titrax-1.98.tar.gz) = fe6c301ccbffd3ed980c927896fe05bf5ad92fa8b3633b258066c923837c6350
 SHA512 (titrax-1.98.tar.gz) = 5d7f0833efe3dc4b2ef638836b171fcc83efc0cb66b119b17bd3937773555ab6171d0558439bf3265a95e66c3dbe44eae57df3198c3131265b75cf44ec11848c
 Size (titrax-1.98.tar.gz) = 41154 bytes
 SHA1 (patch-Imakefile) = b6e2ab54377d0720c60f53224257b5dcf123ec2c
-SHA1 (patch-sumtitra) = 2fbad9d6cdbc5239cf2a25ab057f640452c5a33e
+SHA1 (patch-sumtitra) = 67d60097edef2db6c494569e107ea76c5cc05374
 SHA1 (patch-titrat) = a6979392d0d0f755ff94147c490c466c3f60ff55
-SHA1 (patch-weekno.perl) = c5b431054d600fd2ee6ebe345257fd0febe9e0b0
+SHA1 (patch-weekno.perl) = d9eb0e3b178f54022f860646f3236c7d6f9dbc52

Index: pkgsrc/time/titrax/patches/patch-sumtitra
diff -u pkgsrc/time/titrax/patches/patch-sumtitra:1.1 pkgsrc/time/titrax/patches/patch-sumtitra:1.2
--- pkgsrc/time/titrax/patches/patch-sumtitra:1.1       Wed Nov  5 22:41:38 2014
+++ pkgsrc/time/titrax/patches/patch-sumtitra   Fri Mar  1 12:23:07 2024
@@ -1,11 +1,17 @@
-$NetBSD: patch-sumtitra,v 1.1 2014/11/05 22:41:38 he Exp $
+$NetBSD: patch-sumtitra,v 1.2 2024/03/01 12:23:07 he Exp $
 
 Fix a "year 2000" bug, and fix this to work without warning
 with newer perl.
+Also replace ' with :: for newer perl.
 
 --- sumtitra.orig      1995-10-17 13:44:48.000000000 +0000
 +++ sumtitra
-@@ -83,7 +83,7 @@ $DATE'startday = $startday;
+@@ -79,21 +79,21 @@ if ($projwidth <= 0) {
+     $projwidth = 1;
+ }
+ 
+-$DATE'startday = $startday;
++$DATE::startday = $startday;
  $endday = $startday + $numdays - 1;
  
  # Find which week to sum for
@@ -14,6 +20,19 @@ with newer perl.
  $oneday = 24 * 60 * 60;
  if (!$week) {
     # Default is last week.
+-   $week = &DATE'weekno($timenow) - 1;
++   $week = &DATE::weekno($timenow) - 1;
+ } elsif ($week eq "now") {
+    # now is this week
+-   $week = &DATE'weekno($timenow);
++   $week = &DATE::weekno($timenow);
+ }
+    
+-$timefetch = &DATE'firstinweek($week, $year);
++$timefetch = &DATE::firstinweek($week, $year);
+ push(@dirlist, $TimeTrackerdir);
+ if ($extradir) {
+    push(@dirlist, $extradir);
 @@ -150,7 +150,7 @@ if ($nameadd) {
  } else {
     print "$name\n";
Index: pkgsrc/time/titrax/patches/patch-weekno.perl
diff -u pkgsrc/time/titrax/patches/patch-weekno.perl:1.1 pkgsrc/time/titrax/patches/patch-weekno.perl:1.2
--- pkgsrc/time/titrax/patches/patch-weekno.perl:1.1    Wed Nov  5 22:41:38 2014
+++ pkgsrc/time/titrax/patches/patch-weekno.perl        Fri Mar  1 12:23:07 2024
@@ -1,6 +1,7 @@
-$NetBSD: patch-weekno.perl,v 1.1 2014/11/05 22:41:38 he Exp $
+$NetBSD: patch-weekno.perl,v 1.2 2024/03/01 12:23:07 he Exp $
 
 Fix this so that it uses week numbering according to ISO 8601.
+Also replace ' with :: for newer perl.
 
 --- weekno.perl.orig   1995-10-17 13:44:49.000000000 +0000
 +++ weekno.perl
@@ -14,7 +15,7 @@ Fix this so that it uses week numbering 
  
  package DATE;
  #               J   F   M   A   M   J   J   A   S   O   N   D
-@@ -51,7 +51,21 @@ sub weekno {
+@@ -51,21 +51,36 @@ sub weekno {
  
  
  sub firstdayfirstweek {
@@ -37,8 +38,9 @@ Fix this so that it uses week numbering 
     local($y) = @_;
     local($ret);
     # Get time of January 1, 0.0.0.0
-@@ -59,13 +73,14 @@ sub firstdayfirstweek {
-    local($firsttime) = &main'timelocal(0, 0, 0, 1, 0, $y, 0, 0, 0);
+    # Note that DST is never in effect on Jan 1...
+-   local($firsttime) = &main'timelocal(0, 0, 0, 1, 0, $y, 0, 0, 0);
++   local($firsttime) = &main::timelocal(0, 0, 0, 1, 0, $y, 0, 0, 0);
     local(@firstday) = localtime($firsttime);
     local($wday) = $firstday[6];
 -   # Rule works for some years.....89 to 92 tested, they all hit branch 2...
@@ -57,3 +59,12 @@ Fix this so that it uses week numbering 
  }
   
  sub firstinweek {
+@@ -73,7 +88,7 @@ sub firstinweek {
+ # (to avoid DST troubles)
+    local($weekno, $year) = @_;
+    # 2 hours into this year
+-   local($time) = &main'timelocal(0, 0, 2, 1, 0, $year, 0, 0, 0);
++   local($time) = &main::timelocal(0, 0, 2, 1, 0, $year, 0, 0, 0);
+    # Add number of days since start of year
+    $time += (($weekno - 1) * 7 + &firstdayfirstweek($year)) * 60 * 60 * 24;
+    $time;