Sat May 27 15:22:36 2023 UTC ()
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.


(he)
diff -r1.1 -r1.2 pkgsrc/time/xdiary/Makefile
diff -r1.1 -r1.2 pkgsrc/time/xdiary/distinfo
diff -r0 -r1.1 pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c
cvs diff -r1.1 -r1.2 pkgsrc/time/xdiary/Makefile (expand / switch to unified diff)

--- pkgsrc/time/xdiary/Makefile 2023/01/22 20:08:17 1.1
+++ pkgsrc/time/xdiary/Makefile 2023/05/27 15:22:36 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.1 2023/01/22 20:08:17 vins Exp $ 1# $NetBSD: Makefile,v 1.2 2023/05/27 15:22:36 he Exp $
2 2
3DISTNAME= xmdiary-3.0.3 3DISTNAME= xmdiary-3.0.3
4PKGNAME= ${DISTNAME:S/m//} 4PKGNAME= ${DISTNAME:S/m//}
 5PKGREVISION= 1
5CATEGORIES= time x11 6CATEGORIES= time x11
6MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/} 7MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
7 8
8MAINTAINER= vins@NetBSD.org 9MAINTAINER= vins@NetBSD.org
9HOMEPAGE= https://www.ibiblio.org/pub/X11/contrib/office/xmdiary-README 10HOMEPAGE= https://www.ibiblio.org/pub/X11/contrib/office/xmdiary-README
10COMMENT= Calendar utility based on Motif/X 11COMMENT= Calendar utility based on Motif/X
11LICENSE= 0-clause-bsd 12LICENSE= 0-clause-bsd
12 13
13MKPIE_SUPPORTED= no 14MKPIE_SUPPORTED= no
14 15
15USE_IMAKE= yes 16USE_IMAKE= yes
16 17
17SUBST_CLASSES+= cc 18SUBST_CLASSES+= cc
cvs diff -r1.1 -r1.2 pkgsrc/time/xdiary/distinfo (expand / switch to unified diff)

--- pkgsrc/time/xdiary/distinfo 2023/01/22 20:08:17 1.1
+++ pkgsrc/time/xdiary/distinfo 2023/05/27 15:22:36 1.2
@@ -1,30 +1,31 @@ @@ -1,30 +1,31 @@
1$NetBSD: distinfo,v 1.1 2023/01/22 20:08:17 vins Exp $ 1$NetBSD: distinfo,v 1.2 2023/05/27 15:22:36 he Exp $
2 2
3BLAKE2s (xmdiary-3.0.3.tar.gz) = 225c678fd5e2a2d080346ca22fc5bf31393e63ea51506002098e3c8c7f0c5709 3BLAKE2s (xmdiary-3.0.3.tar.gz) = 225c678fd5e2a2d080346ca22fc5bf31393e63ea51506002098e3c8c7f0c5709
4SHA512 (xmdiary-3.0.3.tar.gz) = a699703c2a71f702dbe25a5c57a461dc14581df108b85e7a092ee52be18dbd26c80b0df91c00a96a759816863c42519c77d22857eda916c66735634fdce9fe1c 4SHA512 (xmdiary-3.0.3.tar.gz) = a699703c2a71f702dbe25a5c57a461dc14581df108b85e7a092ee52be18dbd26c80b0df91c00a96a759816863c42519c77d22857eda916c66735634fdce9fe1c
5Size (xmdiary-3.0.3.tar.gz) = 764331 bytes 5Size (xmdiary-3.0.3.tar.gz) = 764331 bytes
6SHA1 (patch-XDiary.tmpl) = c9c6dab155fa6dd607e998134fbf1aa1d65937ef 6SHA1 (patch-XDiary.tmpl) = c9c6dab155fa6dd607e998134fbf1aa1d65937ef
7SHA1 (patch-dtools_xtmCalendar.c) = 1106929782e3438e0fb90a7624cf723338d1f800 7SHA1 (patch-dtools_xtmCalendar.c) = 1106929782e3438e0fb90a7624cf723338d1f800
8SHA1 (patch-dtools_xtmDbTools.c) = d6249849e091a11d08fecd31832a746e31ebda6a 8SHA1 (patch-dtools_xtmDbTools.c) = d6249849e091a11d08fecd31832a746e31ebda6a
9SHA1 (patch-dtools_xtmEditEntry.c) = 32a483d44b1e2638c042184ba70585c212fb214c 9SHA1 (patch-dtools_xtmEditEntry.c) = 32a483d44b1e2638c042184ba70585c212fb214c
10SHA1 (patch-dtools_xtmMsgSelect.c) = 3937992e9399b4de1104c3739fd8fac8df47d6ba 10SHA1 (patch-dtools_xtmMsgSelect.c) = 3937992e9399b4de1104c3739fd8fac8df47d6ba
11SHA1 (patch-dtools_xtmMsgSend.c) = 282cc4c842bcb5929f80b62becb724da4273699d 11SHA1 (patch-dtools_xtmMsgSend.c) = 282cc4c842bcb5929f80b62becb724da4273699d
12SHA1 (patch-dtools_xtmPlan.c) = 9e59061c656fe71da0b85d786b2a64f06e1eec6c 12SHA1 (patch-dtools_xtmPlan.c) = 9e59061c656fe71da0b85d786b2a64f06e1eec6c
13SHA1 (patch-dtools_xtmPrEntries.c) = d8c917f3690d98b26939956c6f1374663f74bda0 13SHA1 (patch-dtools_xtmPrEntries.c) = d8c917f3690d98b26939956c6f1374663f74bda0
14SHA1 (patch-dtools_xtmReminder.c) = d44b3e924dccabf8f5053d032485a325e28fa7f5 14SHA1 (patch-dtools_xtmReminder.c) = d44b3e924dccabf8f5053d032485a325e28fa7f5
15SHA1 (patch-dtools_xtmSchedAct.c) = f9835884e17369fffd39e3679a0a5125255e36d3 15SHA1 (patch-dtools_xtmSchedAct.c) = f9835884e17369fffd39e3679a0a5125255e36d3
16SHA1 (patch-dtools_xtmSchedMain.c) = 782a36ee32910ec9142dee05773e28f1e0990463 16SHA1 (patch-dtools_xtmSchedMain.c) = 782a36ee32910ec9142dee05773e28f1e0990463
17SHA1 (patch-dtools_xtmShowToDo.c) = 5ca6b0b4939e7d55758546fb937066118c672677 17SHA1 (patch-dtools_xtmShowToDo.c) = 5ca6b0b4939e7d55758546fb937066118c672677
 18SHA1 (patch-ndbm_xdndbm.c) = f7709f8305c6cb68fea2721559efad8e2ac4fac5
18SHA1 (patch-tools_SigHandler.c) = 841cd0b3f67a498cad89af288eace1e7beaa1fdb 19SHA1 (patch-tools_SigHandler.c) = 841cd0b3f67a498cad89af288eace1e7beaa1fdb
19SHA1 (patch-tools_System.c) = 165ac4c772e593b8671221c80a09059fc4044f75 20SHA1 (patch-tools_System.c) = 165ac4c772e593b8671221c80a09059fc4044f75
20SHA1 (patch-xdaclunix_xtmAclUnix.c) = 9abbd51d9d96b46d71ec4835beabd058f7743601 21SHA1 (patch-xdaclunix_xtmAclUnix.c) = 9abbd51d9d96b46d71ec4835beabd058f7743601
21SHA1 (patch-xdalarm_xtmAlarmProc.c) = 322a0aae64307f4aa9599d834b6e5fa34666e4c9 22SHA1 (patch-xdalarm_xtmAlarmProc.c) = 322a0aae64307f4aa9599d834b6e5fa34666e4c9
22SHA1 (patch-xdcustom_xtmCustom.c) = e40509f3d0471838a8daa0134de5147ed1e8e02e 23SHA1 (patch-xdcustom_xtmCustom.c) = e40509f3d0471838a8daa0134de5147ed1e8e02e
23SHA1 (patch-xdiary_xtmDiary.c) = f6bc11b6898001b02190044be3742af79869f46a 24SHA1 (patch-xdiary_xtmDiary.c) = f6bc11b6898001b02190044be3742af79869f46a
24SHA1 (patch-xdlight_xtmDiaryLgt.c) = f1041d6dbdf9cd703678d0607b62de4b91c804c8 25SHA1 (patch-xdlight_xtmDiaryLgt.c) = f1041d6dbdf9cd703678d0607b62de4b91c804c8
25SHA1 (patch-xdnotify_xtmNotify.c) = a2d0a3276cd6efb231b4b0106e64351aff534e50 26SHA1 (patch-xdnotify_xtmNotify.c) = a2d0a3276cd6efb231b4b0106e64351aff534e50
26SHA1 (patch-xdprformat_xtmPrFormat.c) = 748b0a6ce74805e28b52d04fb74574ac219399af 27SHA1 (patch-xdprformat_xtmPrFormat.c) = 748b0a6ce74805e28b52d04fb74574ac219399af
27SHA1 (patch-xdremind_xtmRemMain.c) = 44609d5af8c58f5d2782a32db3a94acb8355105a 28SHA1 (patch-xdremind_xtmRemMain.c) = 44609d5af8c58f5d2782a32db3a94acb8355105a
28SHA1 (patch-xdremove_xtmRemove.c) = 4e6ce3410d7b8bd30e23aa4c424cb923e99728e1 29SHA1 (patch-xdremove_xtmRemove.c) = 4e6ce3410d7b8bd30e23aa4c424cb923e99728e1
29SHA1 (patch-xdrestore_xtmRestore.c) = 37c69e18cad485addbc85a85fdf41e9991048c14 30SHA1 (patch-xdrestore_xtmRestore.c) = 37c69e18cad485addbc85a85fdf41e9991048c14
30SHA1 (patch-xtools_XmUbTimeB.c) = f236503f1be2ac1fe6a21a33dfb6be0d7675d005 31SHA1 (patch-xtools_XmUbTimeB.c) = f236503f1be2ac1fe6a21a33dfb6be0d7675d005
File Added: pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c
$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;