Date: Mon, 28 Jul 2014 16:03:52 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363194 - in head/deskutils: aspostit/files cal/files gaddr/files ical/files xcalendar/files xmaddressbook/files xmdiary/files xpostit/files xpostitPlus/files xrolo/files Message-ID: <201407281603.s6SG3qxq041847@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 28 16:03:51 2014 New Revision: 363194 URL: http://svnweb.freebsd.org/changeset/ports/363194 QAT: https://qat.redports.org/buildarchive/r363194/ Log: Rename deskutils/ patch-xy patches to reflect the files they modify. Added: head/deskutils/aspostit/files/patch-app_defaults.h - copied unchanged from r363137, head/deskutils/aspostit/files/patch-aa head/deskutils/cal/files/patch-cal.1 - copied unchanged from r363137, head/deskutils/cal/files/patch-ac head/deskutils/cal/files/patch-cal.c - copied unchanged from r363137, head/deskutils/cal/files/patch-ab head/deskutils/cal/files/patch-makefile.unx - copied unchanged from r363137, head/deskutils/cal/files/patch-aa head/deskutils/gaddr/files/patch-Makefile.in - copied unchanged from r363137, head/deskutils/gaddr/files/patch-ab head/deskutils/gaddr/files/patch-db.c - copied unchanged from r363137, head/deskutils/gaddr/files/patch-aa head/deskutils/ical/files/cal_tcl.C - copied unchanged from r363137, head/deskutils/ical/files/patch-aa head/deskutils/ical/files/patch-Makefile.in - copied unchanged from r363137, head/deskutils/ical/files/patch-ac head/deskutils/ical/files/patch-calendar_Makefile.in - copied unchanged from r363137, head/deskutils/ical/files/patch-ad head/deskutils/ical/files/patch-item_tcl.C - copied unchanged from r363137, head/deskutils/ical/files/patch-ab head/deskutils/ical/files/patch-time_Makefile.in - copied unchanged from r363137, head/deskutils/ical/files/patch-ae head/deskutils/ical/files/patch-types_Makefile.in - copied unchanged from r363137, head/deskutils/ical/files/patch-af head/deskutils/xcalendar/files/patch-XCal-uj.sed - copied unchanged from r363137, head/deskutils/xcalendar/files/patch-ac head/deskutils/xcalendar/files/patch-XCalendar.sed - copied unchanged from r363137, head/deskutils/xcalendar/files/patch-af head/deskutils/xcalendar/files/patch-dayeditor.c - copied unchanged from r363137, head/deskutils/xcalendar/files/patch-ab head/deskutils/xcalendar/files/patch-xcalendar.c - copied unchanged from r363137, head/deskutils/xcalendar/files/patch-aa head/deskutils/xcalendar/files/patch-xcalendar.h - copied unchanged from r363137, head/deskutils/xcalendar/files/patch-ag head/deskutils/xmaddressbook/files/patch-Imakefile - copied unchanged from r363137, head/deskutils/xmaddressbook/files/patch-aa head/deskutils/xmdiary/files/patch-XDiary.tmpl - copied unchanged from r363137, head/deskutils/xmdiary/files/patch-ab head/deskutils/xmdiary/files/patch-dtools_xtmEditAclUx.c - copied, changed from r363137, head/deskutils/xmdiary/files/patch-ac head/deskutils/xmdiary/files/patch-ndbm_xdndbm.c - copied unchanged from r363137, head/deskutils/xmdiary/files/patch-aa head/deskutils/xmdiary/files/patch-xdremove_xtmRemove - copied, changed from r363137, head/deskutils/xmdiary/files/patch-ac head/deskutils/xpostit/files/patch-plaid.c - copied, changed from r363137, head/deskutils/xpostit/files/patch-aa head/deskutils/xpostit/files/patch-xpostit.c - copied, changed from r363137, head/deskutils/xpostit/files/patch-aa head/deskutils/xpostitPlus/files/patch-Imakefile - copied unchanged from r363137, head/deskutils/xpostitPlus/files/patch-aa head/deskutils/xrolo/files/patch-Imakefile - copied unchanged from r363137, head/deskutils/xrolo/files/patch-aa head/deskutils/xrolo/files/patch-cards.c - copied unchanged from r363137, head/deskutils/xrolo/files/patch-ae head/deskutils/xrolo/files/patch-main.c - copied unchanged from r363137, head/deskutils/xrolo/files/patch-ab head/deskutils/xrolo/files/patch-panel.c - copied unchanged from r363137, head/deskutils/xrolo/files/patch-ad head/deskutils/xrolo/files/patch-phone.c - copied unchanged from r363137, head/deskutils/xrolo/files/patch-ac head/deskutils/xrolo/files/patch-popup.c - copied unchanged from r363137, head/deskutils/xrolo/files/patch-af Deleted: head/deskutils/aspostit/files/patch-aa head/deskutils/cal/files/patch-aa head/deskutils/cal/files/patch-ab head/deskutils/cal/files/patch-ac head/deskutils/gaddr/files/patch-aa head/deskutils/gaddr/files/patch-ab head/deskutils/ical/files/patch-aa head/deskutils/ical/files/patch-ab head/deskutils/ical/files/patch-ac head/deskutils/ical/files/patch-ad head/deskutils/ical/files/patch-ae head/deskutils/ical/files/patch-af head/deskutils/xcalendar/files/patch-aa head/deskutils/xcalendar/files/patch-ab head/deskutils/xcalendar/files/patch-ac head/deskutils/xcalendar/files/patch-af head/deskutils/xcalendar/files/patch-ag head/deskutils/xmaddressbook/files/patch-aa head/deskutils/xmdiary/files/patch-aa head/deskutils/xmdiary/files/patch-ab head/deskutils/xmdiary/files/patch-ac head/deskutils/xpostit/files/patch-aa head/deskutils/xpostitPlus/files/patch-aa head/deskutils/xrolo/files/patch-aa head/deskutils/xrolo/files/patch-ab head/deskutils/xrolo/files/patch-ac head/deskutils/xrolo/files/patch-ad head/deskutils/xrolo/files/patch-ae head/deskutils/xrolo/files/patch-af Copied: head/deskutils/aspostit/files/patch-app_defaults.h (from r363137, head/deskutils/aspostit/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/aspostit/files/patch-app_defaults.h Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/aspostit/files/patch-aa) @@ -0,0 +1,15 @@ +*** app_defaults.h Mon Jan 4 00:05:08 1999 +--- app_defaults.h~ Mon Jan 4 00:05:01 1999 +*************** +*** 1,5 **** + "Xpostit.geometry: 70x70-0+0", +! "Xpostit.noteDir: ~/aspostit/", + "Xpostit.Menu*cursor: hand1", + "Xpostit.printCmd: \"lpr %s\"", + "Xpostit.calendarCmd: cal", +--- 1,5 ---- + "Xpostit.geometry: 70x70-0+0", +! "Xpostit.noteDir: ~/GNUstep/Library/AfterStep/aspostit/", + "Xpostit.Menu*cursor: hand1", + "Xpostit.printCmd: \"lpr %s\"", + "Xpostit.calendarCmd: cal", Copied: head/deskutils/cal/files/patch-cal.1 (from r363137, head/deskutils/cal/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/cal/files/patch-cal.1 Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/cal/files/patch-ac) @@ -0,0 +1,17 @@ +--- cal.1.orig Sat Jul 6 02:55:52 1996 ++++ cal.1 Mon Mar 29 16:02:33 1999 +@@ -375,12 +375,12 @@ + .TP + .B caldat + .TP +-.B /usr/lib/caldat ++.B %%PREFIX%%/etc/cal/caldat + Unix global date files + .TP + .B calcol + .TP +-.B /usr/lib/calcol ++.B %%PREFIX%%/etc/cal/calcol + Unix global color files + .TP + .B ~/.dates Copied: head/deskutils/cal/files/patch-cal.c (from r363137, head/deskutils/cal/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/cal/files/patch-cal.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/cal/files/patch-ab) @@ -0,0 +1,38 @@ +*** cal.c.orig Fri Jul 12 04:36:33 1996 +--- cal.c Mon May 12 15:23:51 1997 +*************** +*** 130,135 **** +--- 130,139 ---- + /* Note: Other unix systems may require this next re-define to work. */ + /* I believe that SCO is one such system. Please send in any fixes */ + /* needed to get your system running. */ ++ #ifdef __FreeBSD__ /* Make FreeBSD compatible with stricmp() */ ++ #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */ ++ #endif ++ + #ifdef __linux__ /* Make linux compatible with stricmp() */ + #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */ + #endif +*************** +*** 1401,1408 **** + strcpy(str, "."); + strcpy(str, file); + if ((fp = fopen(str, mode)) == NULL) { +! /* If still not found then look in a lib directory */ + strcpy(str, "/usr/lib/"); + strcat(str,file); + fp = fopen(str, mode); + } +--- 1405,1416 ---- + strcpy(str, "."); + strcpy(str, file); + if ((fp = fopen(str, mode)) == NULL) { +! /* If still not found then look in config directory */ +! #ifdef PREFIX +! strcpy(str, PREFIX "/etc/cal/"); +! #else + strcpy(str, "/usr/lib/"); ++ #endif + strcat(str,file); + fp = fopen(str, mode); + } Copied: head/deskutils/cal/files/patch-makefile.unx (from r363137, head/deskutils/cal/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/cal/files/patch-makefile.unx Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/cal/files/patch-aa) @@ -0,0 +1,17 @@ +--- makefile.unx.orig 1996-03-05 06:36:27.000000000 +0900 ++++ makefile.unx 2013-10-19 20:15:02.149614385 +0900 +@@ -7,9 +7,13 @@ + # To use, enter "make -f makefile.unx" + + RM=rm -f +-CC=gcc ++CC=cc + CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER + ++.ifdef PREFIX ++CFLAGS+=-DPREFIX="\"${PREFIX}\"" ++.endif ++ + BINDIR=/usr/bin + MANDIR=/usr/man + Copied: head/deskutils/gaddr/files/patch-Makefile.in (from r363137, head/deskutils/gaddr/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gaddr/files/patch-Makefile.in Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/gaddr/files/patch-ab) @@ -0,0 +1,17 @@ +--- Makefile.in.orig Sun Aug 8 11:12:01 1999 ++++ Makefile.in Sun Aug 8 11:14:15 1999 +@@ -1,7 +1,7 @@ + # Makefile for gaddr + # Cory Lueninghoener 1999 (cluenin1@bigred.unl.edu) + +-CC=gcc ++CC?=gcc + #CC=cc + #DEBUG=--debug + +@@ -28,4 +28,4 @@ + rm -f gaddr + + install: gaddr +- cp gaddr /usr/X11R6/bin/gaddr ++ ${BSD_INSTALL_PROGRAM} gaddr ${PREFIX}/bin Copied: head/deskutils/gaddr/files/patch-db.c (from r363137, head/deskutils/gaddr/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/gaddr/files/patch-db.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/gaddr/files/patch-aa) @@ -0,0 +1,11 @@ +--- db.c.orig Sun Aug 8 10:58:13 1999 ++++ db.c Sun Aug 8 10:58:27 1999 +@@ -19,7 +19,7 @@ + + #include <stdio.h> + #include <string.h> +-#include <malloc.h> ++#include <stdlib.h> + #include "db.h" + + /* Definition of a record in linked list Copied: head/deskutils/ical/files/cal_tcl.C (from r363137, head/deskutils/ical/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/cal_tcl.C Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-aa) @@ -0,0 +1,87 @@ +--- cal_tcl.C.orig Sun Nov 28 17:29:13 1999 ++++ cal_tcl.C Sun Nov 28 17:30:24 1999 +@@ -214,27 +214,27 @@ static int cal_loopf (ClientData, Tcl_In + static int cal_loopb (ClientData, Tcl_Interp*, int, char*[]); + + static Dispatch_Entry calendar_dispatch[] = { +- { "delete", 0, 0, cal_delete }, +- { "main", 0, 0, cal_main }, +- { "include", 1, 1, cal_include }, +- { "exclude", 1, 1, cal_exclude }, +- { "forincludes", 2, 2, cal_forincs }, +- { "add", 1, 2, cal_add }, +- { "remove", 1, 1, cal_remove }, +- { "hide", 1, 1, cal_hide }, +- { "readonly", 0, 1, cal_ronly }, +- { "dirty", 0, 1, cal_dirty }, +- { "stale", 0, 1, cal_stale }, +- { "save", 0, 1, cal_save }, +- { "reread", 0, 1, cal_reread }, +- { "query", 5, 7, cal_query }, +- { "listing", 5, 7, cal_listing }, +- { "loop", 2, 4, cal_loop }, +- { "incalendar", 3, 3, cal_incal }, +- { "option", 1, 4, cal_option }, +- { "delete_option", 1, 3, cal_doption }, +- { "loop_forward", 5, 7, cal_loopf }, +- { "loop_backward", 5, 7, cal_loopb }, ++ { "delete", 0, 0, (Tcl_CmdProc *)cal_delete }, ++ { "main", 0, 0, (Tcl_CmdProc *)cal_main }, ++ { "include", 1, 1, (Tcl_CmdProc *)cal_include }, ++ { "exclude", 1, 1, (Tcl_CmdProc *)cal_exclude }, ++ { "forincludes", 2, 2, (Tcl_CmdProc *)cal_forincs }, ++ { "add", 1, 2, (Tcl_CmdProc *)cal_add }, ++ { "remove", 1, 1, (Tcl_CmdProc *)cal_remove }, ++ { "hide", 1, 1, (Tcl_CmdProc *)cal_hide }, ++ { "readonly", 0, 1, (Tcl_CmdProc *)cal_ronly }, ++ { "dirty", 0, 1, (Tcl_CmdProc *)cal_dirty }, ++ { "stale", 0, 1, (Tcl_CmdProc *)cal_stale }, ++ { "save", 0, 1, (Tcl_CmdProc *)cal_save }, ++ { "reread", 0, 1, (Tcl_CmdProc *)cal_reread }, ++ { "query", 5, 7, (Tcl_CmdProc *)cal_query }, ++ { "listing", 5, 7, (Tcl_CmdProc *)cal_listing }, ++ { "loop", 2, 4, (Tcl_CmdProc *)cal_loop }, ++ { "incalendar", 3, 3, (Tcl_CmdProc *)cal_incal }, ++ { "option", 1, 4, (Tcl_CmdProc *)cal_option }, ++ { "delete_option", 1, 3, (Tcl_CmdProc *)cal_doption }, ++ { "loop_forward", 5, 7, (Tcl_CmdProc *)cal_loopf }, ++ { "loop_backward", 5, 7, (Tcl_CmdProc *)cal_loopb }, + { 0, 0, 0, 0 } + }; + +@@ -281,7 +281,7 @@ static int parse_items(Tcl_Interp* tcl, + + if ((argc >= 2) && (strcmp(argv[0], "-items") == 0)) { + int count; +- char** list; ++ CONST84 char** list; + if (Tcl_SplitList(tcl, argv[1], &count, &list) != TCL_OK) { + TCL_Error(tcl, "invalid item list"); + } +@@ -516,7 +516,7 @@ + TCL_Error(tcl, "no such calendar"); + } + +- TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? "1" : "0"); ++ TCL_Return(tcl, file->GetCalendar()->ReadOnly() ? (char *)"1" : (char *)"0"); + } + + static int cal_dirty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ +@@ -527,7 +527,7 @@ + TCL_Error(tcl, "no such calendar"); + } + +- TCL_Return(tcl, (file->IsModified() ? "1" : "0")); ++ TCL_Return(tcl, (file->IsModified() ? (char *)"1" : (char *)"0")); + } + + static int cal_stale(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ +@@ -538,7 +538,7 @@ + TCL_Error(tcl, "no such calendar"); + } + +- TCL_Return(tcl, (file->FileHasChanged() ? "1" : "0")); ++ TCL_Return(tcl, (file->FileHasChanged() ? (char *)"1" : (char *)"0")); + } + + static int cal_save(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]){ Copied: head/deskutils/ical/files/patch-Makefile.in (from r363137, head/deskutils/ical/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/patch-Makefile.in Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-ac) @@ -0,0 +1,34 @@ +--- Makefile.in.orig 1997-06-04 18:09:59.000000000 +0200 ++++ Makefile.in 2014-02-17 15:05:23.000000000 +0100 +@@ -14,10 +14,10 @@ + CONFIGURE_IN = @MFILES_IN@ + CONFFILES = $(srcdir)/configure.in + +- BINDIR = $(exec_prefix)/bin +- LIBDIR = $(prefix)/lib ++ BINDIR = $(STAGEDIR)$(exec_prefix)/bin ++ LIBDIR = $(STAGEDIR)$(prefix)/lib + ILIBDIR = $(LIBDIR)/ical/v@ICAL_VERSION@ +- MANDIR = $(prefix)/man ++ MANDIR = $(STAGEDIR)$(prefix)/man + + CC = @CC@ + CXX = @CXX@ +@@ -59,14 +59,12 @@ + # Tiny bundled executable uses shared versions of tcl/tk libraries + TINY_BLIBS = $(LIBS) + +- OPTF = -O +- +- CXXFLAGS = $(OPTF) + CXXINCS = -I. -I$(srcdir) -I$(srcdir)/calendar \ + -I$(srcdir)/types -I$(srcdir)/time \ +- $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@ ++ -I$(prefix)/include \ ++ $(X_CFLAGS) -I@TCL_INCDIR@ -I@TK_INCDIR@ \ + +- CFLAGS = $(OPTF) -I. -I$(srcdir) $(X_CFLAGS) ++ CFLAGS += -I. -I$(srcdir) $(X_CFLAGS) + + OBJS = cal_tcl.o dateeditor.o dispatch.o ical.o ical_tcl.o \ + item_tcl.o object.o time_tcl.o @LIBOBJS@ Copied: head/deskutils/ical/files/patch-calendar_Makefile.in (from r363137, head/deskutils/ical/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/patch-calendar_Makefile.in Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-ad) @@ -0,0 +1,10 @@ +--- calendar/Makefile.in.orig Sat Apr 29 15:16:46 2000 ++++ calendar/Makefile.in Sat Apr 29 15:16:54 2000 +@@ -12,7 +12,6 @@ + AR = ar + ECHO = echo + +- CXXFLAGS = -O + CXXINCS = -I.. -I$(srcdir) -I$(srcdir)/../types -I$(srcdir)/../time + + CXXOBJS = arrays.o calendar.o calfile.o dateset.o item.o\ Copied: head/deskutils/ical/files/patch-item_tcl.C (from r363137, head/deskutils/ical/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/patch-item_tcl.C Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-ab) @@ -0,0 +1,143 @@ +--- item_tcl.C.orig Sun Nov 28 17:31:26 1999 ++++ item_tcl.C Sun Nov 28 17:32:25 1999 +@@ -106,52 +106,52 @@ + static int item_mlweekday (ClientData, Tcl_Interp*, int, char*[]); + + static Dispatch_Entry item_dispatch[] = { +- { "delete", 0, 0, item_delete }, +- { "clone", 0, 0, item_clone }, ++ { "delete", 0, 0, (Tcl_CmdProc *)item_delete }, ++ { "clone", 0, 0, (Tcl_CmdProc *)item_clone }, + +- { "length", 0, 1, item_length }, +- { "starttime", 0, 1, item_startt }, +- { "alarms", 0, 1, item_alarms }, +- { "option", 1, 2, item_option }, +- { "delete_option", 1, 1, item_doption }, +- +- { "is", 1, 1, item_is }, +- { "calendar", 0, 0, item_cal }, +- { "text", 0, 1, item_text }, +- { "uid", 0, 0, item_uid }, +- { "earlywarning", 0, 1, item_early }, +- { "owner", 0, 1, item_owner }, +- { "owned", 0, 0, item_owned }, +- { "own", 0, 0, item_own }, +- { "hilite", 0, 1, item_hilite }, +- { "todo", 0, 1, item_todo }, +- { "is_done", 0, 0, item_is_done }, +- { "done", 1, 1, item_done }, +- +- { "contains", 1, 1, item_cont }, +- { "empty", 0, 0, item_empty }, +- { "repeats", 0, 0, item_repeat }, +- { "first", 0, 0, item_first }, +- { "next", 1, 1, item_next }, +- { "range", 2, 2, item_range }, +- { "type", 0, 0, item_type }, +- { "describe_repeat", 0, 0, item_desc }, +- +- { "date", 1, 1, item_date }, +- { "dayrepeat", 2, 2, item_dayr }, +- +- { "monthrepeat", 2, 2, item_monthr }, +- { "month_day", 1, 3, item_mday }, +- { "month_last_day", 1, 3, item_mlday }, +- { "month_work_day", 1, 3, item_mworkday }, +- { "month_last_work_day", 1, 3, item_mlworkday }, +- { "month_week_day", 2, 4, item_mweekday }, +- { "month_last_week_day", 2, 4, item_mlweekday }, +- +- { "weekdays", 0, -1, item_wdays }, +- { "start", 1, 1, item_start }, +- { "finish", 1, 1, item_finish }, +- { "deleteon", 1, 1, item_ondel }, ++ { "length", 0, 1, (Tcl_CmdProc *)item_length }, ++ { "starttime", 0, 1, (Tcl_CmdProc *)item_startt }, ++ { "alarms", 0, 1, (Tcl_CmdProc *)item_alarms }, ++ { "option", 1, 2, (Tcl_CmdProc *)item_option }, ++ { "delete_option", 1, 1, (Tcl_CmdProc *)item_doption }, ++ ++ { "is", 1, 1, (Tcl_CmdProc *)item_is }, ++ { "calendar", 0, 0, (Tcl_CmdProc *)item_cal }, ++ { "text", 0, 1, (Tcl_CmdProc *)item_text }, ++ { "uid", 0, 0, (Tcl_CmdProc *)item_uid }, ++ { "earlywarning", 0, 1, (Tcl_CmdProc *)item_early }, ++ { "owner", 0, 1, (Tcl_CmdProc *)item_owner }, ++ { "owned", 0, 0, (Tcl_CmdProc *)item_owned }, ++ { "own", 0, 0, (Tcl_CmdProc *)item_own }, ++ { "hilite", 0, 1, (Tcl_CmdProc *)item_hilite }, ++ { "todo", 0, 1, (Tcl_CmdProc *)item_todo }, ++ { "is_done", 0, 0, (Tcl_CmdProc *)item_is_done }, ++ { "done", 1, 1, (Tcl_CmdProc *)item_done }, ++ ++ { "contains", 1, 1, (Tcl_CmdProc *)item_cont }, ++ { "empty", 0, 0, (Tcl_CmdProc *)item_empty }, ++ { "repeats", 0, 0, (Tcl_CmdProc *)item_repeat }, ++ { "first", 0, 0, (Tcl_CmdProc *)item_first }, ++ { "next", 1, 1, (Tcl_CmdProc *)item_next }, ++ { "range", 2, 2, (Tcl_CmdProc *)item_range }, ++ { "type", 0, 0, (Tcl_CmdProc *)item_type }, ++ { "describe_repeat", 0, 0, (Tcl_CmdProc *)item_desc }, ++ ++ { "date", 1, 1, (Tcl_CmdProc *)item_date }, ++ { "dayrepeat", 2, 2, (Tcl_CmdProc *)item_dayr }, ++ ++ { "monthrepeat", 2, 2, (Tcl_CmdProc *)item_monthr }, ++ { "month_day", 1, 3, (Tcl_CmdProc *)item_mday }, ++ { "month_last_day", 1, 3, (Tcl_CmdProc *)item_mlday }, ++ { "month_work_day", 1, 3, (Tcl_CmdProc *)item_mworkday }, ++ { "month_last_work_day", 1, 3, (Tcl_CmdProc *)item_mlworkday }, ++ { "month_week_day", 2, 4, (Tcl_CmdProc *)item_mweekday }, ++ { "month_last_week_day", 2, 4, (Tcl_CmdProc *)item_mlweekday }, ++ ++ { "weekdays", 0, -1, (Tcl_CmdProc *)item_wdays }, ++ { "start", 1, 1, (Tcl_CmdProc *)item_start }, ++ { "finish", 1, 1, (Tcl_CmdProc *)item_finish }, ++ { "deleteon", 1, 1, (Tcl_CmdProc *)item_ondel }, + + { 0, 0, 0, 0 } + }; ++++ item_tcl.C Sun Nov 28 17:32:25 1999 +@@ -329,7 +329,7 @@ + + static int item_owned(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { + Item_Tcl* item = (Item_Tcl*) c; +- TCL_Return(tcl, (item->value()->IsMine() ? "1" : "0")); ++ TCL_Return(tcl, (item->value()->IsMine() ? (char *)"1" : (char *)"0")); + } + + static int item_own(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { +@@ -431,7 +431,7 @@ static int item_alarms(ClientData c, Tcl + } + + int count; +- char** list; ++ CONST84 char** list; + if (Tcl_SplitList(tcl, argv[0], &count, &list) != TCL_OK) { + TCL_Error(tcl, "invalid alarm list"); + } +@@ -492,12 +492,12 @@ + + static int item_empty(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { + Item_Tcl* item = (Item_Tcl*) c; +- TCL_Return(tcl, (item->value()->empty()?"1":"0")); ++ TCL_Return(tcl, (item->value()->empty() ? (char *)"1" : (char *)"0")); + } + + static int item_repeat(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { + Item_Tcl* item = (Item_Tcl*) c; +- TCL_Return(tcl,(item->value()->repeats()?"1":"0")); ++ TCL_Return(tcl,(item->value()->repeats() ? (char *)"1" : (char *)"0")); + } + + static int item_first(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { +@@ -576,7 +576,7 @@ + TCL_Error(tcl, "invalid date"); + } + Date date(dateDays); +- TCL_Return(tcl, (item->value()->contains(date)?"1":"0")); ++ TCL_Return(tcl, (item->value()->contains(date) ? (char *)"1" : (char *)"0")); + } + + static int item_next(ClientData c, Tcl_Interp* tcl, int argc, char* argv[]) { Copied: head/deskutils/ical/files/patch-time_Makefile.in (from r363137, head/deskutils/ical/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/patch-time_Makefile.in Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-ae) @@ -0,0 +1,10 @@ +--- time/Makefile.in.orig Sat Apr 29 15:17:20 2000 ++++ time/Makefile.in Sat Apr 29 15:17:25 2000 +@@ -11,7 +11,6 @@ + ECHO = echo + RANLIB = @RANLIB@ + +- CXXFLAGS = -O + CXXINCS = -I.. -I$(srcdir) + OBJS = Date.o Month.o Time.o WeekDay.o Year.o parse.o + TESTS = testparse Copied: head/deskutils/ical/files/patch-types_Makefile.in (from r363137, head/deskutils/ical/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/ical/files/patch-types_Makefile.in Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/ical/files/patch-af) @@ -0,0 +1,11 @@ +--- types/Makefile.in.orig Sat Apr 29 15:17:47 2000 ++++ types/Makefile.in Sat Apr 29 15:17:56 2000 +@@ -12,7 +12,7 @@ + ECHO = echo + RANLIB = @RANLIB@ + +- CXXFLAGS = -O $(DEFS) ++ CXXFLAGS = $(DEFS) + CXXINCS = -I$(srcdir) + OBJS = bitvec.o hashfuncs.o intset.o + TESTS = testarray testbv testomap testoset timemap testhash testmap\ Copied: head/deskutils/xcalendar/files/patch-XCal-uj.sed (from r363137, head/deskutils/xcalendar/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xcalendar/files/patch-XCal-uj.sed Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xcalendar/files/patch-ac) @@ -0,0 +1,160 @@ +--- XCal-uj.sed.orig Sun Oct 1 14:31:06 1995 ++++ XCal-uj.sed Sat Nov 22 00:58:44 2003 +@@ -3,7 +3,9 @@ + *showGrip: False + *calendar*internalBorderWidth: 0 + *input: True +-*resize: False ++*controls*resize: False ++*bcontrols*resize: False ++*daybuttons*resize: False + *resizable: True + *title: XCalendar v.4.0 + *dayEditor.title: Day Editor +@@ -21,8 +23,8 @@ + *succ*Label: 来月 + *prevday*Label: 昨日 + *succday*Label: 明日 +-*helpButton*label: 助け +-*quitButton*label: 終り ++*helpButton*Label: 助け ++*quitButton*Label: 終り + + *daynames.SUN.label: \ 日 + *daynames.MON.label: \ 月 +@@ -32,20 +34,12 @@ + *daynames.FRI.label: \ 金 + *daynames.SAT.label: \ 土 + +-*prev*labelString: 先月 +-*succ*labelString: 来月 +-*prevday*labelString: 昨日 +-*succday*labelString: 明日 +-*helpButton*labelString: 助け +-*quitButton*labelString: 終り +- +-*daynames.SUN.labelString: \ 日 +-*daynames.MON.labelString: \ 月 +-*daynames.TUE.labelString: \ 火 +-*daynames.WED.labelString: \ 水 +-*daynames.THU.labelString: \ 木 +-*daynames.FRI.labelString: \ 金 +-*daynames.SAT.labelString: \ 土 ++*monthnames: 1/2/3/4/5/6/7/8/9/10/11/12 ++*monthnms: 1/2/3/4/5/6/7/8/9/10/11/12 ++*daynames: 日曜日/月曜日/火曜日/水曜日/木曜日/金曜日/土曜日 ++*daynms: 日/月/火/水/木/金/土 ++*date: %M月%d日(%W) ++ + + #ifdef COLOR + ! colors +@@ -70,11 +64,12 @@ + *editorControls*Background: lightgray + *editorControls*Command.Background: slategray + *editorControls*Command.Foreground: White ++*editorControls*XmPushButton.Background: slategray ++*editorControls*XmPushButton.Foreground: White + #endif + + *setMarkBackground: True + *markOnStartup: True +-! + *markCurrent: True + *currentForeground: Blue + *markHoliday: True +@@ -88,57 +83,38 @@ + *prev*vertDistance: 0 + *succ*vertDistance: 0 + +-*controls*date*fontSet: 8x13bold +-*daynames*fontSet: -*--14-* +-*dayEditor*editorTitle*fontSet: 8x13bold +-*helpWindow*editorTitle*fontSet: 8x13bold ++*controls*date*fontSet: 8x13bold, -*-r-*--14-* ++*daynames*fontSet: -*-r-*--14-* ++*dayEditor*editorTitle*fontSet: 8x13bold, -*-r-*--14-* ++*helpWindow*editorTitle*fontSet: 8x13bold, -*-r-*--14-* + + *helpButton*vertDistance: 5 + *quitButton*vertDistance: 5 + *editorTitle*vertDistance: 5 +-*cdate*vertDistance: 0 ++*cdate*vertDistance: 5 + + *editorControls*doneButton*label: 終り + *editorControls*saveButton*label: 保存 + *editorControls*clearEntry*label: 消えてなくなれ +-*editorControls*doneButton*labelString: 終り +-*editorControls*saveButton*labelString: 保存 +-*editorControls*clearEntry*labelString: 消えてなくなれ ++*doneButton*labelString: 終り ++*saveButton*labelString: 保存 ++*clearEntry*labelString: 消えてなくなれ + + *dayEditor*geometry: 300x150 + *helpWindow*geometry: 600x350 + +-*doneButton*Label: done +-*editorTitle*Label: Help +-*saveButton*Label: save +- +-*bcontrols*borderWidth: 0 +-*prev*highlightThickness: 0 +-*succ*highlightThickness: 0 +- +-*prevday*highlightThickness: 0 +-*succday*highlightThickness: 0 +-*daybuttons*borderWidth: 0 ++*dayEditor*fontSet: -*-r-*--14-* ++*controls*fontSet: -*-r-*--14-* ++*bcontrols*fontSet: -*-r-*--14-* ++*editorControls*fontSet: -*-r-*--14-* ++*fontSet: -*-r-*--14-* + +-*Scrollbar.borderWidth: 1 +-*editor.scrollVertical: whenNeeded +-! *scrollHorizontal: False +-! *helpWindow*scrollHorizontal: True +-*holiday*cursorPositionVisible: False +-*holiday*displayCaret: False +-*helpWindow*cursorPositionVisible: False +-*helpWindow*displayCaret: False +- +- +-*dayEditor*fontSet: -*--14-* +-*controls*fontSet: -*--14-* +-*bcontrols*fontSet: -*--14-* +-*editorControls*fontSet: -*--14-* +-*fontSet: -*--14-* + !*preeditType: Root + !*preeditType: OffTheSpot + *preeditType: OverTheSpot + ++*helpWindow*editorTitle*label: ヘルプ ++*helpWindow*editorTitle*labelString: ヘルプ + *helpWindow*rows: 15 + *helpWindow*columns: 80 + *rows:7 +@@ -149,11 +125,18 @@ + *helpWindow*Paned*editor.width: 600 + *helpWindow*Paned*editor.height: 350 + ++*bcontrols*borderWidth: 0 ++*prev*highlightThickness: 0 ++*succ*highlightThickness: 0 ++ ++*prevday*highlightThickness: 0 ++*succday*highlightThickness: 0 ++*daybuttons*borderWidth: 0 + + *Scrollbar.borderWidth: 1 +-*Text*scrollVertical: whenNeeded +-*scrollHorizontal: False +-*helpWindow*scrollHorizontal: True ++*Text*scrollVertical: always ++*scrollHorizontal: Never ++*helpWindow*scrollHorizontal: Always + *holiday*cursorPositionVisible: False + *holiday*displayCaret: False + *helpWindow*cursorPositionVisible: False Copied: head/deskutils/xcalendar/files/patch-XCalendar.sed (from r363137, head/deskutils/xcalendar/files/patch-af) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xcalendar/files/patch-XCalendar.sed Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xcalendar/files/patch-af) @@ -0,0 +1,26 @@ +--- XCalendar.sed.orig Tue Jul 4 06:59:01 1995 ++++ XCalendar.sed Sat Nov 22 03:05:34 2003 +@@ -2,7 +2,9 @@ + *showGrip: False + *calendar*internalBorderWidth: 0 + *input: True +-*resize: False ++*controls*resize: False ++*bcontrols*resize: False ++*daybuttons*resize: False + *resizable: True + *title: XCalendar v.4.0 + *dayEditor.title: Day Editor +@@ -119,9 +121,9 @@ + *daybuttons*borderWidth: 0 + + *Scrollbar.borderWidth: 1 +-*Text*scrollVertical: whenNeeded +-*scrollHorizontal: False +-*helpWindow*scrollHorizontal: True ++*Text*scrollVertical: Always ++*scrollHorizontal: Never ++*helpWindow*scrollHorizontal: Always + *holiday*cursorPositionVisible: False + *holiday*displayCaret: False + *helpWindow*cursorPositionVisible: False Copied: head/deskutils/xcalendar/files/patch-dayeditor.c (from r363137, head/deskutils/xcalendar/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xcalendar/files/patch-dayeditor.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xcalendar/files/patch-ab) @@ -0,0 +1,20 @@ +--- dayeditor.c.orig Sun Oct 1 13:54:55 1995 ++++ dayeditor.c Mon Mar 12 20:55:07 2001 +@@ -236,7 +236,7 @@ + { + char *getenv(); + DIR *dirp; +-#if defined (SYSV) || defined(__osf__) || defined(SVR4) ++#if defined (SYSV) || defined(__osf__) || defined(SVR4) || defined(HAVE_DIRENT_H) + struct dirent *dp; + #else + struct direct *dp; +@@ -1068,7 +1068,7 @@ + XawTextSetSource(editor->holiday, + #ifdef XI18N + (XtIsSubclass(old, multiSrcObjectClass) ? +- XtCreateWidget("holSource", asciiSrcObjectClass, ++ XtCreateWidget("holSource", multiSrcObjectClass, + editor->holiday, args, n) : + XtCreateWidget("holSource", asciiSrcObjectClass, + editor->holiday, args, n) ), Copied: head/deskutils/xcalendar/files/patch-xcalendar.c (from r363137, head/deskutils/xcalendar/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xcalendar/files/patch-xcalendar.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xcalendar/files/patch-aa) @@ -0,0 +1,41 @@ +--- xcalendar.c.dist Tue Jul 4 06:59:01 1995 ++++ xcalendar.c Mon Mar 12 20:53:10 2001 +@@ -1091,10 +1091,10 @@ + struct tm * + gettime() + { +- struct timeval t; ++ time_t now; + +- gettimeofday(&t, NULL); +- today = localtime(&t.tv_sec); ++ (void) time(&now); ++ today = localtime(&now); + return today; + } + +@@ -1827,8 +1827,8 @@ + *sb++ = '1', *sb++ = '9'; + /* fall thru */ + case 'y': +- *sb++ = tm.tm_year / 10 + '0'; +- *sb++ = tm.tm_year % 10 + '0'; ++ *sb++ = (tm.tm_year%100) / 10 + '0'; ++ *sb++ = (tm.tm_year%100) % 10 + '0'; + break; + case '%': + *sb++ = *p; +@@ -1869,6 +1869,13 @@ + if (len == -1) + return; + } ++ ++ /* terminate `buf' with NULL */ ++ if (sizeof(buf) == len) { ++ buf = XtRealloc(buf, len + 1); ++ } ++ buf[len] = NULL; ++ + start = buf; + + while (len > 0) { Copied: head/deskutils/xcalendar/files/patch-xcalendar.h (from r363137, head/deskutils/xcalendar/files/patch-ag) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xcalendar/files/patch-xcalendar.h Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xcalendar/files/patch-ag) @@ -0,0 +1,11 @@ +--- xcalendar.h.orig Sun Oct 1 12:21:42 1995 ++++ xcalendar.h Mon Mar 12 20:54:02 2001 +@@ -75,7 +75,7 @@ + #include <X11/Xaw/Xawi18n.h> + #endif + +-#if defined(SYSV) || defined(__osf__) || defined(SVR4) ++#if defined(SYSV) || defined(__osf__) || defined(SVR4) || defined(HAVE_DIRENT_H) + #include <dirent.h> + #else + #include <sys/dir.h> Copied: head/deskutils/xmaddressbook/files/patch-Imakefile (from r363137, head/deskutils/xmaddressbook/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xmaddressbook/files/patch-Imakefile Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xmaddressbook/files/patch-aa) @@ -0,0 +1,27 @@ +*** Imakefile.orig Fri Jul 21 00:17:40 1995 +--- Imakefile Tue Nov 19 17:22:06 1996 +*************** +*** 16,26 **** + OBJS = file.o general.o help.o list.o main.o menu.o print.o quit.o search.o error_msg.o duplicate.o namelist.o goto.o card.o curses.o mail.o preferences.o + SRCS = file.c general.c help.c list.c main.c menu.c print.c quit.c search.c error_msg.c duplicate.c namelist.c goto.c card.c curses.c mail.c preferences.c + + LOCAL_LIBRARIES = $(MOTIFLIB) -lXm -lXt -lX11 +- +- /* uncomment this if you are using X11R6 +- LOCAL_LIBRARIES = $(MOTIFLIB) -lXm -lXt -lX11 -lICE -lXi -lSM -loldX -lXext + */ + + + ComplexProgramTarget(xmaddressbook) +--- 16,26 ---- + OBJS = file.o general.o help.o list.o main.o menu.o print.o quit.o search.o error_msg.o duplicate.o namelist.o goto.o card.o curses.o mail.o preferences.o + SRCS = file.c general.c help.c list.c main.c menu.c print.c quit.c search.c error_msg.c duplicate.c namelist.c goto.c card.c curses.c mail.c preferences.c + ++ /* uncomment this if you are using < X11R6 + LOCAL_LIBRARIES = $(MOTIFLIB) -lXm -lXt -lX11 + */ ++ ++ LOCAL_LIBRARIES = $(MOTIFLIB) -lXt -lX11 -lICE -lXi -lSM -loldX -lXext + + + ComplexProgramTarget(xmaddressbook) Copied: head/deskutils/xmdiary/files/patch-XDiary.tmpl (from r363137, head/deskutils/xmdiary/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xmdiary/files/patch-XDiary.tmpl Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xmdiary/files/patch-ab) @@ -0,0 +1,41 @@ +--- XDiary.tmpl.orig Mon Jun 26 12:57:52 1995 ++++ XDiary.tmpl Fri Apr 23 20:01:39 1999 +@@ -37,7 +37,7 @@ + -- + -----------------------------------------------------------------------------*/ + +-XMLIB = -lXm ++XMLIB = ${MOTIFLIB} + XTLIB = -lXt + XLIB = -lX11 + +@@ -98,10 +98,10 @@ + -- + -----------------------------------------------------------------------------*/ + +-XDEXEDIR = /usr/local/bin +-XDDATADIR = /usr/local/lib/xdiary +-XDAPPDIR = /usr/lib/X11/app-defaults +-XDMANDIR = /usr/local/man/man1 ++XDEXEDIR = $(LOCALBASE)/bin ++XDDATADIR = $(LOCALBASE)/lib/X11/xdiary ++XDAPPDIR = $(LOCALBASE)/lib/X11/app-defaults ++XDMANDIR = $(LOCALBASE)/man/man1 + + + /*---------------------------------------------------------------------------- +@@ -126,10 +126,10 @@ + -- + -----------------------------------------------------------------------------*/ + +-/* XDXTINC = */ +-/* XDXTLIB = */ +-/* XDXMINC = */ +-/* XDXMLIB = */ ++XDXTINC = -I/usr/X11R6/include ++XDXTLIB = -L/usr/X11R6/lib ++XDXMINC = -I/usr/X11R6/include ++XDXMLIB = -L/usr/X11R6/lib + + + /*---------------------------------------------------------------------------- Copied and modified: head/deskutils/xmdiary/files/patch-dtools_xtmEditAclUx.c (from r363137, head/deskutils/xmdiary/files/patch-ac) ============================================================================== --- head/deskutils/xmdiary/files/patch-ac Mon Jul 28 12:41:48 2014 (r363137, copy source) +++ head/deskutils/xmdiary/files/patch-dtools_xtmEditAclUx.c Mon Jul 28 16:03:51 2014 (r363194) @@ -4,8 +4,3 @@ +#include <sys/types.h> #include <grp.h> ---- xdremove/xtmRemove.c Sun May 4 18:02:15 1997 -+++ xdremove/xtmRemove.c Mon Jul 23 20:53:07 2001 -@@ -293 +293 @@ -- gets( buffer ); -+ fgets(buffer, sizeof(buffer), stdin); Copied: head/deskutils/xmdiary/files/patch-ndbm_xdndbm.c (from r363137, head/deskutils/xmdiary/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xmdiary/files/patch-ndbm_xdndbm.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xmdiary/files/patch-aa) @@ -0,0 +1,13 @@ +--- ndbm/xdndbm.c.orig Tue Jun 27 03:55:51 1995 ++++ ndbm/xdndbm.c Mon Sep 29 01:53:52 1997 +@@ -50,8 +50,10 @@ + static int delitem(); + static int additem(); + ++#ifndef __FreeBSD__ + extern int errno; + extern long lseek(); ++#endif + + #ifdef DEBUG + static chkblk(char buf[PBLKSIZ]); Copied and modified: head/deskutils/xmdiary/files/patch-xdremove_xtmRemove (from r363137, head/deskutils/xmdiary/files/patch-ac) ============================================================================== --- head/deskutils/xmdiary/files/patch-ac Mon Jul 28 12:41:48 2014 (r363137, copy source) +++ head/deskutils/xmdiary/files/patch-xdremove_xtmRemove Mon Jul 28 16:03:51 2014 (r363194) @@ -1,9 +1,3 @@ ---- dtools/xtmEditAclUx.c Sun May 4 18:25:10 1997 -+++ dtools/xtmEditAclUx.c Mon Jul 23 20:34:40 2001 -@@ -37,2 +37,3 @@ - -+#include <sys/types.h> - #include <grp.h> --- xdremove/xtmRemove.c Sun May 4 18:02:15 1997 +++ xdremove/xtmRemove.c Mon Jul 23 20:53:07 2001 @@ -293 +293 @@ Copied and modified: head/deskutils/xpostit/files/patch-plaid.c (from r363137, head/deskutils/xpostit/files/patch-aa) ============================================================================== --- head/deskutils/xpostit/files/patch-aa Mon Jul 28 12:41:48 2014 (r363137, copy source) +++ head/deskutils/xpostit/files/patch-plaid.c Mon Jul 28 16:03:51 2014 (r363194) @@ -38,13 +38,3 @@ XtSetValues(plaidwidget, args, nargs); } ---- ./xpostit.c.org Thu Dec 10 08:40:27 1992 -+++ ./xpostit.c Thu Oct 31 21:31:14 1996 -@@ -121,7 +121,6 @@ - { - Arg args[4]; - char *appname; -- char *rindex(); - Atom protos[2]; - register int nargs; - Boolean setsigs = False; Copied and modified: head/deskutils/xpostit/files/patch-xpostit.c (from r363137, head/deskutils/xpostit/files/patch-aa) ============================================================================== --- head/deskutils/xpostit/files/patch-aa Mon Jul 28 12:41:48 2014 (r363137, copy source) +++ head/deskutils/xpostit/files/patch-xpostit.c Mon Jul 28 16:03:51 2014 (r363194) @@ -1,43 +1,3 @@ ---- plaid.c.orig Thu Dec 10 17:40:26 1992 -+++ plaid.c Mon May 6 13:23:17 1996 -@@ -60,6 +60,7 @@ - { - Arg args[4]; - register int nargs; -+ Dimension width, height; - - /* - * Create the plaid widget. -@@ -78,20 +79,22 @@ - * Get the width and height of the widget. - */ - nargs = 0; -- SetArg(XtNwidth, NULL); -- SetArg(XtNheight, NULL); -+ SetArg(XtNwidth, &width); -+ SetArg(XtNheight, &height); - XtGetValues(plaidwidget, args, nargs); - - /* - * If the user didn't set them, then we - * should set them to the defaults. - */ -- if ((args[0].value == 0) || (args[1].value == 0)) { -- if (args[0].value == 0) -- XtSetArg(args[0], XtNwidth, DefaultPlaidWidth); -+ if (width == 0 || height == 0) { -+ nargs = 0; - -- if (args[1].value == 0) -- XtSetArg(args[1], XtNheight, DefaultPlaidHeight); -+ if (width == 0) -+ SetArg(XtNwidth, DefaultPlaidWidth); -+ -+ if (height == 0) -+ SetArg(XtNheight, DefaultPlaidHeight); - - XtSetValues(plaidwidget, args, nargs); - } --- ./xpostit.c.org Thu Dec 10 08:40:27 1992 +++ ./xpostit.c Thu Oct 31 21:31:14 1996 @@ -121,7 +121,6 @@ Copied: head/deskutils/xpostitPlus/files/patch-Imakefile (from r363137, head/deskutils/xpostitPlus/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xpostitPlus/files/patch-Imakefile Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xpostitPlus/files/patch-aa) @@ -0,0 +1,19 @@ +--- Imakefile.orig Fri Sep 26 12:06:02 1997 ++++ Imakefile Fri Sep 26 12:30:24 1997 +@@ -25,4 +25,4 @@ + +-BINDIR=bin-d +-MANDIR=man-d ++XCOMM BINDIR=bin-d ++XCOMM MANDIR=man-d + +@@ -37,3 +37,3 @@ + XCOMM for debugging purposes +-DEFINES = -g -Wall ++DEFINES = -Wall + +@@ -44,3 +44,3 @@ + XCOMM notes if you haven't specified to save-on-exit on the command line. +-XCOMM DEFINES = -DPROMPT_FOR_SAVE ++DEFINES = -DPROMPT_FOR_SAVE + Copied: head/deskutils/xrolo/files/patch-Imakefile (from r363137, head/deskutils/xrolo/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xrolo/files/patch-Imakefile Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xrolo/files/patch-aa) @@ -0,0 +1,65 @@ +*** Imakefile.orig Tue Dec 3 23:29:46 1991 +--- Imakefile Sat Jan 9 23:01:51 1999 +*************** +*** 9,15 **** + # patching ol_button.c. see README for details. + # LOCAL_LIBRARIES = -lxview -lolgx + +! CDEBUGFLAGS = -g + SRCS = main.c panel.c cards.c popup.c send_mail.c soundex.c phone.c + OBJS = main.o panel.o cards.o popup.o send_mail.o soundex.o phone.o + INCLUDES = -I$$OPENWINHOME/include +--- 9,15 ---- + # patching ol_button.c. see README for details. + # LOCAL_LIBRARIES = -lxview -lolgx + +! # CDEBUGFLAGS = -g + SRCS = main.c panel.c cards.c popup.c send_mail.c soundex.c phone.c + OBJS = main.o panel.o cards.o popup.o send_mail.o soundex.o phone.o + INCLUDES = -I$$OPENWINHOME/include +*************** +*** 24,35 **** + # in DEFINES if your system is not a sparcstation w/ installed + # sound libraries. + +! MAILER = /bin/mail + VERSION = 2.0 +! SOUNDS = /usr/local/lib/sounds # or /usr/demo/SOUNDS/sounds + DEFINES = -DSTANDALONE -DMAILER=\"$(MAILER)\" -DVERSION=\"$(VERSION)\" \ + # -Wf,-XNl4096 # -DSOUNDS=\"$(SOUNDS)\" # -DOL + + # + # comment this out if you do not have SOUNDS defined above + #AUDIOLIB = -laudio -lm +--- 24,37 ---- + # in DEFINES if your system is not a sparcstation w/ installed + # sound libraries. + +! MAILER = /usr/bin/mail + VERSION = 2.0 +! SOUNDS = /usr/local/share/sounds # or /usr/demo/SOUNDS/sounds + DEFINES = -DSTANDALONE -DMAILER=\"$(MAILER)\" -DVERSION=\"$(VERSION)\" \ ++ -DDONT_USE_MALLOC_LIST + # -Wf,-XNl4096 # -DSOUNDS=\"$(SOUNDS)\" # -DOL + ++ + # + # comment this out if you do not have SOUNDS defined above + #AUDIOLIB = -laudio -lm +*************** +*** 38,44 **** + # linking against openlook libraries on suns after patching ol_button.c. + # see README for details. + #LOCAL_LIBRARIES = -L$$OPENWINHOME/lib -lxview -Bstatic -lolgx -Bdynamic $(AUDIOLIB) +! LOCAL_LIBRARIES = -L$$OPENWINHOME/lib -lxview -lolgx $(AUDIOLIB) + AllTarget(xrolo) + NormalProgramTarget(xrolo,$(OBJS),$(DEPLIBS), $(LOCAL_LIBRARIES), $(XLIB)) + InstallProgram(xrolo, $(BINDIR)) +--- 40,46 ---- + # linking against openlook libraries on suns after patching ol_button.c. + # see README for details. + #LOCAL_LIBRARIES = -L$$OPENWINHOME/lib -lxview -Bstatic -lolgx -Bdynamic $(AUDIOLIB) +! LOCAL_LIBRARIES = -L$$OPENWINHOME/lib -lxview -lolgx $(AUDIOLIB) -lgnuregex + AllTarget(xrolo) + NormalProgramTarget(xrolo,$(OBJS),$(DEPLIBS), $(LOCAL_LIBRARIES), $(XLIB)) + InstallProgram(xrolo, $(BINDIR)) Copied: head/deskutils/xrolo/files/patch-cards.c (from r363137, head/deskutils/xrolo/files/patch-ae) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/xrolo/files/patch-cards.c Mon Jul 28 16:03:51 2014 (r363194, copy of r363137, head/deskutils/xrolo/files/patch-ae) @@ -0,0 +1,89 @@ +*** cards.c.orig Tue Dec 3 23:33:56 1991 +--- cards.c Sat Oct 1 20:07:14 2005 +*************** +*** 36,47 **** + */ + + + + #include <stdio.h> + #include <xview/xview.h> + #include <sys/file.h> + #include <ctype.h> +! #if !defined(sgi) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281603.s6SG3qxq041847>