 @@ -1,18 +1,18 @@
-# $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/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://www.alvestrand.no/titrax/TimeTracker.html
 COMMENT=		Little X11 tool to track project times
 LICENSE=		titrax-license
 RESTRICTED=		Do not sell for "real money".
 # XXX Arguably NO_*_ON_CDROM is not necessary, because "real money" seems
 # to exclude CDROM distribution charges.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}

 @@ -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

 @@ -1,25 +1,44 @@
-$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
 -$week = shift(ARGV);
 +$week = shift(@ARGV);
  $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";
+ }
 -print $word{"banner"}, " $week 19$year\n";
 +print $word{"banner"}, " $week ", 1900+$year, "\n";
  printf "%-${projwidth}.${projwidth}s%6s!", $word{"project"}, $word{"tot"};
  for ($startday..$endday) {

 @@ -1,59 +1,70 @@
-$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
 @@ -1,7 +1,7 @@
  #!/local/bin/perl
  # Package for date handling
 -# Use the PERL std library timelocal - older had his own
 -require "timelocal.pl";
 +# Use the PERL std package Time::Local
 +use Time::Local;
  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 {
 -# Return first day of week 1 of any year
 +# Return the day of the year (0 is Jan 1st)
 +# for the first day of week 1 of any year.
 +#
 +# Quoting strftime(3):
 +#  %V    is replaced by the week number of the year (Monday as the first day
 +#        of the week) as a decimal number [01,53]. According to ISO 8601 the
 +#        week containing January 1 is week 1 if it has four or more days in
 +#        the new year, otherwise it is week 53 of the previous year, and the
 +#        next week is week 1.  The year is given by the `%G' conversion
 +#        specification.
 +#
 +# So this will return a negative value in some cases, i.e. when
 +# Jan 1st falls on either of Tuesday, Wednesday or Thursday, and
 +# will be positive (1) or zero for Sunday or Monday respectively.
 +#
     local($y) = @_;
     local($ret);
     # Get time of January 1, 0.0.0.0
-@@ -59,13 +73,14 @@ sub firstdayfirstweek {
+    # 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($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...
 -   if ($wday > 3) {
 -      $ret = 8 - $wday;
 +   # Weekday 4 is Thursday (localtime returns zero-based with Sunday = 0)
 +   if ($wday <= 4) {
 +       $ret = 1 - $wday;	# first day of week 1 may be in late December
 +       				# The exception is when Jan 1 = Sunday (wday 0)
     } else {
 -      $ret = 1 - $wday;
 +       $ret = 8 - $wday;	# first day of week 1 is in January
+    }
 -   $ret;
 +   return $ret;
+ }
  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;