pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/time/xdiary
Module Name: pkgsrc
Committed By: nia
Date: Fri Jul 7 12:45:25 UTC 2023
Modified Files:
pkgsrc/time/xdiary: Makefile distinfo
pkgsrc/time/xdiary/patches: patch-dtools_xtmDbTools.c
patch-ndbm_xdndbm.c patch-tools_System.c
Log Message:
xdiary: Further reduce number of implicit and own declarations of libc
functions
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/time/xdiary/Makefile \
pkgsrc/time/xdiary/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c \
pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c \
pkgsrc/time/xdiary/patches/patch-tools_System.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.2 pkgsrc/time/xdiary/Makefile:1.3
--- pkgsrc/time/xdiary/Makefile:1.2 Sat May 27 15:22:36 2023
+++ pkgsrc/time/xdiary/Makefile Fri Jul 7 12:45:25 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2023/05/27 15:22:36 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/07/07 12:45:25 nia Exp $
DISTNAME= xmdiary-3.0.3
PKGNAME= ${DISTNAME:S/m//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= time x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
Index: pkgsrc/time/xdiary/distinfo
diff -u pkgsrc/time/xdiary/distinfo:1.2 pkgsrc/time/xdiary/distinfo:1.3
--- pkgsrc/time/xdiary/distinfo:1.2 Sat May 27 15:22:36 2023
+++ pkgsrc/time/xdiary/distinfo Fri Jul 7 12:45:25 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2023/05/27 15:22:36 he Exp $
+$NetBSD: distinfo,v 1.3 2023/07/07 12:45:25 nia Exp $
BLAKE2s (xmdiary-3.0.3.tar.gz) = 225c678fd5e2a2d080346ca22fc5bf31393e63ea51506002098e3c8c7f0c5709
SHA512 (xmdiary-3.0.3.tar.gz) = a699703c2a71f702dbe25a5c57a461dc14581df108b85e7a092ee52be18dbd26c80b0df91c00a96a759816863c42519c77d22857eda916c66735634fdce9fe1c
Size (xmdiary-3.0.3.tar.gz) = 764331 bytes
SHA1 (patch-XDiary.tmpl) = c9c6dab155fa6dd607e998134fbf1aa1d65937ef
SHA1 (patch-dtools_xtmCalendar.c) = 1106929782e3438e0fb90a7624cf723338d1f800
-SHA1 (patch-dtools_xtmDbTools.c) = d6249849e091a11d08fecd31832a746e31ebda6a
+SHA1 (patch-dtools_xtmDbTools.c) = e5913c95b89b1dad21abf9e085d0169b3768b33d
SHA1 (patch-dtools_xtmEditEntry.c) = 32a483d44b1e2638c042184ba70585c212fb214c
SHA1 (patch-dtools_xtmMsgSelect.c) = 3937992e9399b4de1104c3739fd8fac8df47d6ba
SHA1 (patch-dtools_xtmMsgSend.c) = 282cc4c842bcb5929f80b62becb724da4273699d
@@ -15,9 +15,9 @@ 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-ndbm_xdndbm.c) = 979d5b4212d6f33a110ed82565667ce4da76089e
SHA1 (patch-tools_SigHandler.c) = 841cd0b3f67a498cad89af288eace1e7beaa1fdb
-SHA1 (patch-tools_System.c) = 165ac4c772e593b8671221c80a09059fc4044f75
+SHA1 (patch-tools_System.c) = 3b5b2ca9f3bee63f9732f8774a2051654f2a891d
SHA1 (patch-xdaclunix_xtmAclUnix.c) = 9abbd51d9d96b46d71ec4835beabd058f7743601
SHA1 (patch-xdalarm_xtmAlarmProc.c) = 322a0aae64307f4aa9599d834b6e5fa34666e4c9
SHA1 (patch-xdcustom_xtmCustom.c) = e40509f3d0471838a8daa0134de5147ed1e8e02e
Index: pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c
diff -u pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c:1.1 pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c:1.2
--- pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c:1.1 Sun Jan 22 20:08:17 2023
+++ pkgsrc/time/xdiary/patches/patch-dtools_xtmDbTools.c Fri Jul 7 12:45:25 2023
@@ -1,19 +1,20 @@
-$NetBSD: patch-dtools_xtmDbTools.c,v 1.1 2023/01/22 20:08:17 vins Exp $
+$NetBSD: patch-dtools_xtmDbTools.c,v 1.2 2023/07/07 12:45:25 nia Exp $
Avoid int to pointer conversion warnings.
Add a mode to open() call with O_CREAT.
--- dtools/xtmDbTools.c.orig 1997-05-04 22:27:52.000000000 +0000
+++ dtools/xtmDbTools.c
-@@ -47,6 +47,7 @@ static char SCCSID[] = "@(#) Module: xtm
+@@ -47,6 +47,8 @@ static char SCCSID[] = "@(#) Module: xtm
#include <fcntl.h>
#include <stdio.h>
+#include <stdint.h>
++#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
#include <sys/stat.h>
-@@ -1813,7 +1814,7 @@ XTM_DB_STATUS
+@@ -1813,7 +1815,7 @@ XTM_DB_STATUS
/* Insert the date in the sorted list. */
lst_status = LstLinkSearchFirst( *list_ref,
@@ -22,7 +23,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) dateSortFunc );
if( lst_status == LST_OK )
-@@ -1896,7 +1897,7 @@ XTM_DB_STATUS
+@@ -1896,7 +1898,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_NOTE:
lst_status = LstLinkSearchFirst(
*note_list_ref,
@@ -31,7 +32,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryIdSortFunc );
if( lst_status == LST_OK )
-@@ -1910,7 +1911,7 @@ XTM_DB_STATUS
+@@ -1910,7 +1912,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_ENTRY:
lst_status = LstLinkSearchFirst(
*entry_list_ref,
@@ -40,7 +41,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryTimeSortFunc );
if( lst_status == LST_OK )
-@@ -1984,7 +1985,7 @@ XTM_DB_STATUS
+@@ -1984,7 +1986,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_NOTE:
lst_status = LstLinkSearchFirst(
*note_list_ref,
@@ -49,7 +50,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryIdSortFunc );
if( lst_status == LST_OK )
-@@ -1998,7 +1999,7 @@ XTM_DB_STATUS
+@@ -1998,7 +2000,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_ENTRY:
lst_status = LstLinkSearchFirst(
*entry_list_ref,
@@ -58,7 +59,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryTimeSortFunc );
if( lst_status == LST_OK )
-@@ -2072,7 +2073,7 @@ XTM_DB_STATUS
+@@ -2072,7 +2074,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_NOTE:
lst_status = LstLinkSearchFirst(
*note_list_ref,
@@ -67,7 +68,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryIdSortFunc );
if( lst_status == LST_OK )
-@@ -2086,7 +2087,7 @@ XTM_DB_STATUS
+@@ -2086,7 +2088,7 @@ XTM_DB_STATUS
case XTM_DB_DAY_ENTRY:
lst_status = LstLinkSearchFirst(
*entry_list_ref,
@@ -76,7 +77,7 @@ Add a mode to open() call with O_CREAT.
(EQUALS_FUNC_TYPE) entryTimeSortFunc );
if( lst_status == LST_OK )
-@@ -2332,7 +2333,7 @@ XTM_DB_STATUS
+@@ -2332,7 +2334,7 @@ XTM_DB_STATUS
sprintf( filename, "%s/%s_%s_%d",
message_dir, XTM_DB_MESSAGE_FILE, msg_info -> from, new_id );
Index: pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c
diff -u pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c:1.1 pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c:1.2
--- pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c:1.1 Sat May 27 15:22:36 2023
+++ pkgsrc/time/xdiary/patches/patch-ndbm_xdndbm.c Fri Jul 7 12:45:25 2023
@@ -1,11 +1,19 @@
-$NetBSD: patch-ndbm_xdndbm.c,v 1.1 2023/05/27 15:22:36 he Exp $
+$NetBSD: patch-ndbm_xdndbm.c,v 1.2 2023/07/07 12:45:25 nia Exp $
-Make `int` types explicit, don't own-declare lseek() on NetBSD
+Make `int` types explicit, don't own-declare lseek()
(gives type mismatch).
--- ndbm/xdndbm.c.orig 1997-05-04 22:05:18.000000000 +0000
+++ ndbm/xdndbm.c
-@@ -28,8 +28,8 @@
+@@ -12,6 +12,7 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdio.h>
+@@ -28,8 +29,8 @@
#ifdef NET_BYTE_ORDER
#include <netinet/in.h>
@@ -16,17 +24,17 @@ Make `int` types explicit, don't own-dec
#undef DEBUG
#endif
-@@ -53,7 +53,9 @@ static int delitem();
+@@ -52,9 +53,6 @@ static int finddatum();
+ static int delitem();
static int additem();
- extern int errno;
-+#ifndef __NetBSD__
- extern long lseek();
-+#endif
-
+-extern int errno;
+-extern long lseek();
+-
#ifdef DEBUG
static chkblk(char buf[PBLKSIZ]);
-@@ -142,7 +144,7 @@ dbm_fetch(db, key)
+ #endif
+@@ -142,7 +140,7 @@ dbm_fetch(db, key)
register DBM *db;
datum key;
{
@@ -35,7 +43,7 @@ Make `int` types explicit, don't own-dec
datum item;
if (dbm_error(db))
-@@ -168,7 +170,7 @@ dbm_delete(db, key)
+@@ -168,7 +166,7 @@ dbm_delete(db, key)
register DBM *db;
datum key;
{
@@ -44,7 +52,7 @@ Make `int` types explicit, don't own-dec
if (dbm_error(db))
return (-1);
-@@ -216,7 +218,7 @@ register DBM *db;
+@@ -216,7 +214,7 @@ register DBM *db;
datum key, dat;
int replace;
{
@@ -53,7 +61,7 @@ Make `int` types explicit, don't own-dec
datum item, item1;
char ovfbuf[PBLKSIZ];
-@@ -438,7 +440,7 @@ getbit(db)
+@@ -438,7 +436,7 @@ getbit(db)
register DBM *db;
{
long bn;
@@ -62,7 +70,7 @@ Make `int` types explicit, don't own-dec
if (db->dbm_bitno > db->dbm_maxbno)
return (0);
-@@ -496,7 +498,7 @@ makdatum(buf, n)
+@@ -496,7 +494,7 @@ makdatum(buf, n)
char buf[PBLKSIZ];
{
register short *sp;
@@ -71,7 +79,7 @@ Make `int` types explicit, don't own-dec
datum item;
sp = (short *)buf;
-@@ -624,7 +626,7 @@ delitem(buf, n)
+@@ -624,7 +622,7 @@ delitem(buf, n)
char buf[PBLKSIZ];
{
register short *sp, *sp1;
@@ -80,7 +88,7 @@ Make `int` types explicit, don't own-dec
sp = (short *)buf;
i2 = sp[0];
-@@ -667,7 +669,7 @@ char buf[PBLKSIZ];
+@@ -667,7 +665,7 @@ char buf[PBLKSIZ];
datum item, item1;
{
register short *sp;
@@ -89,7 +97,7 @@ Make `int` types explicit, don't own-dec
sp = (short *)buf;
i1 = PBLKSIZ;
-@@ -695,7 +697,7 @@ static
+@@ -695,7 +693,7 @@ static
chkblk(char buf[PBLKSIZ])
{
register short *sp;
@@ -98,7 +106,7 @@ Make `int` types explicit, don't own-dec
sp = (short *)buf;
t = PBLKSIZ;
-@@ -719,7 +721,7 @@ int
+@@ -719,7 +717,7 @@ int
convert_after_read(char buf[PBLKSIZ])
{
register short *sp;
@@ -107,7 +115,7 @@ Make `int` types explicit, don't own-dec
sp = (short *)buf;
sp[0] = ntohs(sp[0]);
-@@ -745,7 +747,7 @@ int
+@@ -745,7 +743,7 @@ int
convert_before_write(char buf[PBLKSIZ])
{
register short *sp;
Index: pkgsrc/time/xdiary/patches/patch-tools_System.c
diff -u pkgsrc/time/xdiary/patches/patch-tools_System.c:1.1 pkgsrc/time/xdiary/patches/patch-tools_System.c:1.2
--- pkgsrc/time/xdiary/patches/patch-tools_System.c:1.1 Sun Jan 22 20:08:17 2023
+++ pkgsrc/time/xdiary/patches/patch-tools_System.c Fri Jul 7 12:45:25 2023
@@ -1,9 +1,18 @@
-$NetBSD: patch-tools_System.c,v 1.1 2023/01/22 20:08:17 vins Exp $
+$NetBSD: patch-tools_System.c,v 1.2 2023/07/07 12:45:25 nia Exp $
Avoid int to pointer conversion warnings.
--- tools/System.c.orig 1997-05-07 20:15:47.000000000 +0000
+++ tools/System.c
+@@ -35,7 +35,7 @@ static char SCCSID[] = "@(#) Module: Sys
+ -- Include files
+ ----------------------------------------------------------------------------*/
+
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
@@ -102,8 +102,8 @@ void
if( line_no > 0 )
printf( "%s: (%d), ", file_name, line_no );
Home |
Main Index |
Thread Index |
Old Index