head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.26
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.24
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.22
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.20
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.18
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.16
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.14
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.12
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.10
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.8
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.6
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.4
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.2
	pkgsrc-2023Q1-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2023.03.01.23.48.00;	author vins;	state Exp;
branches;
next	1.1;
commitid	HH7kWrpXPyCpLtfE;

1.1
date	2023.01.02.22.43.53;	author vins;	state Exp;
branches;
next	;
commitid	vrv8XKCP9hGIg18E;


desc
@@


1.2
log
@devel/mgdiff: update to mgdiff 1.0.1.

Update package using Debian's patches.

## Changes (local)

* Introduce a couple useful scripts based on mgdiff (also pulled from
  Debian):

  - rmgdiff allows the user to recursively diff two directories using
    any graphical diff viewer -- including mgdiff.

  - cvsmgdiff allows the user to compare a revision in a CVS archive
    with what is currently checked out.

* Switch to an internally managed install target.
* Make sure package links against libXpm.
* Add a mgdiff.desktop application file and a suitable pixmap.
* Address compiler warnings when building on Linux.
* Update DESCR.
* Add README.

## Changes (upstream)

* Add file menu entries for "Save as Left..."
  and "Save as Right...". Includes increment of APP_DEFAULTS_VERSION
  number, mods to Mgdiff.ad and checks for correct app-default value.
* Allow saving files with unselected blocks.
* Add ability to select both sides by clicking with the middle button.
  When both sides are selected the two blocks are written to the output
  file using markings similar to the markings CVS palces in a file when
  a merge goes wrong.
* Update the man page to reflect the above changes.
* Fix Ctrl-U/Ctrl-P handling.
* Fix UTF8 handling.
* Replace all usage of sprintf() with snprintf().
* Fix a couple of missing includes.
* Fix building on SUN Solaris.
* Clean compiler warnings.
@
text
@$NetBSD: patch-Imakefile,v 1.1 2023/01/02 22:43:53 vins Exp $

Do not require libucb/SUNWscpu.

--- Imakefile.orig	1994-05-19 02:01:00.000000000 +0000
+++ Imakefile
@@@@ -4,16 +4,17 @@@@
 
 XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
 
-XMLIB = -lXm
+XMLIB =	${MOTIFLIB} -lm
 XCOMM
 XCOMM for Dell SVR4
 XCOMM
-EXTRA_LIBRARIES = -lc -lucb
+EXTRA_LIBRARIES = -lXpm
+EXTRA_DEFINES = -Wall -Wstrict-prototypes -Wmissing-prototypes
 
 SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c
 OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o
 
-LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XMULIBONLY) $(XLIB)
+LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XMULIBONLY) $(XLIB) $(XPLIB)
 
 ComplexProgramTarget(mgdiff)
 InstallAppDefaults(Mgdiff)
@


1.1
log
@devel/mgdiff: import package from wip.

mgdiff is a graphical front-end to the UNIX diff based upon
the Motif widget set.
@
text
@d1 1
a1 1
$NetBSD$
d7 1
a7 1
@@@@ -4,11 +4,10 @@@@
d17 2
d22 6
@