CVS commit: pkgsrc/devel/mgdiff

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Mar 10 08:54:51 UTC 2025

Modified Files:
        pkgsrc/devel/mgdiff: Makefile distinfo
        pkgsrc/devel/mgdiff/patches: patch-externs.h patch-mgdiff.c
            patch-misc.c

Log Message:
devel/mgdiff: fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/mgdiff/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/mgdiff/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/mgdiff/patches/patch-externs.h \
    pkgsrc/devel/mgdiff/patches/patch-misc.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/mgdiff/patches/patch-mgdiff.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/mgdiff/Makefile
diff -u pkgsrc/devel/mgdiff/Makefile:1.3 pkgsrc/devel/mgdiff/Makefile:1.4
--- pkgsrc/devel/mgdiff/Makefile:1.3    Thu Mar  2 08:15:32 2023
+++ pkgsrc/devel/mgdiff/Makefile        Mon Mar 10 08:54:50 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2023/03/02 08:15:32 vins Exp $
+# $NetBSD: Makefile,v 1.4 2025/03/10 08:54:50 vins Exp $
 
 DISTNAME=      mgdiff
 PKGNAME=       ${DISTNAME}-1.0.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel x11
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=applications/}
 DIST_SUBDIR=   ${PKGNAME_NOREV}

Index: pkgsrc/devel/mgdiff/distinfo
diff -u pkgsrc/devel/mgdiff/distinfo:1.5 pkgsrc/devel/mgdiff/distinfo:1.6
--- pkgsrc/devel/mgdiff/distinfo:1.5    Wed Mar  8 21:46:44 2023
+++ pkgsrc/devel/mgdiff/distinfo        Mon Mar 10 08:54:50 2025
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.5 2023/03/08 21:46:44 vins Exp $
+$NetBSD: distinfo,v 1.6 2025/03/10 08:54:50 vins Exp $
 
 BLAKE2s (mgdiff-1.0.1/mgdiff.tar.gz) = 7c90e00f9646d41e5e822055340fa41440acaa5ec0352606ccec1e14b43188de
 SHA512 (mgdiff-1.0.1/mgdiff.tar.gz) = bf5ab4b2a9d42ff2edb73a6dda68a4d17d88f61c63f5ec8366cc49d372a56f3c6812d473a95d86bcb61680d1f91ce4ab7ad87a26748b45e2edd27b73044492a5
 Size (mgdiff-1.0.1/mgdiff.tar.gz) = 41187 bytes
 SHA1 (patch-Imakefile) = 7c95728d50c4d835ceb330124eccce166c9e2845
 SHA1 (patch-Mgdiff.ad) = 1a3eade787f06b02c36bdc925a65ee0562f4d9f5
-SHA1 (patch-externs.h) = 8e536067c9834b8ef26a0210aaf8ece31004f310
+SHA1 (patch-externs.h) = 39db9eb0696fc9832561316e9b05b8c55167e9f4
 SHA1 (patch-files.c) = 671cfd617d700e92d663e42834bc2c6d0dc1967e
 SHA1 (patch-legend.c) = 8933bc2938f94bc7c0c11009074517f017d4f8ee
 SHA1 (patch-manual.c) = 2f430240696d6eec22d5dd576c4577e5b7b4578d
-SHA1 (patch-mgdiff.c) = 773c0a4c1a10194fdc44da401c1eb40cae1233fc
+SHA1 (patch-mgdiff.c) = 5854950906cb37b4f3fe67e73e4c4d76cd23d5d7
 SHA1 (patch-mgdiff.h) = e7958ebd5ca1ccb17c7bcc7cf860d88e81f50cb4
 SHA1 (patch-mgdiff.man) = 65841f964644e7583ec0acb6601703cb44cf76f5
-SHA1 (patch-misc.c) = b6e1dd999f7fa5d013f3b6ad605f7c8c4cb4702e
+SHA1 (patch-misc.c) = 0b2f1c497be48a1729e7d33dbfafc3b90ce5dcbd
 SHA1 (patch-modal.c) = 8c9e9e5c165c01f18ffb568367fa8c279a6913fc
 SHA1 (patch-patchlevel.h) = a9f3923649af2f99fdd4cce8148cc15ad6aaa626
 SHA1 (patch-rundiff.c) = 4c6360f13f1f9871b3a86afb476bfd041a290c58

Index: pkgsrc/devel/mgdiff/patches/patch-externs.h
diff -u pkgsrc/devel/mgdiff/patches/patch-externs.h:1.1 pkgsrc/devel/mgdiff/patches/patch-externs.h:1.2
--- pkgsrc/devel/mgdiff/patches/patch-externs.h:1.1     Wed Mar  1 23:48:00 2023
+++ pkgsrc/devel/mgdiff/patches/patch-externs.h Mon Mar 10 08:54:50 2025
@@ -1,6 +1,7 @@
-$NetBSD: patch-externs.h,v 1.1 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-externs.h,v 1.2 2025/03/10 08:54:50 vins Exp $
 
-Pull patches from Debian.
+* Pull patches from Debian.
+* Provide a declaration of reload_both().
 
 --- externs.h.orig     1994-05-19 02:01:05.000000000 +0000
 +++ externs.h
@@ -15,7 +16,12 @@ Pull patches from Debian.
  #endif
  
  extern int main (int argc, char *argv[]);
-@@ -43,7 +43,7 @@ extern DiffInfo *blank_diff_info (void);
+@@ -39,11 +39,12 @@ extern void process_right_file (char *fi
+ extern void toggle_open_sensitive (Boolean sensitive);
+ extern void toggle_openlr_sensitive (Boolean sensitive);
+ extern void free_diff_info (DiffInfo *di);
++extern void reload_both (void);
+ extern DiffInfo *blank_diff_info (void);
  extern DiffInfo *build_diff_info (char *prog, char *args, char *path1, char *path2);
  extern int max (int i, int j);
  extern int min (int i, int j);
@@ -24,7 +30,7 @@ Pull patches from Debian.
  extern void set_cursor (Widget w);
  extern void reset_cursor (Widget w);
  extern Widget get_top_shell (Widget w);
-@@ -61,5 +61,6 @@ extern void add_editres (Widget shell);
+@@ -61,5 +62,6 @@ extern void add_editres (Widget shell);
  extern void turn_off_sash_traversal (Widget pane);
  extern void show_legend (Widget parent);
  extern void show_context (Widget parent);
Index: pkgsrc/devel/mgdiff/patches/patch-misc.c
diff -u pkgsrc/devel/mgdiff/patches/patch-misc.c:1.1 pkgsrc/devel/mgdiff/patches/patch-misc.c:1.2
--- pkgsrc/devel/mgdiff/patches/patch-misc.c:1.1        Wed Mar  1 23:48:00 2023
+++ pkgsrc/devel/mgdiff/patches/patch-misc.c    Mon Mar 10 08:54:50 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-misc.c,v 1.1 2023/03/01 23:48:00 vins Exp $
+$NetBSD: patch-misc.c,v 1.2 2025/03/10 08:54:50 vins Exp $
 
 Pull patches from Debian.
 
@@ -103,3 +103,23 @@ Pull patches from Debian.
      return ((fclose (fout) == 0));
  }
  
+@@ -102,19 +143,6 @@ Widget get_top_shell (Widget w)
+     return (w);
+ }
+ 
+-#if sun
+-char *strerror (int errnum)
+-{
+-    extern int sys_nerr;
+-    extern char *sys_errlist[];
+-
+-    if ((0 < errnum) && (errnum < sys_nerr))
+-      return (sys_errlist[errnum]);
+-    else
+-      return ("");
+-}
+-#endif
+-
+ void add_editres (Widget shell)
+ {
+ #if EDITRES && X11R5

Index: pkgsrc/devel/mgdiff/patches/patch-mgdiff.c
diff -u pkgsrc/devel/mgdiff/patches/patch-mgdiff.c:1.4 pkgsrc/devel/mgdiff/patches/patch-mgdiff.c:1.5
--- pkgsrc/devel/mgdiff/patches/patch-mgdiff.c:1.4      Thu Mar  2 08:15:32 2023
+++ pkgsrc/devel/mgdiff/patches/patch-mgdiff.c  Mon Mar 10 08:54:50 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-mgdiff.c,v 1.4 2023/03/02 08:15:32 vins Exp $
+$NetBSD: patch-mgdiff.c,v 1.5 2025/03/10 08:54:50 vins Exp $
 
 Prevent unsafe use of tmpnam(). 
 Pull patches from Debian.
@@ -128,7 +128,7 @@ Pull patches from Debian.
  
  /* ARGSUSED1 */
  static void Visible (Widget widget, XtPointer closure, XEvent *event, Boolean *continue_to_dispatch)
-@@ -398,23 +420,37 @@ static void drawit (Widget w, XtPointer 
+@@ -398,23 +420,37 @@ static void drawit (Widget w, XtPointer
      Region region;
      Block *b;
      GC fore, back;
@@ -170,7 +170,7 @@ Pull patches from Debian.
                fore = gcfore[4];
                back = gcback[4];
            }
-@@ -423,10 +459,10 @@ static void drawit (Widget w, XtPointer 
+@@ -423,10 +459,10 @@ static void drawit (Widget w, XtPointer
                back = gcback[ths->type];
            }
        }
@@ -183,7 +183,7 @@ Pull patches from Debian.
                fore = gcfore[4];
                back = gcback[4];
            }
-@@ -520,7 +556,7 @@ static void drawit (Widget w, XtPointer 
+@@ -520,7 +556,7 @@ static void drawit (Widget w, XtPointer
  /* ARGSUSED */
  static void file_cb (Widget w, XtPointer closure, XtPointer call_data)
  {
@@ -432,7 +432,7 @@ Pull patches from Debian.
  }
  
  static void redraw_partial_vert (Widget w)
-@@ -1622,9 +1696,9 @@ static void update_line_numbers (int l, 
+@@ -1622,9 +1696,9 @@ static void update_line_numbers (int l,
  {
      char buffer[16];
  
@@ -719,7 +719,7 @@ Pull patches from Debian.
 +      widget_side = WIDGET_LEFT;
 +    else if (widget == textr)
 +      widget_side = WIDGET_RIGHT;
-+    else
++      else
 +      assert (False);
 +
 +