CVS commit: pkgsrc/time/xdiary

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

Module Name:    pkgsrc
Committed By:   he
Date:           Sat May 27 15:22:36 UTC 2023

Modified Files:
        pkgsrc/time/xdiary: Makefile distinfo
Added Files:
        pkgsrc/time/xdiary/patches: patch-ndbm_xdndbm.c

Log Message:
xdiary: make it build on NetBSD.

Add a patch to make some `int` declarations explicit (removes warnings),
and don't declare lseek() "yourself" on NetBSD (causes mismatched decl).
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/xdiary/Makefile \
    pkgsrc/time/xdiary/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c

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

Modified files:

Index: pkgsrc/time/xdiary/Makefile
diff -u pkgsrc/time/xdiary/Makefile:1.1 pkgsrc/time/xdiary/Makefile:1.2
--- pkgsrc/time/xdiary/Makefile:1.1     Sun Jan 22 20:08:17 2023
+++ pkgsrc/time/xdiary/Makefile Sat May 27 15:22:36 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2023/01/22 20:08:17 vins Exp $
+# $NetBSD: Makefile,v 1.2 2023/05/27 15:22:36 he Exp $
 
 DISTNAME=      xmdiary-3.0.3
 PKGNAME=       ${DISTNAME:S/m//}
+PKGREVISION=   1
 CATEGORIES=    time x11
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=office/}
 
Index: pkgsrc/time/xdiary/distinfo
diff -u pkgsrc/time/xdiary/distinfo:1.1 pkgsrc/time/xdiary/distinfo:1.2
--- pkgsrc/time/xdiary/distinfo:1.1     Sun Jan 22 20:08:17 2023
+++ pkgsrc/time/xdiary/distinfo Sat May 27 15:22:36 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/01/22 20:08:17 vins Exp $
+$NetBSD: distinfo,v 1.2 2023/05/27 15:22:36 he Exp $
 
 BLAKE2s (xmdiary-3.0.3.tar.gz) = 225c678fd5e2a2d080346ca22fc5bf31393e63ea51506002098e3c8c7f0c5709
 SHA512 (xmdiary-3.0.3.tar.gz) = a699703c2a71f702dbe25a5c57a461dc14581df108b85e7a092ee52be18dbd26c80b0df91c00a96a759816863c42519c77d22857eda916c66735634fdce9fe1c
@@ -15,6 +15,7 @@ SHA1 (patch-dtools_xtmReminder.c) = d44b
 SHA1 (patch-dtools_xtmSchedAct.c) = f9835884e17369fffd39e3679a0a5125255e36d3
 SHA1 (patch-dtools_xtmSchedMain.c) = 782a36ee32910ec9142dee05773e28f1e0990463
 SHA1 (patch-dtools_xtmShowToDo.c) = 5ca6b0b4939e7d55758546fb937066118c672677
+SHA1 (patch-ndbm_xdndbm.c) = f7709f8305c6cb68fea2721559efad8e2ac4fac5
 SHA1 (patch-tools_SigHandler.c) = 841cd0b3f67a498cad89af288eace1e7beaa1fdb
 SHA1 (patch-tools_System.c) = 165ac4c772e593b8671221c80a09059fc4044f75
 SHA1 (patch-xdaclunix_xtmAclUnix.c) = 9abbd51d9d96b46d71ec4835beabd058f7743601

Added files:

Index: pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c
diff -u /dev/null pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c:1.1
--- /dev/null   Sat May 27 15:22:36 2023
+++ pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c      Sat May 27 15:22:36 2023
@@ -0,0 +1,118 @@
+$NetBSD: patch-ndbm_xdndbm.c,v 1.1 2023/05/27 15:22:36 he Exp $
+
+Make `int` types explicit, don't own-declare lseek() on NetBSD
+(gives type mismatch).
+
+--- ndbm/xdndbm.c.orig 1997-05-04 22:05:18.000000000 +0000
++++ ndbm/xdndbm.c
+@@ -28,8 +28,8 @@
+ #ifdef NET_BYTE_ORDER
+ #include <netinet/in.h>
+ 
+-static convert_after_read(char buf[PBLKSIZ]);
+-static convert_before_write(char buf[PBLKSIZ]);
++static int convert_after_read(char buf[PBLKSIZ]);
++static int convert_before_write(char buf[PBLKSIZ]);
+ 
+ #undef DEBUG
+ #endif
+@@ -53,7 +53,9 @@ static  int delitem();
+ static  int additem();
+ 
+ extern  int errno;
++#ifndef __NetBSD__
+ extern  long lseek();
++#endif
+ 
+ #ifdef DEBUG
+ static chkblk(char buf[PBLKSIZ]);
+@@ -142,7 +144,7 @@ dbm_fetch(db, key)
+ register DBM *db;
+ datum key;
+ {
+-  register i;
++  register int i;
+   datum item;
+ 
+   if (dbm_error(db))
+@@ -168,7 +170,7 @@ dbm_delete(db, key)
+ register DBM *db;
+ datum key;
+ {
+-  register i;
++  register int i;
+ 
+   if (dbm_error(db))
+     return (-1);
+@@ -216,7 +218,7 @@ register DBM *db;
+ datum key, dat;
+ int replace;
+ {
+-  register i;
++  register int i;
+   datum item, item1;
+   char ovfbuf[PBLKSIZ];
+ 
+@@ -438,7 +440,7 @@ getbit(db)
+ register DBM *db;
+ {
+   long bn;
+-  register b, i, n;
++  register int b, i, n;
+ 
+   if (db->dbm_bitno > db->dbm_maxbno)
+     return (0);
+@@ -496,7 +498,7 @@ makdatum(buf, n)
+ char buf[PBLKSIZ];
+ {
+   register short *sp;
+-  register t;
++  register int t;
+   datum item;
+ 
+   sp = (short *)buf;
+@@ -624,7 +626,7 @@ delitem(buf, n)
+ char buf[PBLKSIZ];
+ {
+   register short *sp, *sp1;
+-  register i1, i2;
++  register int i1, i2;
+ 
+   sp = (short *)buf;
+   i2 = sp[0];
+@@ -667,7 +669,7 @@ char buf[PBLKSIZ];
+ datum item, item1;
+ {
+   register short *sp;
+-  register i1, i2;
++  register int i1, i2;
+ 
+   sp = (short *)buf;
+   i1 = PBLKSIZ;
+@@ -695,7 +697,7 @@ static
+ chkblk(char buf[PBLKSIZ])
+ {
+   register short *sp;
+-  register t, i;
++  register int t, i;
+ 
+   sp = (short *)buf;
+   t = PBLKSIZ;
+@@ -719,7 +721,7 @@ int
+ convert_after_read(char buf[PBLKSIZ])
+ {
+   register short *sp;
+-  register t, i;
++  register int t, i;
+ 
+   sp = (short *)buf;
+   sp[0] = ntohs(sp[0]);
+@@ -745,7 +747,7 @@ int
+ convert_before_write(char buf[PBLKSIZ])
+ {
+   register short *sp;
+-  register t, i;
++  register int t, i;
+ 
+   sp = (short *)buf;
+   t = PBLKSIZ;