Update Xbae to 4.9.1. Changes from the development release 4.8.4 include:

    * Row height and true-color (aka 24-bit color) support.
    * Support for bold columns in XbaeMatrix.
    * Bugfixes.

6 files changed, 85 insertions, 35 deletions

diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index ed9a716dcf3..d5092e28486 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,26 +1,29 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:06:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/07/29 06:25:15 jlam Exp $
 #
 
-DISTNAME=	Xbae-4.8.4
+DISTNAME=	Xbae-4.9.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/
 
 MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.lesstif.org/Xbae.html
-COMMENT=	Three Motif compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput
+COMMENT=	Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput
 
-USE_MOTIF=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_BUILDLINK_ONLY=	YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--disable-build-12 \
-			--enable-build-20 --enable-default-20
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-motif-includes=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	--with-motif-libraries=${BUILDLINK_DIR}/lib
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal
+	${INSTALL_DATA} ${WRKSRC}/ac_find_xbae.m4 ${PREFIX}/share/aclocal
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/ac_find_xbae.m4 \
 		${LOCALBASE}/share/aclocal/ac_find_xbae.m4
 
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xbae/distinfo b/x11/Xbae/distinfo
index 740b8f4f12b..c57cc4492b5 100644
--- a/x11/Xbae/distinfo
+++ b/x11/Xbae/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:35 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/07/29 06:25:15 jlam Exp $
 
-SHA1 (Xbae-4.8.4.tar.gz) = e1f3baaf2e04c7ceaefac6acecb44b881034816e
-Size (Xbae-4.8.4.tar.gz) = 382590 bytes
-SHA1 (patch-ac) = 179dd395f26adf0a940b63413724cd76018d5a0c
+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
diff --git a/x11/Xbae/patches/patch-ac b/x11/Xbae/patches/patch-ac
index 1f1a3b4fc9e..04590928f5c 100644
--- a/x11/Xbae/patches/patch-ac
+++ b/x11/Xbae/patches/patch-ac
@@ -1,24 +1,24 @@
-$NetBSD: patch-ac,v 1.2 2000/05/25 16:38:07 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2001/07/29 06:25:16 jlam Exp $
 
---- Makefile.in.orig	Wed May 17 22:02:42 2000
-+++ Makefile.in	Thu May 25 18:14:06 2000
-@@ -92,15 +92,15 @@
+--- Makefile.in.orig	Wed May 23 16:51:44 2001
++++ Makefile.in
+@@ -99,16 +99,16 @@
  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
-+SUBDIRS = include src
+-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
  
- 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
+ @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
  
--docdir = $(exec_prefix)/Xbae
-+docdir = $(prefix)/share/doc/Xbae
+-docdir = $(prefix)/Xbae
++docdir = $(prefix)/share/doc/html/Xbae
  doc_DATA = FAQ.html NEWS README INSTALL
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ #
diff --git a/x11/Xbae/patches/patch-ad b/x11/Xbae/patches/patch-ad
new file mode 100644
index 00000000000..7fab856c220
--- /dev/null
+++ b/x11/Xbae/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/07/29 06:25:16 jlam Exp $
+
+--- doc/Makefile.in.orig	Wed May 23 16:51:48 2001
++++ doc/Makefile.in
+@@ -110,7 +110,7 @@
+ # 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
+ 
diff --git a/x11/Xbae/patches/patch-ae b/x11/Xbae/patches/patch-ae
new file mode 100644
index 00000000000..d5c5af986d5
--- /dev/null
+++ b/x11/Xbae/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/07/29 06:25:16 jlam Exp $
+
+--- doc/images/Makefile.in.orig	Wed May 23 16:51:48 2001
++++ doc/images/Makefile.in
+@@ -108,7 +108,7 @@
+ # 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
+ 
+ #
+ # Cut the distribution size, don't distribute these in a source
diff --git a/x11/Xbae/pkg/PLIST b/x11/Xbae/pkg/PLIST
index 6700f931c79..5d70bb6ad6b 100644
--- a/x11/Xbae/pkg/PLIST
+++ b/x11/Xbae/pkg/PLIST
@@ -1,28 +1,47 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/04 15:10:59 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/07/29 06:25:16 jlam Exp $
 include/Xbae/Matrix.h
 include/Xbae/Input.h
 include/Xbae/Caption.h
-include/Xbae/patchlevel.h
 include/Xbae/MatrixP.h
 include/Xbae/Clip.h
 include/Xbae/ClipP.h
 include/Xbae/CaptionP.h
 include/Xbae/InputP.h
+include/Xbae/patchlevel.h
 lib/libXbae.a
 lib/libXbae.la
 lib/libXbae.so
 lib/libXbae.so.4
-lib/libXbae.so.4.8
+lib/libXbae.so.4.9
 man/man3/XbaeCaption.3
 man/man3/XbaeInput.3
 man/man3/XbaeMatrix.3
 share/aclocal/ac_find_xbae.m4
-share/doc/Xbae/FAQ.html
-share/doc/Xbae/NEWS
-share/doc/Xbae/README
-share/doc/Xbae/INSTALL
+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
 @dirrm include/Xbae
-@dirrm share/doc/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
 @unexec rmdir %D/share/aclocal 2>/dev/null || true