From 82d52e2c6e0feb1208f7a14751969c6491097380 Mon Sep 17 00:00:00 2001 From: jdp Date: Fri, 9 May 1997 20:45:02 +0000 Subject: Add a fix for a graphics bug. --- lang/modula-3-lib/files/patch-ah | 2 +- lang/modula-3-lib/files/patch-bn | 24 ++++++++++++ lang/modula-3-lib/pkg-plist | 80 ++++++++++++++++++++-------------------- lang/modula-3/Makefile | 4 +- lang/modula-3/pkg-plist | 6 +-- 5 files changed, 70 insertions(+), 46 deletions(-) create mode 100644 lang/modula-3-lib/files/patch-bn diff --git a/lang/modula-3-lib/files/patch-ah b/lang/modula-3-lib/files/patch-ah index c0f1f209fcde..80ac70f977fd 100644 --- a/lang/modula-3-lib/files/patch-ah +++ b/lang/modula-3-lib/files/patch-ah @@ -195,7 +195,7 @@ Index: m3/m3build/templates/FreeBSD2 proc after_library_hooks(x) is local lib_a = format ("lib%s.a", x) - local lib_so = format ("lib%s.so.1.1", x) -+ local lib_so = format ("lib%s.so.4.0", x) ++ local lib_so = format ("lib%s.so.4.1", x) local dest = format ("%s%s%s%s%s", PKG_INSTALL, SL, BUILD_PACKAGE, SL, BUILD_DIR) diff --git a/lang/modula-3-lib/files/patch-bn b/lang/modula-3-lib/files/patch-bn new file mode 100644 index 000000000000..5d015c1ee017 --- /dev/null +++ b/lang/modula-3-lib/files/patch-bn @@ -0,0 +1,24 @@ +This fixes a bug which can result in a value out of range error if the +cursor is at the beginning of a TextPort and the DeleteToStartOfLine +procedure is invoked. + +This patch has been sent to SRC. + +Index: m3/vbtkit/src/etext/TextPortClass.m3 +--- TextPortClass.m3- Mon Jan 30 14:34:34 1995 ++++ TextPortClass.m3 Thu May 8 17:20:58 1997 +@@ -271,8 +271,12 @@ + left := MTextUnit.StartOfLine (v.vtext.mtext, here); + BEGIN + IF here = left THEN +- (* We're already at the start of line; delete one char. *) +- RETURN v.replace (here - 1, here, "") ++ (* Already at the start of line; delete preceding newline if any. *) ++ IF here > 0 THEN ++ RETURN v.replace (here - 1, here, "") ++ ELSE ++ RETURN NotFound ++ END + ELSE + RETURN v.replace (left, here, "") + END diff --git a/lang/modula-3-lib/pkg-plist b/lang/modula-3-lib/pkg-plist index 7f124afd47e5..02bc73a6e6f2 100644 --- a/lang/modula-3-lib/pkg-plist +++ b/lang/modula-3-lib/pkg-plist @@ -1,43 +1,43 @@ etc/rc.d/50.m3.sh -lib/m3/FreeBSD2/libDiGraph.so.4.0 -lib/m3/FreeBSD2/libGeometry.so.4.0 -lib/m3/FreeBSD2/libImages.so.4.0 -lib/m3/FreeBSD2/libTempFiles.so.4.0 -lib/m3/FreeBSD2/libjvideo.so.4.0 -lib/m3/FreeBSD2/libm3.so.4.0 -lib/m3/FreeBSD2/libm3X11R4.so.4.0 -lib/m3/FreeBSD2/libm3core.so.4.0 -lib/m3/FreeBSD2/libm3formsvbt.so.4.0 -lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.4.0 -lib/m3/FreeBSD2/libm3parseparams.so.4.0 -lib/m3/FreeBSD2/libm3tcp.so.4.0 -lib/m3/FreeBSD2/libm3tools.so.4.0 -lib/m3/FreeBSD2/libm3ui.so.4.0 -lib/m3/FreeBSD2/libm3vbtkit.so.4.0 -lib/m3/FreeBSD2/libset.so.4.0 -lib/m3/FreeBSD2/libtable-list.so.4.0 -lib/m3/FreeBSD2/libtcpextras.so.4.0 -lib/m3/FreeBSD2/libvideovbt.so.4.0 -lib/m3/FreeBSD2/libweb.so.4.0 -lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.4.0 -lib/m3/pkg/digraph/FreeBSD2/libDiGraph.so.4.0 -lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.4.0 -lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.4.0 -lib/m3/pkg/images/FreeBSD2/libImages.so.4.0 -lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.4.0 -lib/m3/pkg/libm3/FreeBSD2/libm3.so.4.0 -lib/m3/pkg/m3core/FreeBSD2/libm3core.so.4.0 -lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.4.0 -lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.4.0 -lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.4.0 -lib/m3/pkg/set/FreeBSD2/libset.so.4.0 -lib/m3/pkg/table-list/FreeBSD2/libtable-list.so.4.0 -lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.4.0 -lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.so.4.0 -lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.4.0 -lib/m3/pkg/ui/FreeBSD2/libm3ui.so.4.0 -lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.4.0 -lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.4.0 -lib/m3/pkg/web/FreeBSD2/libweb.so.4.0 +lib/m3/FreeBSD2/libDiGraph.so.4.1 +lib/m3/FreeBSD2/libGeometry.so.4.1 +lib/m3/FreeBSD2/libImages.so.4.1 +lib/m3/FreeBSD2/libTempFiles.so.4.1 +lib/m3/FreeBSD2/libjvideo.so.4.1 +lib/m3/FreeBSD2/libm3.so.4.1 +lib/m3/FreeBSD2/libm3X11R4.so.4.1 +lib/m3/FreeBSD2/libm3core.so.4.1 +lib/m3/FreeBSD2/libm3formsvbt.so.4.1 +lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.4.1 +lib/m3/FreeBSD2/libm3parseparams.so.4.1 +lib/m3/FreeBSD2/libm3tcp.so.4.1 +lib/m3/FreeBSD2/libm3tools.so.4.1 +lib/m3/FreeBSD2/libm3ui.so.4.1 +lib/m3/FreeBSD2/libm3vbtkit.so.4.1 +lib/m3/FreeBSD2/libset.so.4.1 +lib/m3/FreeBSD2/libtable-list.so.4.1 +lib/m3/FreeBSD2/libtcpextras.so.4.1 +lib/m3/FreeBSD2/libvideovbt.so.4.1 +lib/m3/FreeBSD2/libweb.so.4.1 +lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.4.1 +lib/m3/pkg/digraph/FreeBSD2/libDiGraph.so.4.1 +lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.4.1 +lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.4.1 +lib/m3/pkg/images/FreeBSD2/libImages.so.4.1 +lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.4.1 +lib/m3/pkg/libm3/FreeBSD2/libm3.so.4.1 +lib/m3/pkg/m3core/FreeBSD2/libm3core.so.4.1 +lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.4.1 +lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.4.1 +lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.4.1 +lib/m3/pkg/set/FreeBSD2/libset.so.4.1 +lib/m3/pkg/table-list/FreeBSD2/libtable-list.so.4.1 +lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.4.1 +lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.so.4.1 +lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.4.1 +lib/m3/pkg/ui/FreeBSD2/libm3ui.so.4.1 +lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.4.1 +lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.4.1 +lib/m3/pkg/web/FreeBSD2/libweb.so.4.1 share/modula-3-lib/COPYRIGHT @exec /sbin/ldconfig -m %D/lib/m3/FreeBSD2 diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile index 8db99107c3fa..e0b14a724cb7 100644 --- a/lang/modula-3/Makefile +++ b/lang/modula-3/Makefile @@ -3,7 +3,7 @@ # Date created: 18 Mar 1996 # Whom: John Polstra # -# $Id: Makefile,v 1.10 1996/12/30 23:28:13 jdp Exp $ +# $Id: Makefile,v 1.11 1997/03/28 04:38:36 jdp Exp $ # DISTNAME= modula-3-3.6 @@ -22,7 +22,7 @@ NO_BUILD= yes # Keep these in sync with the PLIST and with the library version numbers # in the modula-3-lib port. major= 4 -minor= 0 +minor= 1 # The Modula-3 build process insists on installing each individual # component immediately after that component is built. To avoid having diff --git a/lang/modula-3/pkg-plist b/lang/modula-3/pkg-plist index bd6925b66d55..7f4a54c5fdbc 100644 --- a/lang/modula-3/pkg-plist +++ b/lang/modula-3/pkg-plist @@ -3,7 +3,7 @@ bin/formsedit bin/m3browser bin/m3build bin/m3build-4 -bin/m3build-4.0 +bin/m3build-4.1 bin/m3bundle bin/m3pp bin/m3ship @@ -16,7 +16,7 @@ bin/replayheap bin/showheap bin/shownew bin/showthread -lib/m3/FreeBSD2/libm3configvars.so.4.0 +lib/m3/FreeBSD2/libm3configvars.so.4.1 lib/m3/FreeBSD2/m3 lib/m3/FreeBSD2/m3cgc1 lib/m3/FreeBSD2/m3mkdir @@ -313,7 +313,7 @@ lib/m3/pkg/m3configvars/FreeBSD2/.M3IMPTAB lib/m3/pkg/m3configvars/FreeBSD2/.M3WEB lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.a lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.m3x -lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.4.0 +lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.4.1 lib/m3/pkg/m3configvars/src/M3ConfigVars.i3 lib/m3/pkg/m3core/FreeBSD2/.M3EXPORTS lib/m3/pkg/m3core/FreeBSD2/.M3IMPTAB -- cgit