update to 4.8.1

Recent changes:
Add XbaeGetVersionTxt(), XbaeGetVersionNum() to get the version number from the
	(shared) library. Macros to get this at compile time are already in place.
Change version numbers to include the UPDATE number as well. Now 4.8.0 becomes
	40800 (M * 10000 + m * 100 + u).
Xbae configuration :
        --enable-xbae-24bit (enable 24-bit code in XbaeMatrix)
        --enable-xbae-row-heights (allow rows to have variable height in
	  XbaeMatrix)
Xbae API : add XbaeMatrixSetRowHeight(), XbaeMatrixGetRowHeight(),
	XbaeMatrixSetColumnWidth(), XbaeMatrixGetColumnWidth()

2 files changed, 14 insertions, 173 deletions

diff --git a/x11/Xbae/patches/patch-ab b/x11/Xbae/patches/patch-ab
deleted file mode 100644
index 6a8c586a08e..00000000000
--- a/x11/Xbae/patches/patch-ab
+++ /dev/null
@@ -1,167 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/02/03 19:41:04 drochner Exp $
-
---- examples/add/Makefile.in.orig	Mon Sep  6 23:18:53 1999
-+++ examples/add/Makefile.in	Thu Feb  3 15:12:58 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la @MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/caption/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/caption/Makefile.in	Thu Feb  3 15:15:54 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/choice/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/choice/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/colors/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/colors/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/draw/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/draw/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/dynamic/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/dynamic/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/fifteen/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/fifteen/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/input/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/input/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/list/Makefile.in.orig	Thu Feb  3 15:14:33 2000
-+++ examples/list/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/matrix/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/matrix/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/multibyte/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/multibyte/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/multifixed/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/multifixed/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/select-drag/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/select-drag/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/select-push/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/select-push/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
---- examples/traversal/Makefile.in.orig	Thu Feb  3 15:14:34 2000
-+++ examples/traversal/Makefile.in	Thu Feb  3 15:15:55 2000
-@@ -99,7 +99,7 @@
- INCLUDES = -I$(top_srcdir)/include                 -I$(top_srcdir)/../../include/Motif@version_suffix@                 -I$(top_builddir)/../../include/Motif@version_suffix@                 @MOTIF_CFLAGS@ @X_CFLAGS@                 -DMWM_DDIR=\"$(libdir)/X11/mwm\"                 -DXLIB_PATH=\"@x_libraries@\"                 -DXINCL_PATH=\"@x_includes@\"
- 
- 
--LDADD = $(top_builddir)/src/libXbae.la 	-L$(top_builddir)/../Xm$(lib_version_suffix)/.libs 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
-+LDADD = $(top_builddir)/src/libXbae.la 	 	@MOTIF_LIBS@ -lXm @X_LIBS@ ${X_PRE_LIBS} -lXt -lXext -lX11 ${X_EXTRA_LIBS}
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../include/XbaeConfig.h
diff --git a/x11/Xbae/patches/patch-ac b/x11/Xbae/patches/patch-ac
index 6d9231cda69..1f1a3b4fc9e 100644
--- a/x11/Xbae/patches/patch-ac
+++ b/x11/Xbae/patches/patch-ac
@@ -1,16 +1,24 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/02/03 19:41:04 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2000/05/25 16:38:07 drochner Exp $
 
---- Makefile.in.orig	Mon Sep  6 23:18:51 1999
-+++ Makefile.in	Thu Feb  3 17:16:15 2000
-@@ -98,9 +98,9 @@
+--- Makefile.in.orig	Wed May 17 22:02:42 2000
++++ Makefile.in	Thu May 25 18:14:06 2000
+@@ -92,15 +92,15 @@
+ x_libraries = @x_libraries@
  
- EXTRA_DIST = configure ac_find_xbae.m4 FAQ Imakefile Xbae.tmpl Xbae.rules
+ 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
++SUBDIRS = include src
+ 
+ EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules FAQ.html
  
 -aclocaldir = @ACLOCALDIR@
 +aclocaldir = ${prefix}/share/aclocal
  
 -@Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
 +aclocal_DATA = ac_find_xbae.m4
+ 
+-docdir = $(exec_prefix)/Xbae
++docdir = $(prefix)/share/doc/Xbae
+ doc_DATA = FAQ.html NEWS README INSTALL
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ./include/XbaeConfig.h