From 1603d8d54ab4541d3479c7df56bc3801167c9326 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 12 Mar 2022 15:16:27 +0100 Subject: [PATCH] x11-toolkits/Xaw3d: update to 1.6.3 and move to x11-toolkits/libXaw3d - rename port --- MOVED | 1 + audio/timidity++/Makefile.interface | 2 +- comms/acfax/Makefile | 2 +- devel/pdcurses/Makefile | 2 +- editors/emacs-devel/Makefile | 2 +- editors/emacs/Makefile | 2 +- editors/xvile/Makefile | 2 +- games/3dc/Makefile | 2 +- games/xboard/Makefile | 2 +- games/xfrisk/Makefile | 2 +- games/xmine/Makefile | 2 +- graphics/xfig/Makefile | 2 +- japanese/kterm/Makefile | 2 +- math/snns/Makefile | 2 +- multimedia/fxtv/Makefile | 2 +- print/gv/Makefile | 2 +- x11-toolkits/Makefile | 2 +- x11-toolkits/Xaw3d/distinfo | 2 - x11-toolkits/Xaw3d/files/patch-Box.c | 24 - .../Xaw3d/files/patch-runtime_scrollbars | 824 ------------------ x11-toolkits/{Xaw3d => libXaw3d}/Makefile | 15 +- x11-toolkits/libXaw3d/distinfo | 3 + .../{Xaw3d => libXaw3d}/files/pkg-message.in | 0 x11-toolkits/{Xaw3d => libXaw3d}/pkg-descr | 0 x11-toolkits/{Xaw3d => libXaw3d}/pkg-plist | 13 +- x11-toolkits/mowitz/Makefile | 2 +- x11/libsx/Makefile | 2 +- x11/xterm/Makefile | 2 +- x11/xvkbd/Makefile | 2 +- 29 files changed, 34 insertions(+), 888 deletions(-) delete mode 100644 x11-toolkits/Xaw3d/distinfo delete mode 100644 x11-toolkits/Xaw3d/files/patch-Box.c delete mode 100644 x11-toolkits/Xaw3d/files/patch-runtime_scrollbars rename x11-toolkits/{Xaw3d => libXaw3d}/Makefile (55%) create mode 100644 x11-toolkits/libXaw3d/distinfo rename x11-toolkits/{Xaw3d => libXaw3d}/files/pkg-message.in (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/pkg-descr (100%) rename x11-toolkits/{Xaw3d => libXaw3d}/pkg-plist (94%) diff --git a/MOVED b/MOVED index 456f9a92e4f3..eb8893d572c6 100644 --- a/MOVED +++ b/MOVED @@ -16957,3 +16957,4 @@ databases/postgresql96-plperl||2022-03-11|Has expired: PostgreSQL-9.6 has reache databases/postgresql96-plpython||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life databases/postgresql96-pltcl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life +x11-toolkits/Xaw3d|x11-toolkits/libXaw3d|2022-03-12|Rename port to better convey its function diff --git a/audio/timidity++/Makefile.interface b/audio/timidity++/Makefile.interface index e42fa8386f74..4098fc8f1978 100644 --- a/audio/timidity++/Makefile.interface +++ b/audio/timidity++/Makefile.interface @@ -103,7 +103,7 @@ DESKTOP_ENTRIES="TkMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" "" .if ${INTERFACE} == "xaw" LINK= xawmidi -LIB_DEPENDS+= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS+= libXaw3d.so:x11-toolkits/libXaw3d USES+= xorg USE_XORG= x11 xext xmu xt sm ice xpm diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile index e547c1048f47..a1186d7df18e 100644 --- a/comms/acfax/Makefile +++ b/comms/acfax/Makefile @@ -12,7 +12,7 @@ COMMENT= Receive faxes using sound card and radio LICENSE= GPLv2 -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d \ +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d \ libgnuregex.so.6:devel/libgnuregex USES= imake xorg diff --git a/devel/pdcurses/Makefile b/devel/pdcurses/Makefile index e5fad87d60ff..f153bf2749ef 100644 --- a/devel/pdcurses/Makefile +++ b/devel/pdcurses/Makefile @@ -35,7 +35,7 @@ NEXTAW_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw XAW3D_DESC= Link with Xaw3d XAW3D_CONFIGURE_WITH= xaw3d -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d MAKE_ARGS= libdir=${STAGEDIR}${PREFIX}/lib \ bindir=${STAGEDIR}${PREFIX}/bin \ diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 0321aa6d00ff..1ca7333fdd49 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -195,7 +195,7 @@ TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_WITH= webp -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena \ diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 17c0af6d3613..4e097adbcdc5 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -200,7 +200,7 @@ SVG_CONFIGURE_WITH= rsvg THREADS_CONFIGURE_WITH= threads TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-x-toolkit=athena \ diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 81840e2ecb42..a89aac55cdd2 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -57,7 +57,7 @@ XAW_DESC= X Athena Widgets XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-screen=athena XAW3D_DESC= X Athena Widgets with 3D effect -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_ON= --enable-colored-menus \ --with-Xaw3d \ --with-screen=xaw3d diff --git a/games/3dc/Makefile b/games/3dc/Makefile index bb7a5b526c20..a3fc4dc62499 100644 --- a/games/3dc/Makefile +++ b/games/3dc/Makefile @@ -13,7 +13,7 @@ COMMENT= 3-Dimensional Chess for X Window System LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/../GPL -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= perl5 xorg USE_PERL5= build diff --git a/games/xboard/Makefile b/games/xboard/Makefile index 512223fe010d..183e055d0ae4 100644 --- a/games/xboard/Makefile +++ b/games/xboard/Makefile @@ -45,7 +45,7 @@ FAIRYMAX_RUN_DEPENDS= fairymax:games/fairymax GNUCHESS_RUN_DEPENDS= gnuchess:games/gnuchess KNIGHTCAP_RUN_DEPENDS= KnightCap:games/KnightCap PHALANX_RUN_DEPENDS= phalanx:games/phalanx -XAW3D_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d SOX_RUN_DEPENDS= play:audio/sox ALSA_RUN_DEPENDS= aplay:audio/alsa-utils NLS_USES= gettext diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index 97a6839c59ce..9762fd8f91eb 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -18,7 +18,7 @@ LICENSE_TEXT_CR= Possible trademark infringement LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING LICENSE_PERMS_CR= dist-mirror pkg-mirror auto-accept -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d WRKSRC= ${WRKDIR}/XFrisk diff --git a/games/xmine/Makefile b/games/xmine/Makefile index 0936e393f2bd..5e5e45c2bfd7 100644 --- a/games/xmine/Makefile +++ b/games/xmine/Makefile @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-Xaw MAINTAINER= joerg@FreeBSD.org COMMENT= The `Athena' port of the xminesweeper game -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= imake xorg USE_XORG= x11 xaw xext xmu xt xpm sm ice diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 9044bc78877a..cc999e608999 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -16,7 +16,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libgs.so:print/ghostscript9-agpl-base \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ - libXaw3d.so:x11-toolkits/Xaw3d + libXaw3d.so:x11-toolkits/libXaw3d RUN_DEPENDS= fig2dev:print/fig2dev USES= cpe desktop-file-utils gmake jpeg localbase:ldflags tar:xz xorg diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index 274311c5b700..e7b212bc8bfc 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -30,7 +30,7 @@ OPTIONS_SINGLE_SCROLLBAR= DEFAULT XAW3DLIB NEXTAWLIB OPTIONS_SUB= yes XAW3DLIB_DESC= with Xaw3d scrollbar -XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d NEXTAWLIB_DESC= with neXtaw scrollbar NEXTAWLIB_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw diff --git a/math/snns/Makefile b/math/snns/Makefile index ce48bd4f73d8..7b2b99864145 100644 --- a/math/snns/Makefile +++ b/math/snns/Makefile @@ -10,7 +10,7 @@ DISTNAME= SNNSv${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Fully featured neural network simulator -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= xorg USE_XORG= x11 xext xt diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile index a19f821a220c..62c38108e11e 100644 --- a/multimedia/fxtv/Makefile +++ b/multimedia/fxtv/Makefile @@ -17,7 +17,7 @@ IGNORE= needs bktr(4) which is no longer available on your FreeBSD version ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libtiff.so:graphics/tiff \ - libXaw3d.so:x11-toolkits/Xaw3d + libXaw3d.so:x11-toolkits/libXaw3d USES= gmake jpeg tar:tgz xorg MAKE_ENV= X11BASE=${LOCALBASE} diff --git a/print/gv/Makefile b/print/gv/Makefile index 84809e31d294..b16435af0f1d 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= GNU MAINTAINER= mbeis@xs4all.nl COMMENT= PostScript and PDF previewer -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= cpe ghostscript:x11 iconv gmake perl5 shebangfix xorg USE_PERL5= build diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index a08b539cb07a..a2788fffca5c 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -1,7 +1,6 @@ COMMENT = X11 toolkits SUBDIR += SoXt - SUBDIR += Xaw3d SUBDIR += Xmt SUBDIR += amtk SUBDIR += blt @@ -65,6 +64,7 @@ SUBDIR += kproperty SUBDIR += lesstif SUBDIR += libXaw + SUBDIR += libXaw3d SUBDIR += libXmu SUBDIR += libXt SUBDIR += libadwaita diff --git a/x11-toolkits/Xaw3d/distinfo b/x11-toolkits/Xaw3d/distinfo deleted file mode 100644 index 3ace30abf241..000000000000 --- a/x11-toolkits/Xaw3d/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (Xaw3d-1.5E.tar.gz) = 433ad7057d745f6313b5be91b65b983881a27a11711e3332fcaa56bf3befe32b -SIZE (Xaw3d-1.5E.tar.gz) = 309264 diff --git a/x11-toolkits/Xaw3d/files/patch-Box.c b/x11-toolkits/Xaw3d/files/patch-Box.c deleted file mode 100644 index 53cfe5b80905..000000000000 --- a/x11-toolkits/Xaw3d/files/patch-Box.c +++ /dev/null @@ -1,24 +0,0 @@ -*** Box.c~ 1996-10-15 10:41:18.000000000 -0400 ---- Box.c 2007-04-21 14:12:44.000000000 -0400 -*************** -*** 353,360 **** - else { - width = preferred_width; - do { /* find some width big enough to stay within this height */ -! width *= 2; -! if (width > constraint->width) width = constraint->width; - DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); - } while (preferred_height > constraint->height && - width < constraint->width); ---- 353,363 ---- - else { - width = preferred_width; - do { /* find some width big enough to stay within this height */ -! if (width > constraint->width/2) /* avoid short int overflow */ -! width = constraint->width; -! else -! width *= 2; -! - DoLayout(w, width, 0, &preferred_width, &preferred_height, FALSE); - } while (preferred_height > constraint->height && - width < constraint->width); diff --git a/x11-toolkits/Xaw3d/files/patch-runtime_scrollbars b/x11-toolkits/Xaw3d/files/patch-runtime_scrollbars deleted file mode 100644 index 877cb0ff8020..000000000000 --- a/x11-toolkits/Xaw3d/files/patch-runtime_scrollbars +++ /dev/null @@ -1,824 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: ChangeLog -diff -N ChangeLog ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ ChangeLog 4 Apr 2005 13:41:08 -0000 1.1 -@@ -0,0 +1,5 @@ -+2005-04-04 Stefan Monnier -+ -+ * Scrollbar.c (FractionLoc): Don't constrain to 0.0 ... 1.0. -+ (MoveThumb): Rewrite the "picked" handling. -+ -Index: Imakefile -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/Imakefile,v -retrieving revision 1.1.1.9 -retrieving revision 1.2 -diff -u -r1.1.1.9 -r1.2 ---- Imakefile 25 Mar 2005 18:12:03 -0000 1.1.1.9 -+++ Imakefile 27 Mar 2005 13:53:38 -0000 1.2 -@@ -8,8 +8,6 @@ - #undef MULTIPLANE_PIXMAPS - 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 DoNormalLib NormalLibXaw - #define DoSharedLib SharedLibXaw -@@ -22,7 +20,7 @@ - #define IncSubSubdir Xaw3d - - XCOMM When building outside an X11 source tree: --XCOMM EXTRA_INCLUDES = -I. -+EXTRA_INCLUDES = -I. - - #ifdef SharedXawReqs - REQUIREDLIBS = SharedXawReqs -@@ -119,13 +117,6 @@ - XAW_GRAY_BLKWHT_STIPPLES = \ - -e 's/\/\* gray stipples \*\//\#undef XAW_GRAY_BLKWHT_STIPPLES/' - #endif --#ifdef ARROW_SCROLLBARS --XAW_ARROW_SCROLLBARS = \ -- -e 's/\/\* arrow scrollbars \*\//\#define XAW_ARROW_SCROLLBARS/' --#else --XAW_ARROW_SCROLLBARS = \ -- -e 's/\/\* arrow scrollbars \*\//\#undef XAW_ARROW_SCROLLBARS/' --#endif - - depend:: laygram.c laygram.h laylex.c Xaw3dP.h - -@@ -148,8 +139,7 @@ - - Xaw3dP.h: Xaw3dP.h.sed - sed $(XAW_INTERNATIONALIZATION) $(XAW_MULTIPLANE_PIXMAPS) \ -- $(XAW_GRAY_BLKWHT_STIPPLES) $(XAW_ARROW_SCROLLBARS) \ -- Xaw3dP.h.sed > Xaw3dP.h -+ $(XAW_GRAY_BLKWHT_STIPPLES) Xaw3dP.h.sed > Xaw3dP.h - - $(OBJS): Xaw3dP.h - -Index: README.XAW3D -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/README.XAW3D,v -retrieving revision 1.1.1.4 -retrieving revision 1.2 -diff -u -r1.1.1.4 -r1.2 ---- README.XAW3D 25 Mar 2005 18:12:04 -0000 1.1.1.4 -+++ README.XAW3D 27 Mar 2005 13:53:38 -0000 1.2 -@@ -48,7 +48,6 @@ - #define XAW_INTERNATIONALIZATION - #define XAW_MULTIPLANE_PIXMAPS - #define XAW_GRAY_BLKWHT_STIPPLES -- #undef XAW_ARROW_SCROLLBARS - - Xaw3dP.h need not be included by the application source, as the public - headers that reference any 3D features include this header. The -@@ -133,16 +132,6 @@ - beNiceToColormap resource is True and 3) the display allows it. This - option was disabled in previous Xaw3d releases. - -- The default Xaw3d does not use arrow scrollbars. At the top of this -- distribution's Imakefile are the lines: -- -- XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS: -- #undef ARROW_SCROLLBARS -- -- If you want arrow-style scrollbars, change the "#undef" to "#define". -- Note that the Scrollbar widget's translations and actions will change -- accordingly. -- - Building Xaw3d within an X11 source tree: - ----------------------------------------- - -Index: Scrollbar.c -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/Scrollbar.c,v -retrieving revision 1.1.1.6 -retrieving revision 1.4 -diff -u -r1.1.1.6 -r1.4 ---- Scrollbar.c 25 Mar 2005 18:12:04 -0000 1.1.1.6 -+++ Scrollbar.c 4 Apr 2005 16:06:04 -0000 1.4 -@@ -53,6 +53,11 @@ - - ******************************************************************/ - -+/* TODO: -+ - avoid adhoc tests for `->arrows'. -+ - add support for scroll wheels. -+ */ -+ - /* ScrollBar.c */ - /* created by weissman, Mon Jul 7 13:20:03 1986 */ - /* converted by swick, Thu Aug 27 1987 */ -@@ -69,38 +74,48 @@ - - /* Private definitions. */ - --#ifdef XAW_ARROW_SCROLLBARS --static char defaultTranslations[] = -- ": NotifyScroll()\n\ -- : MoveThumb() NotifyThumb() \n\ -- : NotifyScroll()\n\ -- : HandleThumb() \n\ -- : HandleThumb() \n\ -- : MoveThumb() NotifyThumb() \n\ -- : EndScroll()"; --#else - static char defaultTranslations[] = -+#ifdef XAW_SCROLL_WHEEL -+ ": StartScroll(Wheel, Backward) \n\ -+ : StartScroll(Wheel, Forward) \n" -+#endif - ": StartScroll(Forward) \n\ - : StartScroll(Continuous) MoveThumb() NotifyThumb() \n\ - : StartScroll(Backward) \n\ -+ : HandleThumb() \n\ -+ : HandleThumb() \n\ - : MoveThumb() NotifyThumb() \n\ - : NotifyScroll(Proportional) EndScroll()"; --#ifdef bogusScrollKeys -- /* examples */ -- "f: StartScroll(Forward) NotifyScroll(FullLength) EndScroll()" -- "b: StartScroll(Backward) NotifyScroll(FullLength) EndScroll()" --#endif --#endif -+/* #ifdef XAW_ARROW_SCROLLBARS -+ * ": NotifyScroll()\n\ -+ * : MoveThumb() NotifyThumb() \n\ -+ * : NotifyScroll()\n\ -+ * : HandleThumb() \n\ -+ * : HandleThumb() \n\ -+ * : MoveThumb() NotifyThumb() \n\ -+ * : EndScroll()"; -+ * #else -+ * ": StartScroll(Forward) \n\ -+ * : StartScroll(Continuous) MoveThumb() NotifyThumb() \n\ -+ * : StartScroll(Backward) \n\ -+ * : MoveThumb() NotifyThumb() \n\ -+ * : NotifyScroll(Proportional) EndScroll()"; -+ * #ifdef bogusScrollKeys -+ * /\* examples *\/ -+ * "f: StartScroll(Forward) NotifyScroll(FullLength) EndScroll()" -+ * "b: StartScroll(Backward) NotifyScroll(FullLength) EndScroll()" -+ * #endif -+ * #endif */ - - static float floatZero = 0.0; - - #define Offset(field) XtOffsetOf(ScrollbarRec, field) - - static XtResource resources[] = { --#ifdef XAW_ARROW_SCROLLBARS - /* {XtNscrollCursor, XtCCursor, XtRCursor, sizeof(Cursor), - Offset(scrollbar.cursor), XtRString, "crosshair"},*/ --#else -+ {XtNarrowScrollbars, XtCArrowScrollbars, XtRBoolean, sizeof(Boolean), -+ Offset(scrollbar.arrows), XtRBoolean, (XtPointer) False}, - {XtNscrollVCursor, XtCCursor, XtRCursor, sizeof(Cursor), - Offset(scrollbar.verCursor), XtRString, "sb_v_double_arrow"}, - {XtNscrollHCursor, XtCCursor, XtRCursor, sizeof(Cursor), -@@ -113,7 +128,6 @@ - Offset(scrollbar.leftCursor), XtRString, "sb_left_arrow"}, - {XtNscrollRCursor, XtCCursor, XtRCursor, sizeof(Cursor), - Offset(scrollbar.rightCursor), XtRString, "sb_right_arrow"}, --#endif - {XtNlength, XtCLength, XtRDimension, sizeof(Dimension), - Offset(scrollbar.length), XtRImmediate, (XtPointer) 1}, - {XtNthickness, XtCThickness, XtRDimension, sizeof(Dimension), -@@ -149,22 +163,16 @@ - static void Redisplay(); - static Boolean SetValues(); - --#ifdef XAW_ARROW_SCROLLBARS - static void HandleThumb(); --#else - static void StartScroll(); --#endif - static void MoveThumb(); - static void NotifyThumb(); - static void NotifyScroll(); - static void EndScroll(); - - static XtActionsRec actions[] = { --#ifdef XAW_ARROW_SCROLLBARS - {"HandleThumb", HandleThumb}, --#else - {"StartScroll", StartScroll}, --#endif - {"MoveThumb", MoveThumb}, - {"NotifyThumb", NotifyThumb}, - {"NotifyScroll", NotifyScroll}, -@@ -235,12 +243,11 @@ - (XtConvertArgList)NULL, (Cardinal)0 ); - } - --#ifdef XAW_ARROW_SCROLLBARS --/* CHECKIT #define MARGIN(sbw) (sbw)->scrollbar.thickness + (sbw)->threeD.shadow_width */ --#define MARGIN(sbw) (sbw)->scrollbar.thickness --#else --#define MARGIN(sbw) (sbw)->threeD.shadow_width --#endif -+#define MARGIN(sbw) \ -+ ((sbw)->scrollbar.arrows \ -+ /* CHECKIT (sbw)->scrollbar.thickness + (sbw)->threeD.shadow_width */ \ -+ ? (sbw)->scrollbar.thickness \ -+ : (sbw)->threeD.shadow_width) - - /* - The original Xaw Scrollbar's FillArea *really* relied on the fact that the -@@ -357,7 +364,6 @@ - } - } - --#ifdef XAW_ARROW_SCROLLBARS - static void PaintArrows (sbw) - ScrollbarWidget sbw; - { -@@ -453,7 +459,6 @@ - } - } - } --#endif - - /* Function Name: Destroy - * Description: Called as the scrollbar is going away... -@@ -464,10 +469,8 @@ - Widget w; - { - ScrollbarWidget sbw = (ScrollbarWidget) w; --#ifdef XAW_ARROW_SCROLLBARS - if(sbw->scrollbar.timer_id != (XtIntervalId) 0) - XtRemoveTimeOut (sbw->scrollbar.timer_id); --#endif - XtReleaseGC (w, sbw->scrollbar.gc); - } - -@@ -552,12 +555,8 @@ - ? sbw->scrollbar.thickness : sbw->scrollbar.length; - - SetDimensions (sbw); --#ifdef XAW_ARROW_SCROLLBARS -- sbw->scrollbar.scroll_mode = 0; - sbw->scrollbar.timer_id = (XtIntervalId)0; --#else - sbw->scrollbar.direction = 0; --#endif - sbw->scrollbar.topLoc = 0; - sbw->scrollbar.shownLength = sbw->scrollbar.min_thumb; - } -@@ -568,19 +567,19 @@ - XSetWindowAttributes *attributes; - { - ScrollbarWidget sbw = (ScrollbarWidget) w; --#ifdef XAW_ARROW_SCROLLBARS -- if(sbw->simple.cursor_name == NULL) -- XtVaSetValues(w, XtNcursorName, "crosshair", NULL); -- /* dont set the cursor of the window to anything */ -- *valueMask &= ~CWCursor; --#else -- sbw->scrollbar.inactiveCursor = -- (sbw->scrollbar.orientation == XtorientVertical) -- ? sbw->scrollbar.verCursor -- : sbw->scrollbar.horCursor; -+ if (sbw->scrollbar.arrows) { -+ /* if (sbw->simple.cursor_name == NULL) -+ * XtVaSetValues(w, XtNcursorName, "crosshair", NULL); */ -+ /* dont set the cursor of the window to anything */ -+ *valueMask &= ~CWCursor; -+ } else { -+ sbw->scrollbar.inactiveCursor = -+ (sbw->scrollbar.orientation == XtorientVertical) -+ ? sbw->scrollbar.verCursor -+ : sbw->scrollbar.horCursor; - -- XtVaSetValues (w, XtNcursor, sbw->scrollbar.inactiveCursor, NULL); --#endif -+ XtVaSetValues (w, XtNcursor, sbw->scrollbar.inactiveCursor, NULL); -+ } - /* - * The Simple widget actually stuffs the value in the valuemask. - */ -@@ -669,11 +668,9 @@ - sbw->scrollbar.topLoc = -(sbw->scrollbar.length + 1); - PaintThumb (sbw, event); - } --#ifdef XAW_ARROW_SCROLLBARS -- /* we'd like to be region aware here!!!! */ -- PaintArrows (sbw); --#endif -- -+ if (sbw->scrollbar.arrows) -+ /* we'd like to be region aware here!!!! */ -+ PaintArrows (sbw); - } - - -@@ -776,7 +773,6 @@ - } - } - --#ifdef XAW_ARROW_SCROLLBARS - /* ARGSUSED */ - static void HandleThumb (w, event, params, num_params) - Widget w; -@@ -787,10 +783,14 @@ - Position x,y; - ScrollbarWidget sbw = (ScrollbarWidget) w; - -+ /* The old non-ARROW_SCROLLBAR binding emulation: -+ HandleThumb() -> */ -+ if (!sbw->scrollbar.arrows) return; -+ - ExtractPosition( event, &x, &y ); - /* if the motion event puts the pointer in thumb, call Move and Notify */ - /* also call Move and Notify if we're already in continuous scroll mode */ -- if (sbw->scrollbar.scroll_mode == 2 || -+ if (sbw->scrollbar.direction == 'C' || - (PICKLENGTH (sbw,x,y) >= sbw->scrollbar.topLoc && - PICKLENGTH (sbw,x,y) <= sbw->scrollbar.topLoc + sbw->scrollbar.shownLength)){ - XtCallActionProc(w, "MoveThumb", event, params, *num_params); -@@ -805,12 +805,12 @@ - #define A_FEW_PIXELS 5 - ScrollbarWidget sbw = (ScrollbarWidget) client_data; - int call_data; -- if (sbw->scrollbar.scroll_mode != 1 && sbw->scrollbar.scroll_mode != 3) { -+ if (sbw->scrollbar.direction != 'B' && sbw->scrollbar.direction != 'F') { - sbw->scrollbar.timer_id = (XtIntervalId) 0; - return; - } - call_data = MAX (A_FEW_PIXELS, sbw->scrollbar.length / 20); -- if (sbw->scrollbar.scroll_mode == 1) -+ if (sbw->scrollbar.direction == 'B') - call_data = -call_data; - XtCallCallbacks((Widget)sbw, XtNscrollProc, (XtPointer) call_data); - sbw->scrollbar.timer_id = -@@ -820,12 +820,11 @@ - client_data); - } - --#else /* XAW_ARROW_SCROLLBARS */ - /* ARGSUSED */ - static void StartScroll (w, event, params, num_params ) - Widget w; - XEvent *event; -- String *params; /* direction: Back|Forward|Smooth */ -+ String *params; /* direction: Back|Forward|Continuous */ - Cardinal *num_params; /* we only support 1 */ - { - ScrollbarWidget sbw = (ScrollbarWidget) w; -@@ -833,11 +832,24 @@ - char direction; - - if (sbw->scrollbar.direction != 0) return; /* if we're already scrolling */ -- if (*num_params > 0) -+ if (*num_params > 0) - direction = *params[0]; - else - direction = 'C'; - -+ if (sbw->scrollbar.arrows) { -+ /* The old ARROW_SCROLLBAR binding emulation: -+ StartScroll(Forward) -> NotifyScroll() -+ StartScroll(Backward) -> NotifyScroll() -+ StartScroll(Continuous) -> */ -+ switch (direction) { -+ case 'b': case 'B': case 'f': case 'F': -+ NotifyScroll(w, event, params, 0); -+ break; -+ } -+ return; -+ } -+ - sbw->scrollbar.direction = direction; - - switch (direction) { -@@ -865,20 +877,17 @@ - XtVaSetValues (w, XtNcursor, cursor, NULL); - XFlush (XtDisplay (w)); - } --#endif /* XAW_ARROW_SCROLLBARS */ - - /* - * Make sure the first number is within the range specified by the other - * two numbers. - */ - --#ifndef XAW_ARROW_SCROLLBARS - static int InRange(num, small, big) - int num, small, big; - { - return (num < small) ? small : ((num > big) ? big : num); - } --#endif - - /* - * Same as above, but for floating numbers. -@@ -891,7 +900,6 @@ - } - - --#ifdef XAW_ARROW_SCROLLBARS - static void NotifyScroll (w, event, params, num_params) - Widget w; - XEvent *event; -@@ -902,94 +910,94 @@ - int call_data; - Position x, y; - -- if (sbw->scrollbar.scroll_mode == 2 /* if scroll continuous */ -- || LookAhead (w, event)) -- return; -- -- ExtractPosition (event, &x, &y); -+ if (sbw->scrollbar.arrows) { -+ if (sbw->scrollbar.direction == 'C' /* if scroll continuous */ -+ || LookAhead (w, event)) -+ return; -+ -+ /* Old ARROW_SCROLLBAR bindings emulation: -+ NotifyScroll(Proportional) -> */ -+ if (num_params > 0 && (*params[0] == 'P' || *params[0] == 'p')) -+ return; - -- if (PICKLENGTH (sbw,x,y) < sbw->scrollbar.thickness) { -- /* handle first arrow zone */ -- call_data = -MAX (A_FEW_PIXELS, sbw->scrollbar.length / 20); -- XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -- /* establish autoscroll */ -- sbw->scrollbar.timer_id = -- XtAppAddTimeOut (XtWidgetToApplicationContext (w), -- (unsigned long) 300, RepeatNotify, (XtPointer)w); -- sbw->scrollbar.scroll_mode = 1; -- } else if (PICKLENGTH (sbw,x,y) > sbw->scrollbar.length - sbw->scrollbar.thickness) { -- /* handle last arrow zone */ -- call_data = MAX (A_FEW_PIXELS, sbw->scrollbar.length / 20); -- XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -- /* establish autoscroll */ -- sbw->scrollbar.timer_id = -- XtAppAddTimeOut (XtWidgetToApplicationContext (w), -- (unsigned long) 300, RepeatNotify, (XtPointer)w); -- sbw->scrollbar.scroll_mode = 3; -- } else if (PICKLENGTH (sbw, x, y) < sbw->scrollbar.topLoc) { -- /* handle zone "above" the thumb */ -- call_data = - sbw->scrollbar.length; -- XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -- } else if (PICKLENGTH (sbw, x, y) > sbw->scrollbar.topLoc + sbw->scrollbar.shownLength) { -- /* handle zone "below" the thumb */ -- call_data = sbw->scrollbar.length; -- XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -- } else -- { -- /* handle the thumb in the motion notify action */ -- } -- return; --} --#else /* XAW_ARROW_SCROLLBARS */ --static void NotifyScroll (w, event, params, num_params) -- Widget w; -- XEvent *event; -- String *params; /* style: Proportional|FullLength */ -- Cardinal *num_params; /* we only support 1 */ --{ -- ScrollbarWidget sbw = (ScrollbarWidget) w; -- int call_data; -- char style; -- Position x, y; -- -- if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ -- if (LookAhead (w, event)) return; -- if (*num_params > 0) -- style = *params[0]; -- else -- style = 'P'; -- -- switch (style) { -- case 'P': /* Proportional */ -- case 'p': - ExtractPosition (event, &x, &y); -- call_data = -- InRange (PICKLENGTH (sbw, x, y), 0, (int) sbw->scrollbar.length); -- break; - -- case 'F': /* FullLength */ -- case 'f': -- call_data = sbw->scrollbar.length; -- break; -- } -- switch (sbw->scrollbar.direction) { -- case 'B': -- case 'b': -- call_data = -call_data; -- /* fall through */ -+ if (PICKLENGTH (sbw,x,y) < sbw->scrollbar.thickness) { -+ /* handle first arrow zone */ -+ call_data = -MAX (A_FEW_PIXELS, sbw->scrollbar.length / 20); -+ XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -+ /* establish autoscroll */ -+ sbw->scrollbar.timer_id = -+ XtAppAddTimeOut (XtWidgetToApplicationContext (w), -+ (unsigned long) 300, RepeatNotify, (XtPointer)w); -+ sbw->scrollbar.direction = 'B'; -+ } else if (PICKLENGTH (sbw,x,y) > sbw->scrollbar.length - sbw->scrollbar.thickness) { -+ /* handle last arrow zone */ -+ call_data = MAX (A_FEW_PIXELS, sbw->scrollbar.length / 20); -+ XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -+ /* establish autoscroll */ -+ sbw->scrollbar.timer_id = -+ XtAppAddTimeOut (XtWidgetToApplicationContext (w), -+ (unsigned long) 300, RepeatNotify, (XtPointer)w); -+ sbw->scrollbar.direction = 'F'; -+ } else if (PICKLENGTH (sbw, x, y) < sbw->scrollbar.topLoc) { -+ /* handle zone "above" the thumb */ -+ call_data = - sbw->scrollbar.length; -+ XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -+ } else if (PICKLENGTH (sbw, x, y) > sbw->scrollbar.topLoc + sbw->scrollbar.shownLength) { -+ /* handle zone "below" the thumb */ -+ call_data = sbw->scrollbar.length; -+ XtCallCallbacks (w, XtNscrollProc, (XtPointer)(call_data)); -+ } else -+ { -+ /* handle the thumb in the motion notify action */ -+ } -+ } else { /* XAW_ARROW_SCROLLBARS */ -+ char style; - -- case 'F': -- case 'f': -- XtCallCallbacks (w, XtNscrollProc, (XtPointer)call_data); -- break; -+ if (sbw->scrollbar.direction == 0) -+ /* Either we haven't yet done StartScoll, or w've already done -+ an EndScroll (e.g: Btn1Down, Btn2Down, Btn2up, Btn1up). */ -+ return; -+ if (LookAhead (w, event)) return; -+ if (*num_params > 0) -+ style = *params[0]; -+ else -+ style = 'P'; -+ -+ switch (style) { -+ case 'P': /* Proportional */ -+ case 'p': -+ ExtractPosition (event, &x, &y); -+ call_data = -+ InRange (PICKLENGTH (sbw, x, y), 0, (int) sbw->scrollbar.length); -+ break; -+ -+ /* case 'F': /\* FullLength *\/ -+ * case 'f': */ -+ default: -+ call_data = sbw->scrollbar.length; -+ break; -+ } - -- case 'C': -- case 'c': -- /* NotifyThumb has already called the thumbProc(s) */ -- break; -- } -+ switch (sbw->scrollbar.direction) { -+ case 'B': -+ case 'b': -+ call_data = -call_data; -+ /* fall through */ -+ -+ case 'F': -+ case 'f': -+ XtCallCallbacks (w, XtNscrollProc, (XtPointer)call_data); -+ break; -+ -+ case 'C': -+ case 'c': -+ /* NotifyThumb has already called the thumbProc(s) */ -+ break; -+ } -+ } /* XAW_ARROW_SCROLLBARS */ - } --#endif /* XAW_ARROW_SCROLLBARS */ - - /* ARGSUSED */ - static void EndScroll(w, event, params, num_params ) -@@ -1000,23 +1008,18 @@ - { - ScrollbarWidget sbw = (ScrollbarWidget) w; - --#ifdef XAW_ARROW_SCROLLBARS -- sbw->scrollbar.scroll_mode = 0; -- /* no need to remove any autoscroll timeout; it will no-op */ -- /* because the scroll_mode is 0 */ -- /* but be sure to remove timeout in destroy proc */ --#else - XtVaSetValues (w, XtNcursor, sbw->scrollbar.inactiveCursor, NULL); - XFlush (XtDisplay (w)); - sbw->scrollbar.direction = 0; --#endif -+ /* no need to remove any autoscroll timeout; it will no-op */ -+ /* because the direction is 0 */ -+ /* but be sure to remove timeout in destroy proc */ - } - - static float FractionLoc (sbw, x, y) - ScrollbarWidget sbw; - int x, y; - { -- float result; - int margin; - float height, width; - -@@ -1025,8 +1028,7 @@ - y -= margin; - height = sbw->core.height - 2 * margin; - width = sbw->core.width - 2 * margin; -- result = PICKLENGTH (sbw, x / width, y / height); -- return FloatInRange(result, 0.0, 1.0); -+ return PICKLENGTH (sbw, x / width, y / height); - } - - -@@ -1038,42 +1040,34 @@ - { - ScrollbarWidget sbw = (ScrollbarWidget) w; - Position x, y; -- float loc, t, s; -+ float loc; - --#ifndef XAW_ARROW_SCROLLBARS -- if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ --#endif -+ if (!sbw->scrollbar.arrows) -+ if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ - - if (LookAhead (w, event)) return; - - if (!event->xmotion.same_screen) return; - - ExtractPosition (event, &x, &y); -- loc = FractionLoc (sbw, x, y); -- t = sbw->scrollbar.top; -- s = sbw->scrollbar.shown; --#ifdef XAW_ARROW_SCROLLBARS -- if (sbw->scrollbar.scroll_mode != 2 ) -- /* initialize picked position */ -- sbw->scrollbar.picked = (FloatInRange( loc, t, t + s ) - t); --#else -- sbw->scrollbar.picked = 0.5 * s; --#endif -- if (sbw->scrollbar.pick_top) -- sbw->scrollbar.top = loc; -- else { -- sbw->scrollbar.top = loc - sbw->scrollbar.picked; -- if (sbw->scrollbar.top < 0.0) sbw->scrollbar.top = 0.0; -+ -+ if (sbw->scrollbar.direction != 'C') { -+ /* initialize picked position offset */ -+ sbw->scrollbar.picked -+ = sbw->scrollbar.pick_top ? 0 -+ : FractionLoc (sbw, x, y) - sbw->scrollbar.top; - } - -+ loc = FractionLoc (sbw, x, y) - sbw->scrollbar.picked; -+ -+ sbw->scrollbar.top = FloatInRange (loc, 0.0, 1.0); -+ - #if 0 - /* this breaks many text-line scrolls */ - if (sbw->scrollbar.top + sbw->scrollbar.shown > 1.0) - sbw->scrollbar.top = 1.0 - sbw->scrollbar.shown; - #endif --#ifdef XAW_ARROW_SCROLLBARS -- sbw->scrollbar.scroll_mode = 2; /* indicate continuous scroll */ --#endif -+ sbw->scrollbar.direction = 'C'; /* indicate continuous scroll */ - PaintThumb (sbw, event); - XFlush (XtDisplay (w)); /* re-draw it before Notifying */ - } -@@ -1089,9 +1083,8 @@ - register ScrollbarWidget sbw = (ScrollbarWidget) w; - float top = sbw->scrollbar.top; - --#ifndef XAW_ARROW_SCROLLBARS -- if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ --#endif -+ if (!sbw->scrollbar.arrows) -+ if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ - - if (LookAhead (w, event)) return; - -@@ -1152,12 +1145,6 @@ - w,top,shown); - #endif - --#ifdef XAW_ARROW_SCROLLBARS -- if (sbw->scrollbar.scroll_mode == (char) 2) return; /* if still thumbing */ --#else -- if (sbw->scrollbar.direction == 'c') return; /* if still thumbing */ --#endif -- - sbw->scrollbar.top = (top > 1.0) ? 1.0 : - (top >= 0.0) ? top : sbw->scrollbar.top; - -Index: Scrollbar.h -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/Scrollbar.h,v -retrieving revision 1.1.1.5 -retrieving revision 1.2 -diff -u -r1.1.1.5 -r1.2 ---- Scrollbar.h 25 Mar 2005 18:08:51 -0000 1.1.1.5 -+++ Scrollbar.h 25 Mar 2005 22:41:01 -0000 1.2 -@@ -116,10 +116,12 @@ - #define XtCShown "Shown" - #define XtCTopOfThumb "TopOfThumb" - #define XtCPickTop "PickTop" -+#define XtCArrowScrollbars "ArrowScrollbars" - - #define XtNminimumThumb "minimumThumb" - #define XtNtopOfThumb "topOfThumb" - #define XtNpickTop "pickTop" -+#define XtNarrowScrollbars "arrowScrollbars" - - typedef struct _ScrollbarRec *ScrollbarWidget; - typedef struct _ScrollbarClassRec *ScrollbarWidgetClass; -Index: ScrollbarP.h -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/ScrollbarP.h,v -retrieving revision 1.1.1.6 -retrieving revision 1.2 -diff -u -r1.1.1.6 -r1.2 ---- ScrollbarP.h 25 Mar 2005 18:12:04 -0000 1.1.1.6 -+++ ScrollbarP.h 25 Mar 2005 22:41:01 -0000 1.2 -@@ -70,14 +70,12 @@ - XtCallbackList thumbProc; /* jump (to position) scroll */ - XtCallbackList jumpProc; /* same as thumbProc but pass data by ref */ - Pixmap thumb; /* thumb color */ --#ifndef XAW_ARROW_SCROLLBARS - Cursor upCursor; /* scroll up cursor */ - Cursor downCursor; /* scroll down cursor */ - Cursor leftCursor; /* scroll left cursor */ - Cursor rightCursor; /* scroll right cursor */ - Cursor verCursor; /* scroll vertical cursor */ - Cursor horCursor; /* scroll horizontal cursor */ --#endif - float top; /* What percent is above the win's top */ - float shown; /* What percent is shown in the win */ - Dimension length; /* either height or width */ -@@ -87,18 +85,16 @@ - * when scrolling starts */ - - /* private */ --#ifdef XAW_ARROW_SCROLLBARS -- XtIntervalId timer_id; /* autorepeat timer; remove on destruction */ -- char scroll_mode; /* 0:none 1:up/back 2:track 3:down/forward */ --#else - Cursor inactiveCursor; /* the normal cursor for scrollbar */ -- char direction; /* a scroll has started; which direction */ --#endif -+ char direction; /* 0:none, C:drag, F:down/forw, B:up/back */ - GC gc; /* a (shared) gc */ - Position topLoc; /* Pixel that corresponds to top */ - Dimension shownLength; /* Num pixels corresponding to shown */ - Boolean pick_top; /* pick thumb at top or anywhere*/ -+ Boolean arrows; /* Whether it has arrows at the end. */ - -+ /* Only used for arrow-scrollbars. */ -+ XtIntervalId timer_id; /* autorepeat timer; remove on destruction */ - } ScrollbarPart; - - typedef struct _ScrollbarRec { -Index: Text.c -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/Text.c,v -retrieving revision 1.1.1.10 -retrieving revision 1.2 -diff -u -r1.1.1.10 -r1.2 ---- Text.c 25 Mar 2005 18:12:05 -0000 1.1.1.10 -+++ Text.c 27 Mar 2005 13:53:38 -0000 1.2 -@@ -1462,10 +1462,8 @@ - if (height < 1) - height = 1; - nlines = (int) (lines * (int) ctx->text.lt.lines) / height; --#ifdef XAW_ARROW_SCROLLBARS - if (nlines == 0 && lines != 0) - nlines = lines > 0 ? 1 : -1; --#endif - _XawTextPrepareToUpdate(ctx); - _XawTextVScroll(ctx, nlines); - _XawTextExecuteUpdate(ctx); -Index: Xaw3dP.h.sed -=================================================================== -RCS file: /u/monnier/cvsroot/Xaw3d/Xaw3dP.h.sed,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -r1.1.1.1 -r1.2 ---- Xaw3dP.h.sed 25 Mar 2005 18:12:06 -0000 1.1.1.1 -+++ Xaw3dP.h.sed 27 Mar 2005 13:53:38 -0000 1.2 -@@ -36,7 +36,6 @@ - /* I18n support */ - /* XPM support */ - /* gray stipples */ --/* arrow scrollbars */ - - #ifndef XtX - #define XtX(w) (((RectObj)w)->rectangle.x) diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/libXaw3d/Makefile similarity index 55% rename from x11-toolkits/Xaw3d/Makefile rename to x11-toolkits/libXaw3d/Makefile index 2a973b3622e6..d97b43939760 100644 --- a/x11-toolkits/Xaw3d/Makefile +++ b/x11-toolkits/libXaw3d/Makefile @@ -1,19 +1,16 @@ # Created by: asami -PORTNAME= Xaw3d -PORTVERSION= 1.5E -PORTREVISION= 8 +PORTNAME= libXaw3d +DISTVERSION= 1.6.3 CATEGORIES= x11-toolkits -MASTER_SITES= http://slackware.cs.utah.edu/pub/slackware/slackware64-13.1/source/x/xaw3d/ MAINTAINER= ports@FreeBSD.org COMMENT= 3-D Athena Widget set that looks like Motif LICENSE= MIT -WRKSRC= ${WRKDIR}/xc/lib/Xaw3d -USES= gettext imake xorg -USE_XORG= x11 xext xmu xt sm ice xpm +USES= gettext libtool pkgconfig xorg xorg-cat:lib +USE_XORG= ice sm x11 xext xmu xpm xt USE_LDCONFIG= yes SUB_FILES= pkg-message @@ -29,8 +26,4 @@ post-extract: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libXaw3d.so -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${STAGEDIR}${DOCSDIR}/ - .include diff --git a/x11-toolkits/libXaw3d/distinfo b/x11-toolkits/libXaw3d/distinfo new file mode 100644 index 000000000000..51650bbcb9a9 --- /dev/null +++ b/x11-toolkits/libXaw3d/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1647095293 +SHA256 (xorg/lib/libXaw3d-1.6.3.tar.bz2) = 2dba993f04429ec3d7e99341e91bf46be265cc482df25963058c15f1901ec544 +SIZE (xorg/lib/libXaw3d-1.6.3.tar.bz2) = 561594 diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/libXaw3d/files/pkg-message.in similarity index 100% rename from x11-toolkits/Xaw3d/files/pkg-message.in rename to x11-toolkits/libXaw3d/files/pkg-message.in diff --git a/x11-toolkits/Xaw3d/pkg-descr b/x11-toolkits/libXaw3d/pkg-descr similarity index 100% rename from x11-toolkits/Xaw3d/pkg-descr rename to x11-toolkits/libXaw3d/pkg-descr diff --git a/x11-toolkits/Xaw3d/pkg-plist b/x11-toolkits/libXaw3d/pkg-plist similarity index 94% rename from x11-toolkits/Xaw3d/pkg-plist rename to x11-toolkits/libXaw3d/pkg-plist index 0a736a91fb55..514dabef50cf 100644 --- a/x11-toolkits/Xaw3d/pkg-plist +++ b/x11-toolkits/libXaw3d/pkg-plist @@ -1,6 +1,3 @@ -lib/libXaw3d.a -lib/libXaw3d.so -lib/libXaw3d.so.8 include/X11/Xaw3d/AllWidgets.h include/X11/Xaw3d/AsciiSink.h include/X11/Xaw3d/AsciiSinkP.h @@ -56,9 +53,6 @@ include/X11/Xaw3d/SmeThreeD.h include/X11/Xaw3d/SmeThreeDP.h include/X11/Xaw3d/StripCharP.h include/X11/Xaw3d/StripChart.h -include/X11/Xaw3d/Template.c -include/X11/Xaw3d/Template.h -include/X11/Xaw3d/TemplateP.h include/X11/Xaw3d/Text.h include/X11/Xaw3d/TextP.h include/X11/Xaw3d/TextSink.h @@ -79,4 +73,9 @@ include/X11/Xaw3d/ViewportP.h include/X11/Xaw3d/Xaw3dP.h include/X11/Xaw3d/XawImP.h include/X11/Xaw3d/XawInit.h -%%PORTDOCS%%share/doc/Xaw3d/README.XAW3D +lib/libXaw3d.a +lib/libXaw3d.so +lib/libXaw3d.so.8 +lib/libXaw3d.so.8.0.0 +libdata/pkgconfig/xaw3d.pc +%%PORTDOCS%%%%DOCSDIR%%/README.XAW3D diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile index e31d6fe07490..236e0cea62e9 100644 --- a/x11-toolkits/mowitz/Makefile +++ b/x11-toolkits/mowitz/Makefile @@ -9,7 +9,7 @@ MASTER_SITES= http://siag.nu/pub/mowitz/ MAINTAINER= mi@aldan.algebra.com COMMENT= Mowitz ("More widgets") library -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= libtool xorg USE_XORG= ice sm x11 xaw xext xmu xpm xt diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile index 832b1020f6f1..2bab60ba1d57 100644 --- a/x11/libsx/Makefile +++ b/x11/libsx/Makefile @@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Simple X11 library -LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d USES= tar:Z xorg USE_XORG= x11 xaw xext xmu xt diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile index 9678345bc822..00a4d85033f6 100644 --- a/x11/xterm/Makefile +++ b/x11/xterm/Makefile @@ -72,7 +72,7 @@ WCHAR_CONFIGURE_ENABLE= wide-chars WCHAR_VARS= PKGMESSAGE="${PKGDIR}/pkg-message.wchar" XAW3DXFT_LIB_DEPENDS= libXaw3dxft.so:x11-toolkits/libxaw3dxft XAW3DXFT_CONFIGURE_WITH= Xaw3dxft -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XAW3D_CONFIGURE_WITH= Xaw3d XAW_USE= XORG=xaw XINERAMA_USE= XORG=xinerama,xorgproto diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile index afe6ecb5763b..0d6941c64ee6 100644 --- a/x11/xvkbd/Makefile +++ b/x11/xvkbd/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS GNU_CONFIGURE= yes XAW3D_DESC= Xaw3d widget library support -XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d XTEST_DESC= XTEST extensions support XTEST_USES= xorg XTEST_USE= xorg=xtst -- 2.35.1