Update to 1.5E:

New in 1.5A:

The SimpleMenu widget now supports scrolling through entries too
numerous to fit on the screen, with a new resource supporting a
scroll jump value. The record variable is simple_menu.jump_val,
resourced as XtNjumpScroll, and classed as XtCJumpScroll. Adapted
from an early neXtaw toolkit.

Added 3D support to the SimpleMenu, Text, and Viewport widgets.

Four minor changes in ThreeD.c and SmeThreeD.c to have the widgets
use the app's colormap, rather than the screen's default, for those
apps that create their own.

Added the deletion of laygram.h to the Imakefile.

Created Xaw3dP.c, for functions shared by other modules that have
no other appropriate home.

A new directory containing sample resource files for a few apps.
See the README.AD file in that directory.

New in 1.5B:

Made Imakefile a bit more friendly to build options. Makefile now
defines the build options in Xaw3dP.h during the build.

Added to the key translation tables in Panner.c and TextTr.c, and
some rules to Imakefile, to make this distribution X11R5 compliant.
Tested on exactly one X11R5 system; your mileage may vary.

Made internationalization support conditional, for systems lacking
or broken. Tested on exactly two systems, one with and one without;
your mileage may vary.

New in 1.5C:

Enabled multi-plane pixmap support with a new Xt resource type
converter. The "Xaw3d build options" section has more information.

Added private Pixmap resources to the Label and SmeBSB widgets for
stippled copies of the public Pixmap resources (record variables
label.stippled, label.right_stippled, sme_bsb.left_stippled, and
sme_bsb.right_stippled, respectively). Insensitive pixmaps are now
rendered properly.

New in 1.5D:

Added two resources to the SimpleMenu widget for setting margins.
The SmeBSB widgets have a tighter relationship with their parent
and siblings; menus and their entries now respond properly to
changes in themselves or their parent. See the section "The SimpleMenu
widget and margins" below for a detailed explanation.

New in 1.5E:

Enabled a new resource in the ThreeD widget to specify one of five
shadow types. The record variable is threeD.relief (the record part
is transparent), resourced as XtNRelief and classed as XtCRelief.
It accepts as values XtReliefNone, XtReliefRaised, XtReliefSunken,
XtReliefRidge, and XtReliefGroove. Note that the Text, SimpleMenu,
Scrollbar, and Viewport widgets ignore this resource, and display
only raised or sunken shadows. Built on the unfinished work of an
early neXtaw toolkit.

Added support for sub-menus in the SimpleMenu widget. Inspired by
the xfig application, adapted from XFree86's X11R6.6 "Xaw7" toolkit,
and made better than both. See the section "The SimpleMenu widget
and sub-menus" below for usage.

Added a resource to the SmeBSB widget to specify an underlined
character in the label. The record variable is sme_bsb.underline,
resourced as XtNunderline, and classed as XtCUnderline.  It accepts
an integer as an index to the character; a value less than zero or
greater than or equal to the label length inhibits underlining.
Adapted from a recent distribution of the xfig application.

Made the SmeThreeD widget sensitive to the GRAY_BLKWHT_STIPPLES
build option (see the "Xaw3d build options" section for what this
is and does).

Added support for "tooltips". Inspired by the xfig application and
adapted from XFree86's X11R6.6 "Xaw7" toolkit. See the section "The
Tip widget" below for usage.

Fixed some geometry and positioning bugs in the Label widget. It's
internalHeight and internalWidth resources are now used to enforce
a minimum size when it's resize resource is True. The Label (and
superclasses of) widget now resizes properly to changes in label
parts and internal margins (subject to any constraints placed on
the widgets, of course).

Swapped the top and bottom colors in the stippled pixmap shadows.

Fixed a shadow drawing bug in the Command widget, when the shape
is changed.

Fixed the shadow state bug in the SmeBSB widget.

Dropped support for Linux shared a.out libraries.

6 files changed, 46 insertions, 41 deletions

diff --git a/x11/Xaw3d/DESCR b/x11/Xaw3d/DESCR
index bb07e795088..8380a13f8c3 100644
--- a/x11/Xaw3d/DESCR
+++ b/x11/Xaw3d/DESCR
@@ -1,6 +1,6 @@
-This is Release 1.3 (3 June, 1996) of a set of 3-D widgets based
-on the R6.1 Athena Widget set.  The Three-D Athena may be used as
-a general replacement for the Athena (Xaw) Widget set.
+This is a set of 3-D widgets based on the R6.1 Athena Widget set.
+The Three-D Athena may be used as a general replacement for the
+Athena (Xaw) Widget set.
 
 In general, you may relink almost any Athena Widget based application
 with the Three-D Athena Widget set and obtain a three dimensional
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 2ffcd65ec70..afd7d30f775 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.38 2005/02/11 21:59:18 reed Exp $
+# $NetBSD: Makefile,v 1.39 2005/02/18 15:54:48 wiz Exp $
 #
 
-DISTNAME=	Xaw3d-1.5
-PKGREVISION=	1
+DISTNAME=	Xaw3d-1.5E
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XCONTRIB:=widgets/Xaw3d/R6.3/}
+MASTER_SITES=	ftp://ftp.visi.com/users/hawkeyd/X/
 
 MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.visi.com/~hawkeyd/xaw3d.html
 COMMENT=	3-D widgets based on the Athena Widget set
 
 CONFLICTS=	Xaw-Xpm-[0-9]*
diff --git a/x11/Xaw3d/PLIST b/x11/Xaw3d/PLIST
index c5593fbb516..910b6aa2033 100644
--- a/x11/Xaw3d/PLIST
+++ b/x11/Xaw3d/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:26 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/18 15:54:48 wiz Exp $
 ${INCDIR}/Xaw3d/AllWidgets.h
 ${INCDIR}/Xaw3d/AsciiSink.h
 ${INCDIR}/Xaw3d/AsciiSinkP.h
@@ -23,12 +23,12 @@ ${INCDIR}/Xaw3d/Layout.h
 ${INCDIR}/Xaw3d/LayoutP.h
 ${INCDIR}/Xaw3d/List.h
 ${INCDIR}/Xaw3d/ListP.h
-${INCDIR}/Xaw3d/MenuButton.h
 ${INCDIR}/Xaw3d/MenuButtoP.h
-${INCDIR}/Xaw3d/MultiSrc.h
-${INCDIR}/Xaw3d/MultiSrcP.h
+${INCDIR}/Xaw3d/MenuButton.h
 ${INCDIR}/Xaw3d/MultiSink.h
 ${INCDIR}/Xaw3d/MultiSinkP.h
+${INCDIR}/Xaw3d/MultiSrc.h
+${INCDIR}/Xaw3d/MultiSrcP.h
 ${INCDIR}/Xaw3d/Paned.h
 ${INCDIR}/Xaw3d/PanedP.h
 ${INCDIR}/Xaw3d/Panner.h
@@ -41,19 +41,19 @@ ${INCDIR}/Xaw3d/Reports.h
 ${INCDIR}/Xaw3d/Scrollbar.h
 ${INCDIR}/Xaw3d/ScrollbarP.h
 ${INCDIR}/Xaw3d/Simple.h
-${INCDIR}/Xaw3d/SimpleP.h
-${INCDIR}/Xaw3d/SimpleMenu.h
 ${INCDIR}/Xaw3d/SimpleMenP.h
+${INCDIR}/Xaw3d/SimpleMenu.h
+${INCDIR}/Xaw3d/SimpleP.h
 ${INCDIR}/Xaw3d/Sme.h
-${INCDIR}/Xaw3d/SmeP.h
 ${INCDIR}/Xaw3d/SmeBSB.h
 ${INCDIR}/Xaw3d/SmeBSBP.h
 ${INCDIR}/Xaw3d/SmeLine.h
 ${INCDIR}/Xaw3d/SmeLineP.h
+${INCDIR}/Xaw3d/SmeP.h
 ${INCDIR}/Xaw3d/SmeThreeD.h
 ${INCDIR}/Xaw3d/SmeThreeDP.h
-${INCDIR}/Xaw3d/StripChart.h
 ${INCDIR}/Xaw3d/StripCharP.h
+${INCDIR}/Xaw3d/StripChart.h
 ${INCDIR}/Xaw3d/Template.c
 ${INCDIR}/Xaw3d/Template.h
 ${INCDIR}/Xaw3d/TemplateP.h
@@ -65,6 +65,8 @@ ${INCDIR}/Xaw3d/TextSrc.h
 ${INCDIR}/Xaw3d/TextSrcP.h
 ${INCDIR}/Xaw3d/ThreeD.h
 ${INCDIR}/Xaw3d/ThreeDP.h
+${INCDIR}/Xaw3d/Tip.h
+${INCDIR}/Xaw3d/TipP.h
 ${INCDIR}/Xaw3d/Toggle.h
 ${INCDIR}/Xaw3d/ToggleP.h
 ${INCDIR}/Xaw3d/Tree.h
@@ -72,6 +74,7 @@ ${INCDIR}/Xaw3d/TreeP.h
 ${INCDIR}/Xaw3d/VendorEP.h
 ${INCDIR}/Xaw3d/Viewport.h
 ${INCDIR}/Xaw3d/ViewportP.h
+${INCDIR}/Xaw3d/Xaw3dP.h
 ${INCDIR}/Xaw3d/XawImP.h
 ${INCDIR}/Xaw3d/XawInit.h
 share/doc/Xaw3d/README.XAW3D
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
index 73375ea50db..03e2d9f8704 100644
--- a/x11/Xaw3d/distinfo
+++ b/x11/Xaw3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/06/12 15:46:03 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2005/02/18 15:54:48 wiz Exp $
 
-SHA1 (Xaw3d-1.5.tar.gz) = ba10e9f9a376932eed9696006e34d4618a6f588d
-Size (Xaw3d-1.5.tar.gz) = 284420 bytes
-SHA1 (patch-aa) = 03401df288a0658399d475d59e6f8f8cd01ab520
-SHA1 (patch-ab) = 0233ff209e06c8a699c23907be3af442ed099ff1
+SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1
+Size (Xaw3d-1.5E.tar.gz) = 309264 bytes
+SHA1 (patch-aa) = cfd730a6fe81d42c6a89049c602647b344897a72
+SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa
index b5d186ffef7..f29dc6376c0 100644
--- a/x11/Xaw3d/patches/patch-aa
+++ b/x11/Xaw3d/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2003/06/12 15:46:03 jschauma Exp $
+$NetBSD: patch-aa,v 1.9 2005/02/18 15:54:48 wiz Exp $
 
---- Imakefile.orig	Tue Oct 15 07:41:19 1996
-+++ Imakefile	Wed Jun 11 10:43:33 2003
-@@ -7,8 +7,16 @@
+--- Imakefile.orig	2003-03-08 15:55:18.000000000 +0100
++++ Imakefile
+@@ -9,7 +9,7 @@ XCOMM For color pixmaps, define MULTIPLA
+ XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
+ #define GRAY_BLKWHT_STIPPLES
+ XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
+-#undef ARROW_SCROLLBARS
++#define ARROW_SCROLLBARS
+ 
+ #define DoNormalLib NormalLibXaw
+ #define DoSharedLib SharedLibXaw
+@@ -18,11 +18,19 @@ XCOMM For scrollbars with arrows, define
  #define HasSharedData YES
  #define LibName Xaw3d
  #define SoRev SOXAWREV
@@ -17,17 +26,9 @@ $NetBSD: patch-aa,v 1.8 2003/06/12 15:46:03 jschauma Exp $
 +#endif
 +#endif
  
- #ifdef LinuxArchitecture
- JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
-@@ -39,9 +47,9 @@
- 
-        LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
- 
--#  EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
-+EXTRA_DEFINES = -DARROW_SCROLLBAR -DUSEGRAY
- 
--#  EXTRA_INCLUDES = -I.
+ XCOMM When building outside an X11 source tree:
+-XCOMM EXTRA_INCLUDES = -I.
 +EXTRA_INCLUDES = -I.
  
- HEADERS = \
- 	AllWidgets.h \
+ #ifdef SharedXawReqs
+ REQUIREDLIBS = SharedXawReqs
diff --git a/x11/Xaw3d/patches/patch-ab b/x11/Xaw3d/patches/patch-ab
index 7fbc8e57e08..62260be7a78 100644
--- a/x11/Xaw3d/patches/patch-ab
+++ b/x11/Xaw3d/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/03/11 14:11:45 tron Exp $
+$NetBSD: patch-ab,v 1.3 2005/02/18 15:54:48 wiz Exp $
 
---- XawI18n.h.orig	Tue Oct 15 16:41:26 1996
-+++ XawI18n.h	Sun Mar 11 15:07:30 2001
-@@ -29,10 +29,12 @@
+--- XawI18n.h.orig	1996-10-15 16:41:26.000000000 +0200
++++ XawI18n.h
+@@ -29,11 +29,13 @@ in this Software without prior written a
  
  #ifdef HAS_WCTYPE_H
  #include <wctype.h>
@@ -11,7 +11,8 @@ $NetBSD: patch-ab,v 1.2 2001/03/11 14:11:45 tron Exp $
  #define wcslen(c) wslen(c)
  #define wcscpy(d,s) wscpy(d,s)
  #define wcsncpy(d,s,l) wsncpy(d,s,l)
-+#endif
  #endif
++#endif
  
  #ifdef HAS_WCHAR_H
+ #include <wchar.h>