Received: by mail.netbsd.org (Postfix, from userid 605) id 0B6A284EEF; Wed, 8 Mar 2023 21:46:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3C5B484EEA for ; Wed, 8 Mar 2023 21:46:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id W_n8-NH8Wdej for ; Wed, 8 Mar 2023 21:46:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 50F7F84D14 for ; Wed, 8 Mar 2023 21:46:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A458FA90; Wed, 8 Mar 2023 21:46:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_167831200445280" MIME-Version: 1.0 Date: Wed, 8 Mar 2023 21:46:44 +0000 From: "Paolo Vincenzo Olivo" Subject: CVS commit: pkgsrc/devel/mgdiff To: pkgsrc-changes@NetBSD.org Reply-To: vins@netbsd.org X-Mailer: log_accum Message-Id: <20230308214644.4A458FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_167831200445280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: vins Date: Wed Mar 8 21:46:44 UTC 2023 Modified Files: pkgsrc/devel/mgdiff: distinfo pkgsrc/devel/mgdiff/patches: patch-files.c Log Message: mgdiff: include types.h for caddr_t. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/mgdiff/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/mgdiff/patches/patch-files.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_167831200445280 Content-Disposition: inline Content-Length: 7496 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/mgdiff/distinfo diff -u pkgsrc/devel/mgdiff/distinfo:1.4 pkgsrc/devel/mgdiff/distinfo:1.5 --- pkgsrc/devel/mgdiff/distinfo:1.4 Thu Mar 2 08:15:32 2023 +++ pkgsrc/devel/mgdiff/distinfo Wed Mar 8 21:46:44 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2023/03/02 08:15:32 vins Exp $ +$NetBSD: distinfo,v 1.5 2023/03/08 21:46:44 vins Exp $ BLAKE2s (mgdiff-1.0.1/mgdiff.tar.gz) = 7c90e00f9646d41e5e822055340fa41440acaa5ec0352606ccec1e14b43188de SHA512 (mgdiff-1.0.1/mgdiff.tar.gz) = bf5ab4b2a9d42ff2edb73a6dda68a4d17d88f61c63f5ec8366cc49d372a56f3c6812d473a95d86bcb61680d1f91ce4ab7ad87a26748b45e2edd27b73044492a5 @@ -6,7 +6,7 @@ Size (mgdiff-1.0.1/mgdiff.tar.gz) = 4118 SHA1 (patch-Imakefile) = 7c95728d50c4d835ceb330124eccce166c9e2845 SHA1 (patch-Mgdiff.ad) = 1a3eade787f06b02c36bdc925a65ee0562f4d9f5 SHA1 (patch-externs.h) = 8e536067c9834b8ef26a0210aaf8ece31004f310 -SHA1 (patch-files.c) = fa06ab3916e0d0a95551bea5e3320c9e577b3d7a +SHA1 (patch-files.c) = 671cfd617d700e92d663e42834bc2c6d0dc1967e SHA1 (patch-legend.c) = 8933bc2938f94bc7c0c11009074517f017d4f8ee SHA1 (patch-manual.c) = 2f430240696d6eec22d5dd576c4577e5b7b4578d SHA1 (patch-mgdiff.c) = 773c0a4c1a10194fdc44da401c1eb40cae1233fc Index: pkgsrc/devel/mgdiff/patches/patch-files.c diff -u pkgsrc/devel/mgdiff/patches/patch-files.c:1.1 pkgsrc/devel/mgdiff/patches/patch-files.c:1.2 --- pkgsrc/devel/mgdiff/patches/patch-files.c:1.1 Wed Mar 1 23:48:00 2023 +++ pkgsrc/devel/mgdiff/patches/patch-files.c Wed Mar 8 21:46:44 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-files.c,v 1.1 2023/03/01 23:48:00 vins Exp $ +$NetBSD: patch-files.c,v 1.2 2023/03/08 21:46:44 vins Exp $ Pull patches from Debian. @@ -17,7 +17,15 @@ Pull patches from Debian. * * The X Consortium, and any party obtaining a copy of these files from * the X Consortium, directly or indirectly, is granted, free of charge, -@@ -83,16 +84,18 @@ static void popup_cb (Widget w, XtPointe +@@ -36,6 +37,7 @@ static char rcsid[] = "files.c,v 2.0 199 + #include + #include + #include ++#include + #include + #include + +@@ -83,16 +85,18 @@ static void popup_cb (Widget w, XtPointe */ static int is_ascii_text (char *filename) { @@ -39,7 +47,7 @@ Pull patches from Debian. return (1); } -@@ -143,12 +146,13 @@ void werror (Widget parent, char *title, +@@ -143,12 +147,13 @@ void werror (Widget parent, char *title, XmString xms; Arg args[2]; @@ -55,7 +63,7 @@ Pull patches from Debian. XtVaSetValues (XtParent (dialog), XtNtitle, title, NULL); XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_CANCEL_BUTTON)); -@@ -174,8 +178,10 @@ void werror_long (Widget parent, char *t +@@ -174,8 +179,10 @@ void werror_long (Widget parent, char *t xms1 = xms4; else { xms2 = XmStringConcat (xms1, xms4); @@ -68,7 +76,7 @@ Pull patches from Debian. xms1 = xms2; } -@@ -183,16 +189,19 @@ void werror_long (Widget parent, char *t +@@ -183,16 +190,19 @@ void werror_long (Widget parent, char *t XmString xms3; xms3 = XmStringConcat (xms1, sep); @@ -91,7 +99,7 @@ Pull patches from Debian. XtVaSetValues (XtParent (dialog), XtNtitle, title, NULL); XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_CANCEL_BUTTON)); XtUnmanageChild (XmMessageBoxGetChild (dialog, XmDIALOG_HELP_BUTTON)); -@@ -318,7 +327,7 @@ void open_both_files (Widget parent, cha +@@ -318,7 +328,7 @@ void open_both_files (Widget parent, cha Arg args[2]; int i; char *dir; @@ -100,7 +108,7 @@ Pull patches from Debian. shell = XtVaCreatePopupShell ("openfiles", xmDialogShellWidgetClass, parent, XmNallowShellResize, True, -@@ -349,7 +358,8 @@ void open_both_files (Widget parent, cha +@@ -349,7 +359,8 @@ void open_both_files (Widget parent, cha fsb1 = XmCreateFileSelectionBox (frame1a, "files1", args, i); if (dir) { XtFree (dir); @@ -110,7 +118,7 @@ Pull patches from Debian. } i = 0; -@@ -360,7 +370,8 @@ void open_both_files (Widget parent, cha +@@ -360,7 +371,8 @@ void open_both_files (Widget parent, cha fsb2 = XmCreateFileSelectionBox (frame2a, "files2", args, i); if (dir) { XtFree (dir); @@ -120,7 +128,7 @@ Pull patches from Debian. } XtAddCallback (fsb1, XmNokCallback, filel_both_cb, shell); -@@ -424,7 +435,7 @@ void open_left_file (Widget parent, char +@@ -424,7 +436,7 @@ void open_left_file (Widget parent, char Arg args[2]; int i; char *dir; @@ -129,7 +137,7 @@ Pull patches from Debian. i = 0; XtSetArg (args[i], XmNdeleteResponse, XmDO_NOTHING); i++; -@@ -435,7 +446,8 @@ void open_left_file (Widget parent, char +@@ -435,7 +447,8 @@ void open_left_file (Widget parent, char dialog = XmCreateFileSelectionDialog (parent, "openfile", args, i); if (dir) { XtFree (dir); @@ -139,7 +147,7 @@ Pull patches from Debian. } XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent); XtAddCallback (dialog, XmNokCallback, file_left_cb, dialog); -@@ -477,7 +489,7 @@ void open_right_file (Widget parent, cha +@@ -477,7 +490,7 @@ void open_right_file (Widget parent, cha Arg args[2]; int i; char *dir; @@ -148,7 +156,7 @@ Pull patches from Debian. i = 0; XtSetArg (args[i], XmNdeleteResponse, XmDO_NOTHING); i++; -@@ -488,7 +500,8 @@ void open_right_file (Widget parent, cha +@@ -488,7 +501,8 @@ void open_right_file (Widget parent, cha dialog = XmCreateFileSelectionDialog (parent, "openfile", args, XtNumber (args)); if (dir) { XtFree (dir); @@ -158,7 +166,7 @@ Pull patches from Debian. } XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent); -@@ -533,7 +546,7 @@ static void file_save_cb (Widget w, XtPo +@@ -533,7 +547,7 @@ static void file_save_cb (Widget w, XtPo if (access (filename, W_OK) == 0) { /* file exists and can be written */ char buffer[1024]; @@ -167,7 +175,7 @@ Pull patches from Debian. if (modal_question (w, "Mgdiff Save Question", buffer)) { set_cursor (shell); if ((status = really_save_file (filename, (Block *) closure)) != 0) { -@@ -569,7 +582,7 @@ void save_file (Widget parent, Block *b, +@@ -569,7 +583,7 @@ void save_file (Widget parent, Block *b, Arg args[3]; int i; char *dir; @@ -176,7 +184,7 @@ Pull patches from Debian. i = 0; XtSetArg (args[i], XmNdialogStyle, XmDIALOG_PRIMARY_APPLICATION_MODAL); i++; -@@ -582,7 +595,8 @@ void save_file (Widget parent, Block *b, +@@ -582,7 +596,8 @@ void save_file (Widget parent, Block *b, dialog = XmCreateFileSelectionDialog (parent, "savefile", args, i); if (dir) { XtFree (dir); @@ -186,7 +194,7 @@ Pull patches from Debian. } XtAddCallback (XtParent (dialog), XmNpopupCallback, popup_cb, parent); -@@ -618,18 +632,32 @@ static int really_save_file (char *filen +@@ -618,18 +633,32 @@ static int really_save_file (char *filen return (status); } else if ((b->arr[LEFT].type == DIFF) && (b->arr[RIGHT].type == DIFF)) { @@ -222,7 +230,7 @@ Pull patches from Debian. if (b->selected == RIGHT) if ((status = write_chunk (file, &b->arr[RIGHT])) != 0) return (status); -@@ -669,3 +697,45 @@ static int write_chunk (FILE *file, Chun +@@ -669,3 +698,45 @@ static int write_chunk (FILE *file, Chun return (0); } --_----------=_167831200445280--