Update to 4.50.99:

Intermediate release 4.50.99
-------------------
* Changed the configuration file for the build. The auto(conf|make) people
  changed their API so we changed our build.
* The string-to-pixel-table converter had gone missing; fixed.
* Several resources were not getting treated in SetValues and GetValues.
  Some must have been disabled for a while, several others died because
  moving them into the per-cell structure had the side-effect that they
  weren't any regular widget resources any more.
  I'm afraid this was oversight on my behalf during the per-cell conversion.
* Changed the functionality of drawCellCallback slightly: we're now initializing
  the callback structure with the cell contents. If the callback doesn't
  alter anything, something will still end up getting displayed.
* New work from Tobias Oed :
  - setlabel.patch corrects the buggy logic of XbaeSetRowLabel (and ColumnLabel).
  - SCROLLBAR_TOP.patch introduces two simple macros to make things a bit more readable
  - clips.patch redraws the left/right/bottom/top clips in the same way the clipchild is
    redrawn. IMHO it makes things cleaner and avoids redrawing the partially
    fixed cells twice in some cases. Also fixes bugs when deleting a row/col
    makes the matrix scroll.
  - ClearCell.patch fixes a small bug I introduced in GetCellClip.patch (one of the draw
    examples crashes).
  - deadspace-clipmask.patch redraws the dead space similarly to the labels (they are
    both drawn on the matrix). This makes things cleaner as now everything gets redrawn
    the way clipped cells are or the way labels are. It also eliminates the need to redraw
    the last non fixed row/columns to get the dead space to be drawn. It kills
    calcVertfill/calcHorzfill and removes a bunch of unnecessary
  - xbaeSetClipMask calls
    and simplifies that function. It gets the shadow to span the dead space (when there are
    trailing attached rows/columns) and  one of XmGRID_ROW_SHADOW etc are set.
    It simplifies the way a highlights are drawn and deprecates HighLightOther but these
    do not span the dead space yet.
* Protect against passing gadgets as cell widgets for now, because we don't have the
  right support for them yet.
* More work from Tobias :
  - refresh.patch adds stuff I missed in GetCellClip.patch that leads to this bug: start
    choice, add some (trailing)fixed columns, set cell margin heigtht to 10, scroll to the
    bottom of the matrix and then reduce the margin height. The fixed column don't get
    updated right.
  - left_column.patch. Do the same thing with the above patch applied.  Everything gets
    updated correctly now, but the scrolling is somewhat erratic. This patch fixes this by
    making left_column/top_row 'fake' resources (like cells now is). It relies on the assumption
    that SetValuesHook gets called after SetValues. If someone has a better X doc than me, let
    me know if this is safe.
  - filletc.patch gets the fill(s)/trailing attached to work under all combinations of these
    options and shadow types according to spec (these are wierd). The approach I started
    to take in deadspace-clipmask.patch was a hopless nightmare and this is much simpler. It makes
    the fill part of the cell that preced it. To accomodate this, the size of the clips is changed.
    It removes the more obscure macros (Sir Silly Macro's) and introduces new ones
    VISIBLE_FIXED_*_{HEIGHT|WIDTH}. The new version of exaples/add lets you try the stuff out.
  - renamemacro.patch does the renaming I suggested.
  - rowlabelwidth.patch fixes the calculation of the row label width as it included
    cell_shadow_thickness twice when the labels were buttons.
  - labelClip.patch - This patch puts the scrollable parts of labels in their own clips. It adds
    two clips and two scrollMgrs but on the other hand kills 3 gcs and the matrix scrollMgr.
    Now everything that scrolls is treated the same way and we have as many scrollMgrs as clips.
    Time to put them in the clip.
  - This patch fixes a few more problems due to the per_cell change of arcad: Set/GetValuesHook
    were missing some items and SetValuesHook wasn't updating the display.
    I also changes the semantics of per_cell[][].shadow_type a bit: a value of 0 now
    means to use the default matrix.cell_shadow_type. Unfortunately there is no
    XmUNSPECIFIED_SHODOW so this may not work on all motif flaviours. On
    the other hand, the values currently used come from two different motif enums
    so it's either already broken or safe.This gets that part of examples/choice to work again.
    I modified examples/choice to get the Arm option to work again (You can't just
    fiddle with what GetValues returned for cellBackgrounds and cellShadowTypes
    and do a redisplay, you need to SetValues what you changed). I also fixed the
    memory leaks that every other third party app will suffer after a GetValues of
    these resources. That probably needs to be documented somewhere.
  - fifteen.patch gets the shadow to follow the empty cell again and fixes some memory leaks
    (same thing as my latest changes to choice.c, all other examples are OK)
  - labelClipfix.patch fixes a bug I introduced in labelClip.patch (very apparent when scrollbars
    are TOP and/or LEFT). I had to remove some XClearArea calls from resize() . I had doubts about
    them for a while: they were using outdated values. I also decided to have labels clear their
    'cell' before redrawing and collapsed drawXmLlabel into drawLabel.
  - ClearArea breaks relayout out of resize and removes all calls to
    XClearArea from these functions, adding them to add/delete row/column.
    This hopefully gets all that working. It also eliminates private header
    dependence of some examples allowing to remove xbaeClearCell.
  - CopyPerCell.patch replaces calls to xbaeCopyPerCell by xbaeCreatePerCell
    where apropriate. After that there is a call to copypercell left in a dead
    piece of code and another one that is commented out. So I killed the dead
    code and the whloe xbaeCopyPerCell function.
  - userWidget.patch: (at least) since the new XbaeMatrixSetUserWidget apeared,
    user widgets can be treated just like the text widget and xbaeMoveUserWidget
    is not needed anymore.
* Fixes from Michel Bardiaux :
  - allow build using an older gcc (still the official compiler in Debian)
  - fix a 'BadWindow' happening with the following sequence:
	XbaeCreateMatrix
	XtRealizeWidget(toplevel)
	create a widget as child of matrix
	XbaeMatrixSetCellWidget
* Another one from Tobias : The first part makes the scroll managers part of the clips,
  and the second part isolates all the scrolling to the clips widgets.
* Change the signature of XbaeMatrixGetCellPixmap so it has a return code.
* Implement XbaeMatrixSortRows() as the same function as XbaeMatrixSort().
  Maybe the latter should disappear.
* Document the new interfaces from Arcad.
* Include code for creating a DLL under the Exceed environment.
  Until we figure out how to auto-detect Exceed, a flag should be passed to configure
  to enable this.

Intermediate release 4.50.97
----------------------------
* A submission of code by Arcad Systemhaus for :
  - Added XbaeMatrixSort(Widget, void *proc);
  - Moved the cell string into the per_cell structure, to be able to sort.
  - Fixes for multiline text display in cells.
  - Added XbaeMatrixTrackCellCallback which fires everytime the cursor enters
    a new cell (something entercell/leavecell do differently).
* Modified ("fixed" really) cell width calculation, as requested by Evgeny,
  to mimic the behaviour described in the Motif documentation.

Test release 4.50.93
--------------------
* Lots of bugfixes and code cleanup by Tobias Oed, see ChangeLog.

Test release 4.50.91
--------------------
* Lots of bugfixes and code cleanup by Tobias Oed, see ChangeLog.

Release 4.50.5
--------------
* Fix for XmNautoFill in XbaeInput when the pattern begins with an
  optional literal, such as [-]d[d][d][d][d] .
* Add the new resources introduced in the last months to the example
  Builder Xcessory integration file in examples/builderXcessory.
* Bugfix for a clip window size problem that showed up when resizing the
  window (e.g. resize examples/traversal/traversal to smaller than the
  original and then bigger). Bug #702560.
* Some source code cleanup.
* Fixes by James Georgas for colour handling.
* Fixes by Van to eliminate slider size warnings (see bugs #823041 and #823037).
* Fixes by David Traill for both resize and scrollbar warnings.
* Add XmNXmColumnLabel resource to handle XmString as column labels.
* Fix a memory problem with row_heights.

4.50.3 was not an official release.
	It was a test version distributed to parties interested in it.

Release 4.50.2
--------------
* A memory (double free) related bugfix.
* Two new resources (XmNhorzFill, XmNvertFill) were added to allow for
  additional fill behaviour. This allows you to specify how the matrix
  treats highlighting of the last row or column.
* The foreground and background resources are no longer being set on
  cell widgets, as this appears to be strange behaviour.
* Bugfix related to incorrect refresh after deleting rows.
* Remove some C++ style comments.
* Fix some build problems.
* Move some stuff in the share/ directory at installation.
* Implement the XBAE_PRODUCTION symbol to compile Xbae with or without
  debugging code.
* Improve resizing rows and columns.
* Avoid X Errors when setting clip geometry to 0.
* Implement showColumnArrows and showRowArrows resources.
* Fix incorrect behaviour when rapidly clicking with two different
  mouse buttons.
* Fix nested comments and a missing prototype.
* Fix scrollbar warning problem.
* Changed the column width measurement.

Release 4.50
------------
This is a stable release, basically equivalent to 4.9.13.

Changes in 4.9.13
-----------------
* Fix the GROHTML build problem.
* Bugfix : when resizing first of trailing fixed rows, the VSB slider
  was not updated and a blank area was visible between clip and bottomclip.
* Changed useXbaeInput default value to False.

Changes in 4.9.11
-----------------
* Sascha Göbel and Greg Shebert are now part of the Xbae development team.
* Many bugfixes to the scrolling (smooth scrolling now),
  and to resizing row heights.
* Received code from Sasha Göbel.

Changes in 4.9.9
----------------
* Bug fixes related to redrawing.
* Enable dynamic row/column resizes again.
* Include images in release files again - this makes for a large package.
* Build HTML manual pages from their sources (the HTML is in doc/,
  but the sources are in src/*.3.in).

Changes in 4.9.7
----------------
* Sascha Göbel contributed substantial improvement to scrolling.
* Bugfixes.

Changes in 4.9.5
----------------

* Improved internal debugging support (dmalloc, dbmalloc)
* Fix pattern check in XbaeInput
* Remove support for Motif <=1.1
* Bugfix by Phil Eccles to position cell widgets correctly when row/column
  headers are active.

7 files changed, 96 insertions, 68 deletions

diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 45c5741ae2c..5df4fd1796d 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/11/23 16:35:55 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2004/11/23 17:04:15 wiz Exp $
 #
 
-DISTNAME=	Xbae-4.9.1
-PKGREVISION=	1
+DISTNAME=	xbae-4.50.99
+PKGNAME=	Xbae-4.50.99
 CATEGORIES=	x11
-#MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/ \
-#		${MASTER_SITE_SOURCEFORGE:=xbae/}
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xbae/}
 
 MAINTAINER=	drochner@NetBSD.org
diff --git a/x11/Xbae/PLIST b/x11/Xbae/PLIST
index 63ee4a97dba..3940985729d 100644
--- a/x11/Xbae/PLIST
+++ b/x11/Xbae/PLIST
@@ -1,42 +1,62 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:57 jlam Exp $
-include/Xbae/Matrix.h
-include/Xbae/Input.h
+@comment $NetBSD: PLIST,v 1.5 2004/11/23 17:04:15 wiz Exp $
 include/Xbae/Caption.h
-include/Xbae/MatrixP.h
+include/Xbae/CaptionP.h
 include/Xbae/Clip.h
 include/Xbae/ClipP.h
-include/Xbae/CaptionP.h
+include/Xbae/Input.h
 include/Xbae/InputP.h
+include/Xbae/Matrix.h
+include/Xbae/MatrixP.h
 include/Xbae/patchlevel.h
 lib/libXbae.la
 man/man3/XbaeCaption.3
 man/man3/XbaeInput.3
 man/man3/XbaeMatrix.3
 share/aclocal/ac_find_xbae.m4
-share/doc/html/Xbae/images/lesstif.png
-share/doc/html/Xbae/images/new.png
-share/doc/html/Xbae/images/x2tog.png
-share/doc/html/Xbae/images/linux.png
-share/doc/html/Xbae/images/mailbox.png
-share/doc/html/Xbae/callbacks.html
-share/doc/html/Xbae/cellwidgets.html
-share/doc/html/Xbae/contents.html
-share/doc/html/Xbae/coverplus.html
-share/doc/html/Xbae/difffonts.html
-share/doc/html/Xbae/index.html
-share/doc/html/Xbae/main.html
-share/doc/html/Xbae/morelines.html
-share/doc/html/Xbae/psdriver.html
-share/doc/html/Xbae/rowheights.html
-share/doc/html/Xbae/scrolling.html
-share/doc/html/Xbae/spancells.html
-share/doc/html/Xbae/title.html
-share/doc/html/Xbae/FAQ.html
-share/doc/html/Xbae/NEWS
-share/doc/html/Xbae/README
-share/doc/html/Xbae/INSTALL
-@dirrm share/doc/html/Xbae/images
-@dirrm share/doc/html/Xbae
+share/doc/Xbae/FAQ.html
+share/doc/Xbae/NEWS
+share/doc/Xbae/README
+share/doc/Xbae/contents.html
+share/doc/Xbae/coverplus.html
+share/doc/Xbae/difffonts.html
+share/doc/Xbae/images/LDO.jpg
+share/doc/Xbae/images/add.jpg
+share/doc/Xbae/images/bg.png
+share/doc/Xbae/images/capfloor1.png
+share/doc/Xbae/images/capfloor3.png
+share/doc/Xbae/images/caption.png
+share/doc/Xbae/images/choice.png
+share/doc/Xbae/images/colors.jpg
+share/doc/Xbae/images/coverplus.png
+share/doc/Xbae/images/draw.png
+share/doc/Xbae/images/fifteen.jpg
+share/doc/Xbae/images/input.png
+share/doc/Xbae/images/lesstif.png
+share/doc/Xbae/images/list.jpg
+share/doc/Xbae/images/mailbox.png
+share/doc/Xbae/images/matrix.jpg
+share/doc/Xbae/images/multifixed.jpg
+share/doc/Xbae/images/new.png
+share/doc/Xbae/images/organize.jpg
+share/doc/Xbae/images/pricing.jpg
+share/doc/Xbae/images/risk.jpg
+share/doc/Xbae/images/select-push.jpg
+share/doc/Xbae/images/taam.png
+share/doc/Xbae/images/updated.png
+share/doc/Xbae/images/xbasket.png
+share/doc/Xbae/images/xbill2-2.png
+share/doc/Xbae/images/xbum1-2.png
+share/doc/Xbae/index.html
+share/doc/Xbae/main.html
+share/doc/Xbae/morelines.html
+share/doc/Xbae/psdriver.html
+share/doc/Xbae/scrolling.html
+share/doc/Xbae/sites.html
+share/doc/Xbae/spancells.html
+share/doc/Xbae/title.html
+share/doc/Xbae/users.html
+@dirrm share/doc/Xbae/images
+@dirrm share/doc/Xbae
 @dirrm include/Xbae
 @exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/ac_find_xbae.m4 ${LOCALBASE}/share/aclocal/ac_find_xbae.m4
 @unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/ac_find_xbae.m4
diff --git a/x11/Xbae/distinfo b/x11/Xbae/distinfo
index c57cc4492b5..a32829f4aac 100644
--- a/x11/Xbae/distinfo
+++ b/x11/Xbae/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/07/29 06:25:15 jlam Exp $
+$NetBSD: distinfo,v 1.4 2004/11/23 17:04:15 wiz Exp $
 
-SHA1 (Xbae-4.9.1.tar.gz) = 332b012094610a3eb4c2d0b75afd0609bdffadc8
-Size (Xbae-4.9.1.tar.gz) = 456761 bytes
-SHA1 (patch-ac) = 9ce96b3ca7ac9343136c5dd1060d3c530f962015
-SHA1 (patch-ad) = 26b189abf7e98fde336332c5f83c30f251cab04a
-SHA1 (patch-ae) = b8813d7a39f20ad5feec905f7474df203c204ddb
+SHA1 (xbae-4.50.99.tar.gz) = 7db263520eb90e5f186d116d44bfbe1235d537a5
+Size (xbae-4.50.99.tar.gz) = 1411313 bytes
+SHA1 (patch-aa) = d61ed4bdb7509edbda2ff311a256710f35b57204
+SHA1 (patch-ac) = 87246a832469d25b838194609bc3fafbb0437f46
+SHA1 (patch-ad) = 0edfc40dd6dc6dd1da17d4190501b32ce6c2f938
+SHA1 (patch-ae) = 2720252fd02bac06e3e2086f0e1f2fc0cca8cacc
diff --git a/x11/Xbae/patches/patch-aa b/x11/Xbae/patches/patch-aa
new file mode 100644
index 00000000000..90e3fa55c7a
--- /dev/null
+++ b/x11/Xbae/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2004/11/23 17:04:15 wiz Exp $
+
+--- src/Makefile.in.orig	2004-10-29 22:08:37.000000000 +0200
++++ src/Makefile.in
+@@ -540,7 +540,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-htmlDATA install-man
++install-data-am: install-man
+ 
+ install-exec-am: install-libLTLIBRARIES
+ 
diff --git a/x11/Xbae/patches/patch-ac b/x11/Xbae/patches/patch-ac
index 04590928f5c..a3accd753da 100644
--- a/x11/Xbae/patches/patch-ac
+++ b/x11/Xbae/patches/patch-ac
@@ -1,24 +1,20 @@
-$NetBSD: patch-ac,v 1.3 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/23 17:04:15 wiz Exp $
 
---- Makefile.in.orig	Wed May 23 16:51:44 2001
+--- Makefile.in.orig	2004-10-29 22:08:38.000000000 +0200
 +++ Makefile.in
-@@ -99,16 +99,16 @@
+@@ -230,13 +230,13 @@ target_alias = @target_alias@
+ x_includes = @x_includes@
  x_libraries = @x_libraries@
- 
  MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
--SUBDIRS = include src examples doc
-+SUBDIRS = include src doc
- 
- EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules FAQ.html 	CVSMake acconfig.h
- 
- 
--aclocaldir = @ACLOCALDIR@
-+aclocaldir = ${prefix}/share/aclocal
+-SUBDIRS = include src examples doc scripts
++SUBDIRS = include src doc scripts
+ EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules \
+ 	CVSMake
  
+ aclocaldir = @ACLOCALDIR@
  @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
- 
 -docdir = $(prefix)/Xbae
-+docdir = $(prefix)/share/doc/html/Xbae
- doc_DATA = FAQ.html NEWS README INSTALL
++docdir = $(datadir)/doc/Xbae
+ doc_DATA = NEWS README
  
  #
diff --git a/x11/Xbae/patches/patch-ad b/x11/Xbae/patches/patch-ad
index 7fab856c220..f95f76f068b 100644
--- a/x11/Xbae/patches/patch-ad
+++ b/x11/Xbae/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2004/11/23 17:04:15 wiz Exp $
 
---- doc/Makefile.in.orig	Wed May 23 16:51:48 2001
+--- doc/Makefile.in.orig	2004-10-29 22:08:32.000000000 +0200
 +++ doc/Makefile.in
-@@ -110,7 +110,7 @@
+@@ -224,7 +224,7 @@ SUBDIRS = images
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
--docdir = $(prefix)/Xbae
-+docdir = $(prefix)/share/doc/html/Xbae
- 
- doc_DATA =  	callbacks.html cellwidgets.html 	contents.html coverplus.html difffonts.html 	index.html main.html morelines.html 	psdriver.html rowheights.html scrolling.html 	spancells.html title.html
- 
+-docdir = $(datadir)/Xbae
++docdir = $(datadir)/doc/Xbae
+ doc_DATA = \
+       contents.html coverplus.html difffonts.html \
+       index.html main.html morelines.html \
diff --git a/x11/Xbae/patches/patch-ae b/x11/Xbae/patches/patch-ae
index d5c5af986d5..3b7224011dc 100644
--- a/x11/Xbae/patches/patch-ae
+++ b/x11/Xbae/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/07/29 06:25:16 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2004/11/23 17:04:15 wiz Exp $
 
---- doc/images/Makefile.in.orig	Wed May 23 16:51:48 2001
+--- doc/images/Makefile.in.orig	2004-10-29 22:08:32.000000000 +0200
 +++ doc/images/Makefile.in
-@@ -108,7 +108,7 @@
+@@ -213,7 +213,7 @@ x_libraries = @x_libraries@
  # Lets put the informational stuff in a sub directory to avoid 
  # polluting /usr/local for default installs.
  #
--imagedir = $(exec_prefix)/Xbae/images
-+imagedir = $(prefix)/share/doc/html/Xbae/images
+-imagedir = $(datadir)/Xbae/images
++imagedir = $(datadir)/doc/Xbae/images
  
  #
  # Cut the distribution size, don't distribute these in a source