pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/time/titrax Add a patch to weekno.perl so that it uses...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3a8755038035
branches: trunk
changeset: 641360:3a8755038035
user: he <he%pkgsrc.org@localhost>
date: Wed Nov 05 22:41:38 2014 +0000
description:
Add a patch to weekno.perl so that it uses ISO 8601 week numbering.
Remove dependence on timelocal.pl; use Time::Local instead.
Rename other patches according to new conventions.
Fix pkglint warnings.
Bump PKGREVISION.
diffstat:
time/titrax/Makefile | 6 +-
time/titrax/PLIST | 6 +-
time/titrax/distinfo | 10 ++--
time/titrax/patches/patch-Imakefile | 70 +++++++++++++++++++++++++++++++++++
time/titrax/patches/patch-aa | 70 -----------------------------------
time/titrax/patches/patch-ab | 17 --------
time/titrax/patches/patch-ac | 25 ------------
time/titrax/patches/patch-sumtitra | 25 ++++++++++++
time/titrax/patches/patch-titrat | 18 +++++++++
time/titrax/patches/patch-weekno.perl | 59 +++++++++++++++++++++++++++++
10 files changed, 183 insertions(+), 123 deletions(-)
diffs (truncated from 368 to 300 lines):
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/Makefile
--- a/time/titrax/Makefile Wed Nov 05 17:36:52 2014 +0000
+++ b/time/titrax/Makefile Wed Nov 05 22:41:38 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2014/06/29 19:12:51 dholland Exp $
+# $NetBSD: Makefile,v 1.31 2014/11/05 22:41:38 he Exp $
#
DISTNAME= titrax-1.98
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= x11 time
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
@@ -22,7 +22,7 @@
pre-configure:
${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.bak
- ${SED} -e "s|@LOCALBASE@|${LOCALBASE}|g" \
+ ${SED} -e "s|@LOCALBASE@|${PREFIX}|g" \
-e "s|@X11BASE@|${X11PREFIX}|g" \
${WRKSRC}/Imakefile.bak > ${WRKSRC}/Imakefile
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/PLIST
--- a/time/titrax/PLIST Wed Nov 05 17:36:52 2014 +0000
+++ b/time/titrax/PLIST Wed Nov 05 22:41:38 2014 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/05 22:41:38 he Exp $
bin/sumtitra
bin/titrax
bin/titrat
lib/X11/app-defaults/Titrax
libexec/titrax/weekno.perl
-${IMAKE_MAN_DIR}/sumtitra.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/titrax.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/sumtitra.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/titrax.${IMAKE_MAN_SUFFIX}
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/distinfo
--- a/time/titrax/distinfo Wed Nov 05 17:36:52 2014 +0000
+++ b/time/titrax/distinfo Wed Nov 05 22:41:38 2014 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2014/06/29 19:12:51 dholland Exp $
+$NetBSD: distinfo,v 1.8 2014/11/05 22:41:38 he Exp $
SHA1 (titrax-1.98.tar.gz) = 2849f8930aac945d435f58ad0a2a98fc19477da0
RMD160 (titrax-1.98.tar.gz) = 519898ed0d74b50d1a01041a6479fb4974823f3e
Size (titrax-1.98.tar.gz) = 41154 bytes
-SHA1 (patch-aa) = 67b1aadb6e8ad5bc86959fe41c71dd5467d35f2c
-SHA1 (patch-ab) = 03ea1f434ab68ccd408830c778a462c083729c95
-SHA1 (patch-ac) = 2fbad9d6cdbc5239cf2a25ab057f640452c5a33e
-SHA1 (patch-ad) = 49ab87c6c5d1574bcef3baf6d0c8a4c8e0220583
+SHA1 (patch-Imakefile) = 67b1aadb6e8ad5bc86959fe41c71dd5467d35f2c
+SHA1 (patch-sumtitra) = 2fbad9d6cdbc5239cf2a25ab057f640452c5a33e
+SHA1 (patch-titrat) = a6979392d0d0f755ff94147c490c466c3f60ff55
+SHA1 (patch-weekno.perl) = c5b431054d600fd2ee6ebe345257fd0febe9e0b0
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-Imakefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/titrax/patches/patch-Imakefile Wed Nov 05 22:41:38 2014 +0000
@@ -0,0 +1,70 @@
+$NetBSD: patch-Imakefile,v 1.1 2014/11/05 22:41:38 he Exp $
+
+- configure for pkgsrc
+- do ratty interpreter fixes (XXX: change to REPLACE_PERL)
+- use tail -n +2 instead of tail +2 to work around broken Linux userlands
+
+--- Imakefile.orig 1995-10-17 13:44:48.000000000 +0000
++++ Imakefile
+@@ -1,10 +1,10 @@
+ # Installation options
+ #=====================
+ # The place where you install local programs (not X)
+-NONXBINDIR = /local/bin
++NONXBINDIR = @LOCALBASE@/bin
+ #
+ # PERLLIBDIR should be the output from perl -e 'print "@INC[0]\n"'
+-PERLLIBDIR = /usr/lib/perl
++PERLLIBDIR = @X11BASE@/libexec/titrax
+ # PERL - where your Perl executable is located (is in sumtitrax)
+ PERL = $(NONXBINDIR)/perl
+ #
+@@ -12,7 +12,7 @@ PERL = $(NONXBINDIR)/perl
+ # XAWLIB = -lXaw3d
+ #
+ # If you want to stop UDP packets to the author, uncomment this
+-# CDEBUGFLAGS = -DDO_NOT_TELL_ABOUT_ME
++CDEBUGFLAGS = -DDO_NOT_TELL_ABOUT_ME
+ #
+ # If you have problems with undefined variables, you may have
+ # hit the linker bug with SunOS 4.1.2 and X11R4; uncomment this line
+@@ -44,13 +44,13 @@ LASTVERSION = V1_97
+ # functions that are declared, but not used
+ LINTOPTS = -az
+
+-all:: titrax sumtitra titrat
++all:: titrax sumtitra titrat weekno.perl
+ depend:: Titrax_ad.h
+
+ ComplexProgramTarget(titrax)
+ InstallAppDefaults(Titrax)
+-InstallProgram(sumtitra,$(NONXBINDIR))
+-InstallProgram(titrat,$(NONXBINDIR))
++InstallNamedProg(sumtitra,sumtitra,$(BINDIR))
++InstallNamedProg(titrat,titrat,$(BINDIR))
+ InstallManPage(sumtitra,$(MANDIR))
+ InstallNonExec(weekno.perl,$(PERLLIBDIR))
+
+@@ -61,14 +61,19 @@ titrax.o: Titrax_ad.h
+ # Modifying PERL scripts - technique courtesy of Lindsay (of Zircon fame)
+ sumtitra: Makefile
+ mv sumtitra sumtitra.tmp
+- echo '#!$(PERL)' > sumtitra
+- tail +2 sumtitra.tmp >> sumtitra
++ echo '#!$(PERL) -I$(PERLLIBDIR)' > sumtitra
++ tail -n +2 sumtitra.tmp >> sumtitra
+ rm sumtitra.tmp
+ titrat: Makefile
+ mv titrat titrat.tmp
+ echo '#!$(PERL)' > titrat
+- tail +2 titrat.tmp >> titrat
++ tail -n +2 titrat.tmp >> titrat
+ rm titrat.tmp
++weekno.perl: Makefile
++ mv weekno.perl weekno.perl.tmp
++ echo '#!$(PERL)' > weekno.perl
++ tail -n +2 weekno.perl.tmp >> weekno.perl
++ rm weekno.perl.tmp
+
+ #------------------------------------------------------------------
+ # Everything below this line should be only for release and debugging,
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-aa
--- a/time/titrax/patches/patch-aa Wed Nov 05 17:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2014/06/29 19:12:51 dholland Exp $
-
-- configure for pkgsrc
-- do ratty interpreter fixes (XXX: change to REPLACE_PERL)
-- use tail -n +2 instead of tail +2 to work around broken Linux userlands
-
---- Imakefile.orig 1995-10-17 13:44:48.000000000 +0000
-+++ Imakefile
-@@ -1,10 +1,10 @@
- # Installation options
- #=====================
- # The place where you install local programs (not X)
--NONXBINDIR = /local/bin
-+NONXBINDIR = @LOCALBASE@/bin
- #
- # PERLLIBDIR should be the output from perl -e 'print "@INC[0]\n"'
--PERLLIBDIR = /usr/lib/perl
-+PERLLIBDIR = @X11BASE@/libexec/titrax
- # PERL - where your Perl executable is located (is in sumtitrax)
- PERL = $(NONXBINDIR)/perl
- #
-@@ -12,7 +12,7 @@ PERL = $(NONXBINDIR)/perl
- # XAWLIB = -lXaw3d
- #
- # If you want to stop UDP packets to the author, uncomment this
--# CDEBUGFLAGS = -DDO_NOT_TELL_ABOUT_ME
-+CDEBUGFLAGS = -DDO_NOT_TELL_ABOUT_ME
- #
- # If you have problems with undefined variables, you may have
- # hit the linker bug with SunOS 4.1.2 and X11R4; uncomment this line
-@@ -44,13 +44,13 @@ LASTVERSION = V1_97
- # functions that are declared, but not used
- LINTOPTS = -az
-
--all:: titrax sumtitra titrat
-+all:: titrax sumtitra titrat weekno.perl
- depend:: Titrax_ad.h
-
- ComplexProgramTarget(titrax)
- InstallAppDefaults(Titrax)
--InstallProgram(sumtitra,$(NONXBINDIR))
--InstallProgram(titrat,$(NONXBINDIR))
-+InstallNamedProg(sumtitra,sumtitra,$(BINDIR))
-+InstallNamedProg(titrat,titrat,$(BINDIR))
- InstallManPage(sumtitra,$(MANDIR))
- InstallNonExec(weekno.perl,$(PERLLIBDIR))
-
-@@ -61,14 +61,19 @@ titrax.o: Titrax_ad.h
- # Modifying PERL scripts - technique courtesy of Lindsay (of Zircon fame)
- sumtitra: Makefile
- mv sumtitra sumtitra.tmp
-- echo '#!$(PERL)' > sumtitra
-- tail +2 sumtitra.tmp >> sumtitra
-+ echo '#!$(PERL) -I$(PERLLIBDIR)' > sumtitra
-+ tail -n +2 sumtitra.tmp >> sumtitra
- rm sumtitra.tmp
- titrat: Makefile
- mv titrat titrat.tmp
- echo '#!$(PERL)' > titrat
-- tail +2 titrat.tmp >> titrat
-+ tail -n +2 titrat.tmp >> titrat
- rm titrat.tmp
-+weekno.perl: Makefile
-+ mv weekno.perl weekno.perl.tmp
-+ echo '#!$(PERL)' > weekno.perl
-+ tail -n +2 weekno.perl.tmp >> weekno.perl
-+ rm weekno.perl.tmp
-
- #------------------------------------------------------------------
- # Everything below this line should be only for release and debugging,
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-ab
--- a/time/titrax/patches/patch-ab Wed Nov 05 17:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:20 wiz Exp $
-
---- titrat.orig Tue Oct 17 14:44:49 1995
-+++ titrat Tue Dec 8 13:48:48 1998
-@@ -7,9 +7,9 @@
- require 'ctime.pl';
- # If you cannot find errno.ph, just uncomment the following line, if
- # EEXIST is 17 in your /usr/include/sys/errno.h file.
--# eval 'sub EEXIST {17;}';
-+eval 'sub EEXIST {17;}';
-
--require 'errno.ph';
-+# require 'errno.ph';
-
- $SIG{'HUP'} = 'signal';
- $SIG{'INT'} = 'signal';
-
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-ac
--- a/time/titrax/patches/patch-ac Wed Nov 05 17:36:52 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/01/17 12:52:15 he Exp $
-
-Fix a "year 2000" bug, and fix this to work without warning
-with newer perl.
-
---- sumtitra.orig 1995-10-17 13:44:48.000000000 +0000
-+++ sumtitra
-@@ -83,7 +83,7 @@ $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.
-@@ -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) {
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-sumtitra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/titrax/patches/patch-sumtitra Wed Nov 05 22:41:38 2014 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-sumtitra,v 1.1 2014/11/05 22:41:38 he Exp $
+
+Fix a "year 2000" bug, and fix this to work without warning
+with newer perl.
+
+--- sumtitra.orig 1995-10-17 13:44:48.000000000 +0000
++++ sumtitra
+@@ -83,7 +83,7 @@ $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.
+@@ -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) {
diff -r df6fd65d04e6 -r 3a8755038035 time/titrax/patches/patch-titrat
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/time/titrax/patches/patch-titrat Wed Nov 05 22:41:38 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-titrat,v 1.1 2014/11/05 22:41:38 he Exp $
+
+Don't use errno.ph, instead hardcode the EEXIST value.
+
+--- titrat.orig Tue Oct 17 14:44:49 1995
++++ titrat Tue Dec 8 13:48:48 1998
+@@ -7,9 +7,9 @@
+ require 'ctime.pl';
+ # If you cannot find errno.ph, just uncomment the following line, if
+ # EEXIST is 17 in your /usr/include/sys/errno.h file.
+-# eval 'sub EEXIST {17;}';
++eval 'sub EEXIST {17;}';
+
Home |
Main Index |
Thread Index |
Old Index