pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
time/xdiary: import xdiary-3.0.3 as wip/xdiary
Module Name: pkgsrc-wip
Committed By: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By: vms
Date: Wed Jan 4 00:26:58 2023 +0100
Changeset: 63bb57aed32651dea8e7e6d5f61a16f48bcdfeea
Added Files:
xdiary/DESCR
xdiary/MESSAGE
xdiary/Makefile
xdiary/PLIST
xdiary/distinfo
xdiary/patches/patch-XDiary.tmpl
xdiary/patches/patch-dtools_xtmCalendar.c
xdiary/patches/patch-dtools_xtmDbTools.c
xdiary/patches/patch-dtools_xtmEditEntry.c
xdiary/patches/patch-dtools_xtmMsgSelect.c
xdiary/patches/patch-dtools_xtmMsgSend.c
xdiary/patches/patch-dtools_xtmPlan.c
xdiary/patches/patch-dtools_xtmPrEntries.c
xdiary/patches/patch-dtools_xtmReminder.c
xdiary/patches/patch-dtools_xtmSchedAct.c
xdiary/patches/patch-dtools_xtmSchedMain.c
xdiary/patches/patch-dtools_xtmShowToDo.c
xdiary/patches/patch-tools_SigHandler.c
xdiary/patches/patch-tools_System.c
xdiary/patches/patch-xdaclunix_xtmAclUnix.c
xdiary/patches/patch-xdalarm_xtmAlarmProc.c
xdiary/patches/patch-xdcustom_xtmCustom.c
xdiary/patches/patch-xdiary_xtmDiary.c
xdiary/patches/patch-xdlight_xtmDiaryLgt.c
xdiary/patches/patch-xdnotify_xtmNotify.c
xdiary/patches/patch-xdprformat_xtmPrFormat.c
xdiary/patches/patch-xdremind_xtmRemMain.c
xdiary/patches/patch-xdremove_xtmRemove.c
xdiary/patches/patch-xdrestore_xtmRestore.c
xdiary/patches/patch-xtools_XmUbTimeB.c
xdiary/patches/patch-xtools_xitColorSel.c
xdiary/patches/patch-xtools_xitError.c
xdiary/patches/patch-xtools_xitInfoSrch.c
xdiary/patches/patch-xtools_xitInfoToc.c
xdiary/patches/patch-xtools_xitXmStr.c
Log Message:
time/xdiary: import xdiary-3.0.3 as wip/xdiary
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=63bb57aed32651dea8e7e6d5f61a16f48bcdfeea
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
xdiary/DESCR | 9 ++
xdiary/MESSAGE | 8 ++
xdiary/Makefile | 40 +++++++++
xdiary/PLIST | 35 ++++++++
xdiary/distinfo | 35 ++++++++
xdiary/patches/patch-XDiary.tmpl | 13 +++
xdiary/patches/patch-dtools_xtmCalendar.c | 31 +++++++
xdiary/patches/patch-dtools_xtmDbTools.c | 67 +++++++++++++++
xdiary/patches/patch-dtools_xtmEditEntry.c | 22 +++++
xdiary/patches/patch-dtools_xtmMsgSelect.c | 22 +++++
xdiary/patches/patch-dtools_xtmMsgSend.c | 31 +++++++
xdiary/patches/patch-dtools_xtmPlan.c | 107 ++++++++++++++++++++++++
xdiary/patches/patch-dtools_xtmPrEntries.c | 44 ++++++++++
xdiary/patches/patch-dtools_xtmReminder.c | 31 +++++++
xdiary/patches/patch-dtools_xtmSchedAct.c | 22 +++++
xdiary/patches/patch-dtools_xtmSchedMain.c | 116 ++++++++++++++++++++++++++
xdiary/patches/patch-dtools_xtmShowToDo.c | 44 ++++++++++
xdiary/patches/patch-tools_SigHandler.c | 20 +++++
xdiary/patches/patch-tools_System.c | 48 +++++++++++
xdiary/patches/patch-xdaclunix_xtmAclUnix.c | 15 ++++
xdiary/patches/patch-xdalarm_xtmAlarmProc.c | 15 ++++
xdiary/patches/patch-xdcustom_xtmCustom.c | 60 +++++++++++++
xdiary/patches/patch-xdiary_xtmDiary.c | 13 +++
xdiary/patches/patch-xdlight_xtmDiaryLgt.c | 15 ++++
xdiary/patches/patch-xdnotify_xtmNotify.c | 15 ++++
xdiary/patches/patch-xdprformat_xtmPrFormat.c | 12 +++
xdiary/patches/patch-xdremind_xtmRemMain.c | 15 ++++
xdiary/patches/patch-xdremove_xtmRemove.c | 17 ++++
xdiary/patches/patch-xdrestore_xtmRestore.c | 12 +++
xdiary/patches/patch-xtools_XmUbTimeB.c | 106 +++++++++++++++++++++++
xdiary/patches/patch-xtools_xitColorSel.c | 13 +++
xdiary/patches/patch-xtools_xitError.c | 12 +++
xdiary/patches/patch-xtools_xitInfoSrch.c | 22 +++++
xdiary/patches/patch-xtools_xitInfoToc.c | 22 +++++
xdiary/patches/patch-xtools_xitXmStr.c | 15 ++++
35 files changed, 1124 insertions(+)
diffs:
diff --git a/xdiary/DESCR b/xdiary/DESCR
new file mode 100644
index 0000000000..52604c1545
--- /dev/null
+++ b/xdiary/DESCR
@@ -0,0 +1,9 @@
+XDiary is a Motif/X Windows application that combines the functions of
+a desktop calendar, an appointment book and an alarm clock. XDiary
+will help you keep track of your meetings, appointments and plan
+your time.
+
+XDiary can be used as a stand-alone tool but it also contains all
+the functions necessary to be used as a group calendar. As a group
+calendar, XDiary will help you to plan meetings, distribute information
+to specific groups etc.
diff --git a/xdiary/MESSAGE b/xdiary/MESSAGE
new file mode 100644
index 0000000000..c2b3a83ab9
--- /dev/null
+++ b/xdiary/MESSAGE
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2022/12/30 18:17:48 vins Exp $
+
+To use XDiary, set the XRESOURCE_MAP_FILE environmental variable as below:
+
+ export XRESOURCE_MAP_FILE=${PREFIX}/lib/X11/app-defaults/XDiary.map
+
+===========================================================================
diff --git a/xdiary/Makefile b/xdiary/Makefile
new file mode 100644
index 0000000000..4cb39b1c28
--- /dev/null
+++ b/xdiary/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD$
+
+DISTNAME= xmdiary-3.0.3
+PKGNAME= ${DISTNAME:S/m//}
+CATEGORIES= time x11
+MASTER_SITES= ${MASTER_SITE_XCONTRIB:=office/}
+
+MAINTAINER= vins%NetBSD.org@localhost
+HOMEPAGE= https://www.ibiblio.org/pub/X11/contrib/office/xmdiary-README
+COMMENT= Calendar utility based on Motif/X
+LICENSE= 0-clause-bsd
+
+USE_IMAKE= yes
+
+SUBST_CLASSES+= cc
+SUBST_STAGE.cc= pre-configure
+SUBST_FILES.cc= XDiary.tmpl
+SUBST_VARS.cc= CC
+SUBST_MESSAGE.cc= Defining preferred compiler.
+
+SUBST_CLASSES+= malloc
+SUBST_STAGE.malloc= pre-configure
+SUBST_FILES.malloc= tools/LstLinked.c tools/System.c \
+ xtools/xitClipboard.c xtools/xitInfoFile.c
+SUBST_SED.malloc= -e 's|<malloc.h>|<stdlib.h>|g'
+
+MAKE_FLAGS+= INSTALL=${INSTALL:Q}
+MAKE_FLAGS+= CCOPTIONS=${CFLAGS:Q}
+MAKE_FLAGS+= LOCAL_LDFLAGS=${LDFLAGS:Q}
+
+MAKE_FLAGS+= XDEXEDIR=${PREFIX}/bin
+MAKE_FLAGS+= XDMANDIR=${PREFIX}/${PKGMANDIR}/man1
+MAKE_FLAGS+= XDDATADIR=${PREIFX}/lib/${PKGBASE}
+MAKE_FLAGS+= XDAPPDIR=${PREFIX}/lib/X11/app-defaults
+
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/motif.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xdiary/PLIST b/xdiary/PLIST
new file mode 100644
index 0000000000..70d0000426
--- /dev/null
+++ b/xdiary/PLIST
@@ -0,0 +1,35 @@
+@comment $NetBSD$
+bin/xdaclunix
+bin/xdalarm
+bin/xdcustom
+bin/xddump
+bin/xdiary
+bin/xdinitdb
+bin/xdlight
+bin/xdlocation
+bin/xdnotify
+bin/xdprformat
+bin/xdprint
+bin/xdremind
+bin/xdremote
+bin/xdremove
+bin/xdrestore
+lib/X11/app-defaults/XDiary
+lib/X11/app-defaults/XDiary.map
+lib/libTools.a
+lib/libXdiary.a
+lib/libXdndbm.a
+lib/libXtools.a
+man/man1/xdaclunix.1
+man/man1/xdalarm.1
+man/man1/xdcustom.1
+man/man1/xddump.1
+man/man1/xdiary.1
+man/man1/xdinitdb.1
+man/man1/xdlight.1
+man/man1/xdnotify.1
+man/man1/xdprformat.1
+man/man1/xdremind.1
+man/man1/xdremove.1
+man/man1/xdrestore.1
+@pkgdir include
diff --git a/xdiary/distinfo b/xdiary/distinfo
new file mode 100644
index 0000000000..9acaf0ea97
--- /dev/null
+++ b/xdiary/distinfo
@@ -0,0 +1,35 @@
+$NetBSD$
+
+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) = c9615944cd864385878ff18914e1f050e7644f36
+SHA1 (patch-dtools_xtmCalendar.c) = 1d9ae42400eefcdeee8a971154ff57ca8316ae9f
+SHA1 (patch-dtools_xtmDbTools.c) = f1cb5994a320cb81be009b62247249916a79c7e1
+SHA1 (patch-dtools_xtmEditEntry.c) = 3b083882ff00824dbb0e559828bcfc4ffe283636
+SHA1 (patch-dtools_xtmMsgSelect.c) = a13d57c955906b2445dedeb5d7e432a094a2c5df
+SHA1 (patch-dtools_xtmMsgSend.c) = 63529607ccc6c6f598efec3333acb819401962ef
+SHA1 (patch-dtools_xtmPlan.c) = 540b5c7ad8d8fa4823bb1177c47691d6d06a5345
+SHA1 (patch-dtools_xtmPrEntries.c) = f6658e51224d66e1c749ea032f5d8231402ec3a6
+SHA1 (patch-dtools_xtmReminder.c) = ab35f4ba83f033b7b4bc056d62ab59679ed0265a
+SHA1 (patch-dtools_xtmSchedAct.c) = 14b9fcd52c82397d99eec056da3d926691142ef4
+SHA1 (patch-dtools_xtmSchedMain.c) = 65290da77286227fce1e93bf48f54ab982f303ab
+SHA1 (patch-dtools_xtmShowToDo.c) = 7ca998ddc697699594f5446dc4db7d9bd6068d27
+SHA1 (patch-tools_SigHandler.c) = 841cd0b3f67a498cad89af288eace1e7beaa1fdb
+SHA1 (patch-tools_System.c) = d1fb9f9cdbfda3f58fe0eb53a4f93357c8e49336
+SHA1 (patch-xdaclunix_xtmAclUnix.c) = 8bd3115d7fa0630b0cf40b6854c8087faa3256e7
+SHA1 (patch-xdalarm_xtmAlarmProc.c) = 2b376e631c1a1285b34a3c4045e9fb41d573a8f3
+SHA1 (patch-xdcustom_xtmCustom.c) = efc573e2d0fd15cdc12e0c1452dbfc77ad028275
+SHA1 (patch-xdiary_xtmDiary.c) = aa76a0f12301a0d69c29f5b791e8be1405923e2b
+SHA1 (patch-xdlight_xtmDiaryLgt.c) = 5dbcb0b9c6e5f3c1962b48ec42418a10edf5c720
+SHA1 (patch-xdnotify_xtmNotify.c) = 5fe8265b668de11b8b3afc3517b42d96eb28aa05
+SHA1 (patch-xdprformat_xtmPrFormat.c) = 914926f726ca99eec0ddab5d95faf0f8e8e86e36
+SHA1 (patch-xdremind_xtmRemMain.c) = 0e67dcf8ffb4892850adf778f7382c7b42ed1a9f
+SHA1 (patch-xdremove_xtmRemove.c) = 4e6ce3410d7b8bd30e23aa4c424cb923e99728e1
+SHA1 (patch-xdrestore_xtmRestore.c) = f2074b4d7661e19aa2d2aa9069b9a336df0664b3
+SHA1 (patch-xtools_XmUbTimeB.c) = 967bfbf2b33615b49d7a363971fc579ee09c63f9
+SHA1 (patch-xtools_xitColorSel.c) = aa70e8a4091fce31a82d86fc6811e5369c58ff45
+SHA1 (patch-xtools_xitError.c) = de32cf09669eee59722b72a8f2e1a586af3d6776
+SHA1 (patch-xtools_xitInfoSrch.c) = 1cc7469e21e8cf7d60ba9f40b0d4a8ead26660c2
+SHA1 (patch-xtools_xitInfoToc.c) = 1465698b293099a1da8cba78c344b73d4eb85d8f
+SHA1 (patch-xtools_xitXmStr.c) = 1787daf0a8d253b8364e07003a9debc52d9c93f9
diff --git a/xdiary/patches/patch-XDiary.tmpl b/xdiary/patches/patch-XDiary.tmpl
new file mode 100644
index 0000000000..707aa0434a
--- /dev/null
+++ b/xdiary/patches/patch-XDiary.tmpl
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- XDiary.tmpl.orig 1997-05-07 19:51:46.000000000 +0000
++++ XDiary.tmpl
+@@ -111,7 +111,7 @@ XDMANDIR = /usr/local/man/man1
+ -----------------------------------------------------------------------------*/
+
+ #undef CcCmd
+-#define CcCmd gcc
++#define CcCmd @CC@
+ EXTRA_DEFINES =
+
+
diff --git a/xdiary/patches/patch-dtools_xtmCalendar.c b/xdiary/patches/patch-dtools_xtmCalendar.c
new file mode 100644
index 0000000000..811e4bec23
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmCalendar.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- dtools/xtmCalendar.c.orig 1997-05-04 21:09:55.000000000 +0000
++++ dtools/xtmCalendar.c
+@@ -779,7 +779,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t) index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1406,7 +1406,7 @@ static void
+ /* Code. */
+
+ /* About window? */
+- if( (int) call_data -> data == 6 ) {
++ if( (intptr_t) call_data -> data == 6 ) {
+ xtmHlDisplayAboutWindow( cal_ref -> calFormW );
+
+ return;
+@@ -1414,7 +1414,7 @@ static void
+
+ /* Use the standard help. */
+ xtmHlDisplayHelp( cal_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ cal_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmDbTools.c b/xdiary/patches/patch-dtools_xtmDbTools.c
new file mode 100644
index 0000000000..63cb1dd9b4
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmDbTools.c
@@ -0,0 +1,67 @@
+$NetBSD$
+
+--- dtools/xtmDbTools.c.orig 1997-05-04 22:27:52.000000000 +0000
++++ dtools/xtmDbTools.c
+@@ -1813,7 +1813,7 @@ XTM_DB_STATUS
+
+ /* Insert the date in the sorted list. */
+ lst_status = LstLinkSearchFirst( *list_ref,
+- (void *) record.date,
++ (void *)(uintptr_t)record.date,
+ (EQUALS_FUNC_TYPE) dateSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -1896,7 +1896,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_NOTE:
+ lst_status = LstLinkSearchFirst(
+ *note_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryIdSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -1910,7 +1910,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_ENTRY:
+ lst_status = LstLinkSearchFirst(
+ *entry_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryTimeSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -1984,7 +1984,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_NOTE:
+ lst_status = LstLinkSearchFirst(
+ *note_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryIdSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -1998,7 +1998,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_ENTRY:
+ lst_status = LstLinkSearchFirst(
+ *entry_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryTimeSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -2072,7 +2072,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_NOTE:
+ lst_status = LstLinkSearchFirst(
+ *note_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryIdSortFunc );
+
+ if( lst_status == LST_OK )
+@@ -2086,7 +2086,7 @@ XTM_DB_STATUS
+ case XTM_DB_DAY_ENTRY:
+ lst_status = LstLinkSearchFirst(
+ *entry_list_ref,
+- (void *) entry_record.entry.time_stamp,
++ (void *)(uintptr_t)entry_record.entry.time_stamp,
+ (EQUALS_FUNC_TYPE) entryTimeSortFunc );
+
+ if( lst_status == LST_OK )
diff --git a/xdiary/patches/patch-dtools_xtmEditEntry.c b/xdiary/patches/patch-dtools_xtmEditEntry.c
new file mode 100644
index 0000000000..9b8f766e3e
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmEditEntry.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- dtools/xtmEditEntry.c.orig 1997-05-04 22:27:52.000000000 +0000
++++ dtools/xtmEditEntry.c
+@@ -877,7 +877,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) helpCB, (XtPointer) index );
++ (XtCallbackProc) helpCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -2915,7 +2915,7 @@ static void
+ /* Code. */
+
+ xtmHlDisplayHelp( editor_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ edit_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmMsgSelect.c b/xdiary/patches/patch-dtools_xtmMsgSelect.c
new file mode 100644
index 0000000000..224bf784ec
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmMsgSelect.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- dtools/xtmMsgSelect.c.orig 1995-02-18 14:53:48.000000000 +0000
++++ dtools/xtmMsgSelect.c
+@@ -438,7 +438,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -849,7 +849,7 @@ static void
+ /* Code. */
+
+ xtmHlDisplayHelp( sel_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ select_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmMsgSend.c b/xdiary/patches/patch-dtools_xtmMsgSend.c
new file mode 100644
index 0000000000..8acdaad85f
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmMsgSend.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- dtools/xtmMsgSend.c.orig 1997-05-04 23:13:08.000000000 +0000
++++ dtools/xtmMsgSend.c
+@@ -611,7 +611,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -939,7 +939,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1811,7 +1811,7 @@ static void
+ /* Code. */
+
+ xtmHlDisplayHelp( send_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ send_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmPlan.c b/xdiary/patches/patch-dtools_xtmPlan.c
new file mode 100644
index 0000000000..486eb454bf
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmPlan.c
@@ -0,0 +1,107 @@
+$NetBSD$
+
+--- dtools/xtmPlan.c.orig 1997-05-04 21:09:51.000000000 +0000
++++ dtools/xtmPlan.c
+@@ -1004,7 +1004,7 @@ static Widget
+
+ if( XmIsPushButton( menuFileBu[ index ] ) )
+ XtAddCallback( menuFileBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) fileMenuCB, (XtPointer) index );
++ (XtCallbackProc) fileMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* Create the control menu. */
+@@ -1019,10 +1019,10 @@ static Widget
+
+ if( XmIsPushButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ else if( XmIsToggleButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNvalueChangedCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* Create the options menu. */
+@@ -1035,7 +1035,7 @@ static Widget
+
+ if( XmIsPushButton( menuOptBu[ index ] ) )
+ XtAddCallback( menuOptBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) optMenuCB, (XtPointer) index );
++ (XtCallbackProc) optMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* Create the help menu. */
+@@ -1048,7 +1048,7 @@ static Widget
+
+ if( XmIsPushButton( menuHelpBu[ index ] ) )
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -3434,7 +3434,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Instant update. */
+ case 0:
+@@ -3583,7 +3583,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Close the window. */
+ case 0:
+@@ -3609,7 +3609,7 @@ static void
+ /* Variables. */
+ Boolean ok;
+ int char_read;
+- int ref_count;
++ intptr_t ref_count;
+ char calendar[ XTM_GL_MAX_CAL_NAME + 1 ];
+ char *group_name;
+ char *members_ref;
+@@ -3664,7 +3664,7 @@ static void
+ XtSetArg( args[ n ], XmNuserData, &user_data_ref ); n++;
+ XtGetValues( calW, args, n );
+
+- ref_count = (int) user_data_ref;
++ ref_count = (intptr_t) user_data_ref;
+
+ if( call_data -> set ) {
+ if( ref_count < 1 )
+@@ -3710,7 +3710,7 @@ static void
+ /* Code. */
+
+ /* About window? */
+- if( (int) call_data -> data == 6 ) {
++ if( (intptr_t) call_data -> data == 6 ) {
+ xtmHlDisplayAboutWindow( plan_ref -> plannerW );
+
+ return;
+@@ -3718,7 +3718,7 @@ static void
+
+ /* Use the standard help. */
+ xtmHlDisplayHelp( plan_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ planner_window_id, "" );
+
+ return;
+@@ -3810,7 +3810,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Send message. */
+ case 0:
diff --git a/xdiary/patches/patch-dtools_xtmPrEntries.c b/xdiary/patches/patch-dtools_xtmPrEntries.c
new file mode 100644
index 0000000000..13a27b9c18
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmPrEntries.c
@@ -0,0 +1,44 @@
+$NetBSD$
+
+--- dtools/xtmPrEntries.c.orig 1997-05-04 21:09:51.000000000 +0000
++++ dtools/xtmPrEntries.c
+@@ -778,10 +778,10 @@ static Widget
+
+ if( XmIsPushButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ else if( XmIsToggleButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNvalueChangedCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* Create the help menu. */
+@@ -793,7 +793,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1815,7 +1815,7 @@ static void
+ custom_data_ref = printer_ref -> appl_data_ref -> custom_data;
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Filter window. */
+ case 0:
+@@ -2005,7 +2005,7 @@ static void
+ /* Code. */
+
+ xtmHlDisplayHelp( printer_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ print_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmReminder.c b/xdiary/patches/patch-dtools_xtmReminder.c
new file mode 100644
index 0000000000..2de0f21967
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmReminder.c
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- dtools/xtmReminder.c.orig 1997-05-04 21:09:51.000000000 +0000
++++ dtools/xtmReminder.c
+@@ -580,7 +580,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) helpCB, (XtPointer) index );
++ (XtCallbackProc) helpCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1093,7 +1093,7 @@ static void
+ /* Code. */
+
+ /* About window? */
+- if( (int) call_data -> data == 6 ) {
++ if( (intptr_t) call_data -> data == 6 ) {
+ xtmHlDisplayAboutWindow( reminder_ref -> reminderW );
+
+ return;
+@@ -1105,7 +1105,7 @@ static void
+ /* Call the user callback. */
+ (* reminder_ref -> helpCB)( reminder_ref -> reminderW,
+ reminder_ref -> user_data,
+- (int) call_data -> data );
++ (intptr_t) call_data -> data );
+
+
+ return;
diff --git a/xdiary/patches/patch-dtools_xtmSchedAct.c b/xdiary/patches/patch-dtools_xtmSchedAct.c
new file mode 100644
index 0000000000..8f21deffee
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmSchedAct.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- dtools/xtmSchedAct.c.orig 1997-05-04 21:16:55.000000000 +0000
++++ dtools/xtmSchedAct.c
+@@ -1967,7 +1967,7 @@ static Widget
+
+ if( XmIsPushButton( menuPopupBu[ index ] ) )
+ XtAddCallback( menuPopupBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) entryPuMenuCB, (XtPointer) index );
++ (XtCallbackProc) entryPuMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ XtManageChildren( menuPopupBu, XtNumber( menuPopupBu ) );
+@@ -2106,7 +2106,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Edit the entry. */
+ case 0:
diff --git a/xdiary/patches/patch-dtools_xtmSchedMain.c b/xdiary/patches/patch-dtools_xtmSchedMain.c
new file mode 100644
index 0000000000..491749104e
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmSchedMain.c
@@ -0,0 +1,116 @@
+$NetBSD$
+
+--- dtools/xtmSchedMain.c.orig 1997-05-04 23:16:02.000000000 +0000
++++ dtools/xtmSchedMain.c
+@@ -1090,7 +1090,7 @@ static Widget
+
+ if( XmIsPushButton( menuFileBu[ index ] ) )
+ XtAddCallback( menuFileBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) fileMenuCB, (XtPointer) index );
++ (XtCallbackProc) fileMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+ if( flagIsSet( sched_ref -> flags, XTM_SM_ONLY_ONE ) )
+@@ -1109,7 +1109,7 @@ static Widget
+
+ if( XmIsPushButton( menuEditBu[ index ] ) )
+ XtAddCallback( menuEditBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) editMenuCB, (XtPointer) index );
++ (XtCallbackProc) editMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -1125,10 +1125,10 @@ static Widget
+
+ if( XmIsPushButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ else if( XmIsToggleButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNvalueChangedCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -1142,7 +1142,7 @@ static Widget
+
+ if( XmIsPushButton( menuOptionsBu[ index ] ) )
+ XtAddCallback( menuOptionsBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) optionsMenuCB, (XtPointer) index );
++ (XtCallbackProc) optionsMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -1156,7 +1156,7 @@ static Widget
+
+ if( XmIsPushButton( menuHelpBu[ index ] ) )
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1971,7 +1971,7 @@ static void
+ mainW = XtNameToWidget( sched_ref -> scheduleW, "SchedTlBase.SchedTlFo" );
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Confirm actions? */
+ case 0:
+@@ -2277,7 +2277,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Edit the entry. */
+ case 0:
+@@ -2401,7 +2401,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Open schedule with the same database. */
+ case 0:
+@@ -2493,7 +2493,7 @@ static void
+ flagIsSet( db_info.operations, XTM_DB_FLAG_MODE_WRITE ) )
+ can_download = True;
+
+- if( (int) call_data -> data == 4 )
++ if( (intptr_t) call_data -> data == 4 )
+ xtmRtDoRemote( sched_ref -> remote_handle, XTM_RT_UPLOAD,
+ db_info.short_name, True, can_download );
+ else
+@@ -2605,7 +2605,7 @@ static void
+ /* Code. */
+
+ /* About window? */
+- if( (int) call_data -> data == 6 ) {
++ if( (intptr_t) call_data -> data == 6 ) {
+ xtmHlDisplayAboutWindow( sched_ref -> scheduleW );
+
+ return;
+@@ -2613,7 +2613,7 @@ static void
+
+ /* Use the standard help. */
+ xtmHlDisplayHelp( sched_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ day_view_window_id, "" );
+
+ return;
+@@ -3020,7 +3020,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Appointment editor. */
+ case 0:
diff --git a/xdiary/patches/patch-dtools_xtmShowToDo.c b/xdiary/patches/patch-dtools_xtmShowToDo.c
new file mode 100644
index 0000000000..a94b927027
--- /dev/null
+++ b/xdiary/patches/patch-dtools_xtmShowToDo.c
@@ -0,0 +1,44 @@
+$NetBSD$
+
+--- dtools/xtmShowToDo.c.orig 1997-05-04 21:26:20.000000000 +0000
++++ dtools/xtmShowToDo.c
+@@ -665,10 +665,10 @@ static Widget
+
+ if( XmIsPushButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ else if( XmIsToggleButton( menuCtrlBu[ index ] ) )
+ XtAddCallback( menuCtrlBu[ index ], XmNvalueChangedCallback,
+- (XtCallbackProc) ctrlMenuCB, (XtPointer) index );
++ (XtCallbackProc) ctrlMenuCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -681,7 +681,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -1189,7 +1189,7 @@ static void
+ custom_data_ref = show_ref -> appl_data_ref -> custom_data;
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Display entry flags? */
+ case 0:
+@@ -1402,7 +1402,7 @@ static void
+ /* Code. */
+
+ xtmHlDisplayHelp( show_ref -> appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ sum_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-tools_SigHandler.c b/xdiary/patches/patch-tools_SigHandler.c
new file mode 100644
index 0000000000..411c8aefe0
--- /dev/null
+++ b/xdiary/patches/patch-tools_SigHandler.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Avoid use of obsolete 'union wait *'.
+
+--- tools/SigHandler.c.orig 1995-02-18 13:32:44.000000000 +0000
++++ tools/SigHandler.c
+@@ -221,13 +221,7 @@ static void
+ /* Variables. */
+ int index;
+ int pid;
+-
+-#if defined(_POSIX_SOURCE) || defined(_INCLUDE_POSIX_SOURCE)
+ int status;
+-#else
+- union wait status;
+-#endif
+-
+
+ /* Code. */
+
diff --git a/xdiary/patches/patch-tools_System.c b/xdiary/patches/patch-tools_System.c
new file mode 100644
index 0000000000..d9694dc544
--- /dev/null
+++ b/xdiary/patches/patch-tools_System.c
@@ -0,0 +1,48 @@
+$NetBSD$
+
+--- tools/System.c.orig 1997-05-07 20:15:47.000000000 +0000
++++ tools/System.c
+@@ -102,8 +102,8 @@ void
+ if( line_no > 0 )
+ printf( "%s: (%d), ", file_name, line_no );
+
+- printf( "SysBaseCalloc(), ref: %d, ref_count: %d\n",
+- (int) ref, memory_ref_count );
++ printf( "SysBaseCalloc(), ref: %p, ref_count: %d\n",
++ ref, memory_ref_count );
+
+ memory_ref_count++;
+ }
+@@ -133,8 +133,8 @@ void
+ if( line_no > 0 )
+ printf( "%s: (%d), ", file_name, line_no );
+
+- printf( "SysBaseFree(), ref: %d, ref_count: %d\n",
+- (int) pointer, memory_ref_count );
++ printf( "SysBaseFree(), ref: %p, ref_count: %d\n",
++ pointer, memory_ref_count );
+
+ memory_ref_count++;
+ }
+@@ -166,8 +166,8 @@ void
+ if( line_no > 0 )
+ printf( "%s: (%d), ", file_name, line_no );
+
+- printf( "SysBaseMalloc(), ref: %d, ref_count: %d\n",
+- (int) ref, memory_ref_count );
++ printf( "SysBaseMalloc(), ref: %p, ref_count: %d\n",
++ ref, memory_ref_count );
+
+ memory_ref_count++;
+ }
+@@ -208,8 +208,8 @@ extern void
+ if( line_no > 0 )
+ printf( "%s: (%d), ", file_name, line_no );
+
+- printf( "SysBaseRealloc(), ref: %d, ref_count: %d\n",
+- (int) ref, memory_ref_count );
++ printf( "SysBaseRealloc(), ref: %p, ref_count: %d\n",
++ ref, memory_ref_count );
+
+ memory_ref_count++;
+ }
diff --git a/xdiary/patches/patch-xdaclunix_xtmAclUnix.c b/xdiary/patches/patch-xdaclunix_xtmAclUnix.c
new file mode 100644
index 0000000000..87e29b3f0d
--- /dev/null
+++ b/xdiary/patches/patch-xdaclunix_xtmAclUnix.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xdaclunix/xtmAclUnix.c.orig 1997-05-04 22:02:19.000000000 +0000
++++ xdaclunix/xtmAclUnix.c
+@@ -226,8 +226,8 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char *argv[] )
++int
++ main( int argc, char *argv[] )
+ {
+
+ /* Variables. */
diff --git a/xdiary/patches/patch-xdalarm_xtmAlarmProc.c b/xdiary/patches/patch-xdalarm_xtmAlarmProc.c
new file mode 100644
index 0000000000..b8d29c027e
--- /dev/null
+++ b/xdiary/patches/patch-xdalarm_xtmAlarmProc.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xdalarm/xtmAlarmProc.c.orig 1997-05-04 22:02:19.000000000 +0000
++++ xdalarm/xtmAlarmProc.c
+@@ -452,8 +452,8 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char *argv[] )
++int
++ main( int argc, char *argv[] )
+ {
+
+ /* Variables. */
diff --git a/xdiary/patches/patch-xdcustom_xtmCustom.c b/xdiary/patches/patch-xdcustom_xtmCustom.c
new file mode 100644
index 0000000000..0a1fffadd2
--- /dev/null
+++ b/xdiary/patches/patch-xdcustom_xtmCustom.c
@@ -0,0 +1,60 @@
+$NetBSD$
+
+--- xdcustom/xtmCustom.c.orig 1997-05-04 22:02:16.000000000 +0000
++++ xdcustom/xtmCustom.c
+@@ -231,8 +231,8 @@ static int
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char *argv[] )
++int
++ main( int argc, char *argv[] )
+ {
+
+ /* Variables. */
+@@ -615,7 +615,7 @@ static Widget
+ &help_casc[ index ] );
+
+ XtAddCallback( menuHelpBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) infoCB, (XtPointer) index );
++ (XtCallbackProc) infoCB, (XtPointer)(intptr_t)index );
+ }
+
+ /* We can't do context sensitive help. */
+@@ -641,7 +641,7 @@ static Widget
+ &do_cust_def[ index ] );
+
+ XtAddCallback( doCustBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) doCustCB, (XtPointer) index );
++ (XtCallbackProc) doCustCB, (XtPointer)(intptr_t)index );
+
+ } /* loop */
+
+@@ -1451,7 +1451,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Calendar customization? */
+ case 0:
+@@ -1578,7 +1578,7 @@ static void
+ /* Code. */
+
+ /* About window? */
+- if( (int) call_data -> data == 6 ) {
++ if( (intptr_t) call_data -> data == 6 ) {
+
+ Widget tempW;
+
+@@ -1590,7 +1590,7 @@ static void
+
+ /* Use the standard help. */
+ xtmHlDisplayHelp( appl_data_ref -> info_handle,
+- (int) call_data -> data,
++ (intptr_t) call_data -> data,
+ custom_window_id, "" );
+
+ return;
diff --git a/xdiary/patches/patch-xdiary_xtmDiary.c b/xdiary/patches/patch-xdiary_xtmDiary.c
new file mode 100644
index 0000000000..4402fd0cbf
--- /dev/null
+++ b/xdiary/patches/patch-xdiary_xtmDiary.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- xdiary/xtmDiary.c.orig 1997-05-05 23:13:48.000000000 +0000
++++ xdiary/xtmDiary.c
+@@ -213,7 +213,7 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
++int
+ main( int argc, char **argv )
+ {
+
diff --git a/xdiary/patches/patch-xdlight_xtmDiaryLgt.c b/xdiary/patches/patch-xdlight_xtmDiaryLgt.c
new file mode 100644
index 0000000000..f53c7698fd
--- /dev/null
+++ b/xdiary/patches/patch-xdlight_xtmDiaryLgt.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xdlight/xtmDiaryLgt.c.orig 1997-05-04 23:13:08.000000000 +0000
++++ xdlight/xtmDiaryLgt.c
+@@ -220,8 +220,8 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char **argv )
++int
++ main( int argc, char **argv )
+ {
+
+ /* Variables. */
diff --git a/xdiary/patches/patch-xdnotify_xtmNotify.c b/xdiary/patches/patch-xdnotify_xtmNotify.c
new file mode 100644
index 0000000000..0ed390408c
--- /dev/null
+++ b/xdiary/patches/patch-xdnotify_xtmNotify.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xdnotify/xtmNotify.c.orig 1997-05-04 22:02:15.000000000 +0000
++++ xdnotify/xtmNotify.c
+@@ -244,8 +244,8 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char *argv[] )
++int
++ main( int argc, char *argv[] )
+ {
+
+ /* Variables. */
diff --git a/xdiary/patches/patch-xdprformat_xtmPrFormat.c b/xdiary/patches/patch-xdprformat_xtmPrFormat.c
new file mode 100644
index 0000000000..50c4a626a2
--- /dev/null
+++ b/xdiary/patches/patch-xdprformat_xtmPrFormat.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- xdprformat/xtmPrFormat.c.orig 1997-05-04 22:02:15.000000000 +0000
++++ xdprformat/xtmPrFormat.c
+@@ -37,6 +37,7 @@ static char SCCSID[] = "@(#) Module: xtm
+ ----------------------------------------------------------------------------*/
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <time.h>
diff --git a/xdiary/patches/patch-xdremind_xtmRemMain.c b/xdiary/patches/patch-xdremind_xtmRemMain.c
new file mode 100644
index 0000000000..48b0537816
--- /dev/null
+++ b/xdiary/patches/patch-xdremind_xtmRemMain.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xdremind/xtmRemMain.c.orig 1997-05-04 22:02:15.000000000 +0000
++++ xdremind/xtmRemMain.c
+@@ -177,8 +177,8 @@ static void
+ -- Functions
+ ----------------------------------------------------------------------------*/
+
+-void
+- main( unsigned int argc, char *argv[] )
++int
++ main( int argc, char *argv[] )
+ {
+
+ /* Variables. */
diff --git a/xdiary/patches/patch-xdremove_xtmRemove.c b/xdiary/patches/patch-xdremove_xtmRemove.c
new file mode 100644
index 0000000000..45050ce157
--- /dev/null
+++ b/xdiary/patches/patch-xdremove_xtmRemove.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Use fgets() instead of gets()
+
+--- xdremove/xtmRemove.c.orig 1997-05-04 22:02:15.000000000 +0000
++++ xdremove/xtmRemove.c
+@@ -290,8 +290,8 @@ main( int argc, char *argv[] )
+ appl_data.days, buffer, appl_data.database_dir );
+ printf( "Is this OK? (Y/N) [N]: " );
+
+- gets( buffer );
+- if( toupper( buffer[ 0 ] ) != 'Y' )
++ fgets(buffer, sizeof(buffer), stdin);
++ if( toupper( buffer[ 0 ] ) != 'Y' )
+ exit( 0 );
+ }
+
diff --git a/xdiary/patches/patch-xdrestore_xtmRestore.c b/xdiary/patches/patch-xdrestore_xtmRestore.c
new file mode 100644
index 0000000000..08511ba449
--- /dev/null
+++ b/xdiary/patches/patch-xdrestore_xtmRestore.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- xdrestore/xtmRestore.c.orig 1997-05-04 22:02:14.000000000 +0000
++++ xdrestore/xtmRestore.c
+@@ -37,6 +37,7 @@ static char SCCSID[] = "@(#) Module: xtm
+ ----------------------------------------------------------------------------*/
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+ #include <ctype.h>
diff --git a/xdiary/patches/patch-xtools_XmUbTimeB.c b/xdiary/patches/patch-xtools_XmUbTimeB.c
new file mode 100644
index 0000000000..00a9564cb5
--- /dev/null
+++ b/xdiary/patches/patch-xtools_XmUbTimeB.c
@@ -0,0 +1,106 @@
+$NetBSD$
+
+--- xtools/XmUbTimeB.c.orig 1997-05-04 21:09:52.000000000 +0000
++++ xtools/XmUbTimeB.c
+@@ -2159,7 +2159,7 @@ static void
+ /* For predefined actions, call common routine.
+ For other actions, register as callbacks directly. */
+ if( ( items[ index ].proc != XmUbTB_NO_ACTION ) &&
+- ( (int) items[ index ].proc <= (int) XmUbTB_LAST_PREDEF_ACTION ) )
++ ( (intptr_t)items[ index ].proc <= (intptr_t)XmUbTB_LAST_PREDEF_ACTION ) )
+ XtAddCallback( w, XmNactivateCallback,
+ (XtCallbackProc) MenuItemActivatedCB,
+ (XtPointer) items[ index ].proc );
+@@ -3366,51 +3366,51 @@ static void
+ XtGetValues( pb, args, n );
+
+ /* What to do depends on the selected action. */
+- switch( (int) action ){
++ switch((intptr_t)action){
+
+- case (int) XmUbTB_ACTION_THIS_WEEK:
++ case (intptr_t) XmUbTB_ACTION_THIS_WEEK:
+ FillInStartOfWeek( tbox );
+ AddDateWeek( tbox, 1, 1 );
+ break;
+
+- case (int) XmUbTB_ACTION_THIS_MONTH:
++ case (intptr_t) XmUbTB_ACTION_THIS_MONTH:
+ FillInStartOfMonth( tbox );
+ AddDateMonth( tbox, 1, 1 );
+ break;
+
+- case (int) XmUbTB_ACTION_PLUS_ONE_HOUR:
++ case (intptr_t) XmUbTB_ACTION_PLUS_ONE_HOUR:
+ AddDateHour( tbox, 1 );
+ break;
+
+- case (int) XmUbTB_ACTION_PLUS_TWO_HOURS:
++ case (intptr_t) XmUbTB_ACTION_PLUS_TWO_HOURS:
+ AddDateHour( tbox, 2 );
+ break;
+
+- case (int) XmUbTB_ACTION_PLUS_ONE_WEEK:
++ case (intptr_t) XmUbTB_ACTION_PLUS_ONE_WEEK:
+ AddDateWeek( tbox, 1, 0 );
+ break;
+
+- case (int) XmUbTB_ACTION_PLUS_TWO_WEEKS:
++ case (intptr_t) XmUbTB_ACTION_PLUS_TWO_WEEKS:
+ AddDateWeek( tbox, 2, 0 );
+ break;
+
+- case (int) XmUbTB_ACTION_PLUS_ONE_MONTH:
++ case (intptr_t) XmUbTB_ACTION_PLUS_ONE_MONTH:
+ AddDateMonth( tbox, 1, 0 );
+ break;
+
+- case (int) XmUbTB_ACTION_TIME_NOW:
++ case (intptr_t) XmUbTB_ACTION_TIME_NOW:
+ (void) XmUbTimeBoxSetStartTime( (Widget) tbox,
+ TimLocalTime( TimMakeTimeNow() ) );
+ range = False;
+ break;
+
+- case (int) XmUbTB_ACTION_DATE_NOW:
++ case (intptr_t) XmUbTB_ACTION_DATE_NOW:
+ (void) XmUbTimeBoxSetStartDate( (Widget) tbox,
+ TimLocalTime( TimMakeTimeNow() ) );
+ range = False;
+ break;
+
+- case (int) XmUbTB_ACTION_NOW:
++ case (intptr_t) XmUbTB_ACTION_NOW:
+ (void) XmUbTimeBoxSetStartDate( (Widget) tbox,
+ TimLocalTime( TimMakeTimeNow() ) );
+ (void) XmUbTimeBoxSetStartTime( (Widget) tbox,
+@@ -3425,9 +3425,9 @@ static void
+ } /* switch */
+
+ /* Set the keyboard focus to the most recently inserted text. */
+- switch( (int) action ){
++ switch( (intptr_t) action ){
+
+- case (int) XmUbTB_ACTION_TIME_NOW:
++ case (intptr_t) XmUbTB_ACTION_TIME_NOW:
+ /* Set keyboard focus to the start time field. */
+ if( tbox -> tbox.internal_children[ XmUbTB_CHILD_START_TIME ] != NULL )
+ XmProcessTraversal(
+@@ -3436,7 +3436,7 @@ static void
+
+ break;
+
+- case (int) XmUbTB_ACTION_DATE_NOW:
++ case (intptr_t) XmUbTB_ACTION_DATE_NOW:
+ /* Set keyboard focus to the start date field. */
+ if( tbox -> tbox.internal_children[ XmUbTB_CHILD_START_DATE ] != NULL )
+ XmProcessTraversal(
+@@ -3445,7 +3445,7 @@ static void
+
+ break;
+
+- case (int) XmUbTB_ACTION_NOW:
++ case (intptr_t) XmUbTB_ACTION_NOW:
+ /* Set keyboard focus to the start time or date field. */
+ if( tbox -> tbox.internal_children[ XmUbTB_CHILD_START_TIME ] != NULL )
+ XmProcessTraversal(
diff --git a/xdiary/patches/patch-xtools_xitColorSel.c b/xdiary/patches/patch-xtools_xitColorSel.c
new file mode 100644
index 0000000000..1ceffeb2f6
--- /dev/null
+++ b/xdiary/patches/patch-xtools_xitColorSel.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- xtools/xitColorSel.c.orig 1997-05-04 13:13:45.000000000 +0000
++++ xtools/xitColorSel.c
+@@ -302,7 +302,7 @@ Widget
+ XtManageChild( menuPb );
+
+ XtAddCallback( menuPb, XmNactivateCallback,
+- (XtCallbackProc) menuSelectCB, (XtPointer) index );
++ (XtCallbackProc) menuSelectCB, (XtPointer)(intptr_t)index );
+
+ /* The default color is the first color. */
+ if( index == 0 ) {
diff --git a/xdiary/patches/patch-xtools_xitError.c b/xdiary/patches/patch-xtools_xitError.c
new file mode 100644
index 0000000000..c920541c8d
--- /dev/null
+++ b/xdiary/patches/patch-xtools_xitError.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- xtools/xitError.c.orig 1995-02-18 14:11:29.000000000 +0000
++++ xtools/xitError.c
+@@ -39,6 +39,7 @@ static char SCCSID[] = "@(#) Module: xit
+ ----------------------------------------------------------------------------*/
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+
+ #include <X11/Intrinsic.h>
diff --git a/xdiary/patches/patch-xtools_xitInfoSrch.c b/xdiary/patches/patch-xtools_xitInfoSrch.c
new file mode 100644
index 0000000000..8f247d3708
--- /dev/null
+++ b/xdiary/patches/patch-xtools_xitInfoSrch.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- xtools/xitInfoSrch.c.orig 1997-05-04 22:25:10.000000000 +0000
++++ xtools/xitInfoSrch.c
+@@ -406,7 +406,7 @@ static Widget
+ gotoBu[ index ] = xitCreatePushButton( gotoRc, &goto_def[ index ] );
+
+ XtAddCallback( gotoBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) gotoCB, (XtPointer) index );
++ (XtCallbackProc) gotoCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -663,7 +663,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Next? */
+ case 0:
diff --git a/xdiary/patches/patch-xtools_xitInfoToc.c b/xdiary/patches/patch-xtools_xitInfoToc.c
new file mode 100644
index 0000000000..3ba3288bec
--- /dev/null
+++ b/xdiary/patches/patch-xtools_xitInfoToc.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- xtools/xitInfoToc.c.orig 1997-05-04 13:15:28.000000000 +0000
++++ xtools/xitInfoToc.c
+@@ -355,7 +355,7 @@ static Widget
+ gotoBu[ index ] = xitCreatePushButton( gotoRc, &goto_def[ index ] );
+
+ XtAddCallback( gotoBu[ index ], XmNactivateCallback,
+- (XtCallbackProc) gotoCB, (XtPointer) index );
++ (XtCallbackProc) gotoCB, (XtPointer)(intptr_t)index );
+ }
+
+
+@@ -702,7 +702,7 @@ static void
+
+
+ /* Select what to do. */
+- switch( (int) call_data -> data ) {
++ switch( (intptr_t) call_data -> data ) {
+
+ /* Next? */
+ case 0:
diff --git a/xdiary/patches/patch-xtools_xitXmStr.c b/xdiary/patches/patch-xtools_xitXmStr.c
new file mode 100644
index 0000000000..0009dd698f
--- /dev/null
+++ b/xdiary/patches/patch-xtools_xitXmStr.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- xtools/xitXmStr.c.orig 1995-02-18 14:11:37.000000000 +0000
++++ xtools/xitXmStr.c
+@@ -56,10 +56,6 @@ static char SCCSID[] = "@(#) Module: xit
+ -- Macro definitions
+ ----------------------------------------------------------------------------*/
+
+-#ifndef _POSIX_SOURCE
+-# define const
+-#endif
+-
+
+ /*----------------------------------------------------------------------------
+ -- Type declarations
Home |
Main Index |
Thread Index |
Old Index