Fix on powerpc. Patches provided by Andrew Cagney <cagney@tpgi.com.au>

in PR pkg/12803 and integrated by me.  It also now compiles on alpha but
segfaults there so change the broken message accordingly.

9 files changed, 470 insertions, 42 deletions

diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index a995fc138b2..0170fcd417a 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/03/22 14:29:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/02 21:46:09 dmcmahill Exp $
 # $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
 #
 
@@ -13,7 +13,7 @@ COMMENT=		OpenLook Toolkit libs, includes, and man pages
 DEPENDS=		xview-config>=3.2.1nb2:../../x11/xview-config
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-NOT_FOR_PLATFORM=       *-*-alpha       # broken va_arg handling.
+#NOT_FOR_PLATFORM=       *-*-alpha       # broken va_arg handling.
 
 USE_IMAKE=		# defined
 
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index a5d27ccf632..600b602ee63 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:08:01 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 21:46:09 dmcmahill Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
 SHA1 (patch-aa) = 4cf1c3f9956ba134f6fa9cc200a6ff3ca909dd1a
 SHA1 (patch-ab) = 6be2df532fd7c45295a63d541e7c2ea7b4e05ef9
 SHA1 (patch-ac) = 743122cc518d3fb0bde26fe15115e09a51972811
-SHA1 (patch-ad) = afbe600772cfb79cdf792313c94a512949875bcb
+SHA1 (patch-ad) = d04e53681cfec0195483477713ee8c23f5dea876
 SHA1 (patch-ae) = 487e031de5a7fd5a87b77906baf52958029618c2
 SHA1 (patch-af) = 566fbcd79befbd4e76e55a2ba9a314e0694b8ce6
 SHA1 (patch-ag) = 35c93445b7d4b6026ce10499e2618ab90a4893ad
@@ -20,3 +20,8 @@ SHA1 (patch-ap) = 1fffed3db2dd87d0cc8ab37ce27f1bd4c9e688e6
 SHA1 (patch-aq) = 83f956c1ddb8247974e50b3e25de6c9dbdc8920b
 SHA1 (patch-ar) = 14ba128cb87204c7a598f072c05efedd8222abc0
 SHA1 (patch-as) = 921246ec18295d302153699c93236a7248cbbd6b
+SHA1 (patch-at) = f3d2d2882fba49f56f938b9bfafb36536996b0b6
+SHA1 (patch-au) = 9650ee87880b33897441163acd15d94ae55b3f83
+SHA1 (patch-av) = 2468b7f58eefc7ba9b12987667b5c68b1159b778
+SHA1 (patch-aw) = 0cdec09fb4066373db384331f56cf95a8b31b003
+SHA1 (patch-ax) = 613f99d1034a31b4dbbdecc9866b7bb766084e22
diff --git a/x11/xview-lib/patches/patch-ad b/x11/xview-lib/patches/patch-ad
index 2141cd9ef5a..887aa1390ca 100644
--- a/x11/xview-lib/patches/patch-ad
+++ b/x11/xview-lib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2000/06/16 14:16:54 pooka Exp $
+$NetBSD: patch-ad,v 1.7 2001/05/02 21:46:09 dmcmahill Exp $
 
 diff -rc ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c ./lib/libxview/attr/attr_copy.c
 *** ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c	Tue Jun 29 01:14:35 1993
@@ -1346,26 +1346,6 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_get.c ./lib/libxview/panel
   
   #define MAX_NEGATIVE_SHRINK 2000
   #define SHRINK_MARGIN       4
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_list.c ./lib/libxview/panel/p_list.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_list.c	Tue Jun 29 01:16:48 1993
---- ./lib/libxview/panel/p_list.c	Sun Nov 20 13:39:07 1994
-***************
-*** 3789,3795 ****
-  
-      /* weigh timeval's against multiclick-timeout resource */
-      is_multiclick = panel_is_multiclick(ip->panel, 
-! 					dp->last_click_row->click_time,
-  					&event_time(event)
-  					);
-  
---- 3789,3795 ----
-  
-      /* weigh timeval's against multiclick-timeout resource */
-      is_multiclick = panel_is_multiclick(ip->panel, 
-! 					&dp->last_click_row->click_time,
-  					&event_time(event)
-  					);
-  
 diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_set.c ./lib/libxview/panel/p_set.c
 *** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_set.c	Tue Jun 29 01:16:59 1993
 --- ./lib/libxview/panel/p_set.c	Sun Nov 20 13:39:07 1994
diff --git a/x11/xview-lib/patches/patch-at b/x11/xview-lib/patches/patch-at
new file mode 100644
index 00000000000..572752539a8
--- /dev/null
+++ b/x11/xview-lib/patches/patch-at
@@ -0,0 +1,63 @@
+$NetBSD: patch-at,v 1.1 2001/05/02 21:46:09 dmcmahill Exp $
+
+--- ./lib/libxview/color/cms_pblc.c.nbsd	Sat Apr 28 14:01:37 2001
++++ ./lib/libxview/color/cms_pblc.c	Sat Apr 28 14:35:42 2001
+@@ -316,14 +316,13 @@
+ {
+     Cms_info		*cms = CMS_PRIVATE(cms_public);
+     Xv_opaque		value;
+-    Attr_avlist     	avlist = (Attr_avlist) args;
+     int			cms_status = 0;
+ 
+     switch (attr) {
+       case CMS_PIXEL: {
+ 	  unsigned long    index;
+ 	  
+-	  index = (unsigned long)avlist[0];
++	  index = (unsigned long)va_arg(args, Attr_attribute);
+ 	  if (index >= cms->size) {
+ 	      index = cms->size - 1;
+ 	  } else if (index < 0) {
+@@ -397,30 +396,28 @@
+ 	value = (Xv_opaque)cms->cmap->id;
+ 	break;
+ 	
+-      case CMS_COLORS:  
+-	if (cms_get_colors(cms, (unsigned long)0, cms->size, 
+-			   (Xv_singlecolor *)avlist[0], (XColor *)NULL,
+-			   (unsigned char *)NULL, (unsigned char *)NULL,
+-			   (unsigned char *)NULL) == XV_OK) {
+-	    value = (Xv_opaque)avlist[0];
+-	} else {
++      case CMS_COLORS:
++	value = (Xv_opaque)va_arg(args,Attr_attribute);
++	if (!cms_get_colors(cms, (unsigned long)0, cms->size, 
++			    value, (XColor *)NULL,
++			    (unsigned char *)NULL, (unsigned char *)NULL,
++			    (unsigned char *)NULL) == XV_OK) {
+ 	    value = NULL;
+ 	}
+ 	break;
+ 	
+       case CMS_X_COLORS:  
+-	if (cms_get_colors(cms, (unsigned long)0, cms->size, 
+-			   (Xv_singlecolor *)NULL, (XColor *)avlist[0],
+-			   (unsigned char *)NULL, (unsigned char *)NULL,
+-			   (unsigned char *)NULL) == XV_OK) {
+-	    value = (Xv_opaque)avlist[0];
+-	} else {
++	value = (Xv_opaque)va_arg(args, Attr_attribute);
++	if (!cms_get_colors(cms, (unsigned long)0, cms->size, 
++			    (Xv_singlecolor *)NULL, value,
++			    (unsigned char *)NULL, (unsigned char *)NULL,
++			    (unsigned char *)NULL) == XV_OK) {
+ 	    value = NULL;
+ 	}
+ 	break;
+ 	
+       case CMS_CMS_DATA: {
+-	  Xv_cmsdata	    *cms_data = (Xv_cmsdata *)avlist[0];
++	  Xv_cmsdata *cms_data = (Xv_cmsdata *)va_arg(args,Attr_attribute);
+ 	  
+ 	  cms_data->type = cms->type;
+ 	  cms_data->size = cms->size;
diff --git a/x11/xview-lib/patches/patch-au b/x11/xview-lib/patches/patch-au
new file mode 100644
index 00000000000..9818fcafb31
--- /dev/null
+++ b/x11/xview-lib/patches/patch-au
@@ -0,0 +1,34 @@
+$NetBSD: patch-au,v 1.1 2001/05/02 21:46:09 dmcmahill Exp $
+
+--- ./lib/libxview/font/font_get.c.nbsd	Sat Apr 28 21:26:26 2001
++++ ./lib/libxview/font/font_get.c	Sat Apr 28 21:30:27 2001
+@@ -43,7 +43,6 @@
+     XFontStruct		*x_font_info = (XFontStruct *)font->x_font_info;
+     Xv_opaque       v;
+     int             attr_is_char_width = 0;
+-    Attr_avlist     avlist = (Attr_avlist) args;
+ 
+ #ifdef OW_I18N
+     if (font->type == FONT_TYPE_TEXT)  {
+@@ -138,8 +137,8 @@
+ 	}
+ 
+       case FONT_STRING_DIMS:{
+-	    char           *string = (char *) avlist[0];
+-	    Font_string_dims *size = (Font_string_dims *) avlist[1];
++	    char *string = (char *)va_arg(args, Attr_attribute);
++	    Font_string_dims *size = (Font_string_dims *)va_arg(args, Attr_attribute);
+ 	    struct pr_size  my_pf_size;
+ 	    if (string) {
+ 		my_pf_size = xv_pf_textwidth(strlen(string), font_public, string);
+@@ -264,8 +263,8 @@
+ 
+ #ifdef OW_I18N
+       case FONT_STRING_DIMS_WC:{
+-            wchar_t             *ws = (wchar_t *) avlist[0];
+-            Font_string_dims    *size = (Font_string_dims *) avlist[1];
++            wchar_t *ws = (wchar_t *) va_arg(args, Attr_attribute);
++            Font_string_dims *size = (Font_string_dims *) va_arg(args, Attr_attribute);
+             struct pr_size      my_pf_size;
+ 
+             if (ws) {
diff --git a/x11/xview-lib/patches/patch-av b/x11/xview-lib/patches/patch-av
new file mode 100644
index 00000000000..8013a4ac91f
--- /dev/null
+++ b/x11/xview-lib/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2001/05/02 21:46:09 dmcmahill Exp $
+
+--- ./lib/libxview/notice/notice_get.c.nbsd	Sat Apr 28 21:34:01 2001
++++ ./lib/libxview/notice/notice_get.c	Sat Apr 28 21:34:44 2001
+@@ -29,7 +29,6 @@
+ va_list			valist;
+ {
+     Notice_info	*notice = NOTICE_PRIVATE(notice_public);
+-    Attr_avlist     avlist = (Attr_avlist) valist;
+     Xv_opaque	v = (Xv_opaque)NULL;
+ 
+     switch (attr)  {
diff --git a/x11/xview-lib/patches/patch-aw b/x11/xview-lib/patches/patch-aw
new file mode 100644
index 00000000000..0929cc11261
--- /dev/null
+++ b/x11/xview-lib/patches/patch-aw
@@ -0,0 +1,67 @@
+$NetBSD: patch-aw,v 1.1 2001/05/02 21:46:09 dmcmahill Exp $
+
+--- lib/libxview/panel/p_list.c.orig	Tue May  1 21:23:17 2001
++++ lib/libxview/panel/p_list.c	Tue May  1 21:23:24 2001
+@@ -1240,5 +1240,5 @@
+ 
+       case PANEL_ITEM_NTH_WINDOW:
+-	if (*(int *) valist == 0)
++	if (va_arg(valist, int *) == 0)
+ 	    return (Xv_opaque) dp->list_sb;
+ 	else
+@@ -1267,5 +1267,5 @@
+ 
+       case PANEL_LIST_SELECTED:
+-	row = *(int *) valist;
++	row = *va_arg(valist, int *);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->f.selected : (Xv_opaque) XV_ERROR);
+@@ -1279,5 +1279,5 @@
+ 	
+       case PANEL_LIST_NEXT_SELECTED:
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	if (!node)
+@@ -1290,5 +1290,5 @@
+ 
+       case PANEL_LIST_CLIENT_DATA:
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->client_data : (Xv_opaque) XV_ERROR);
+@@ -1298,5 +1298,5 @@
+       case PANEL_LIST_STRING_WCS:
+ #endif
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ #ifdef OW_I18N
+@@ -1313,5 +1313,5 @@
+ 
+       case PANEL_LIST_GLYPH:
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->glyph : (Xv_opaque) XV_ERROR);
+@@ -1329,5 +1329,5 @@
+ 
+       case PANEL_LIST_FONT:
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->font : (Xv_opaque) XV_ERROR);
+@@ -1353,5 +1353,5 @@
+ 
+     case PANEL_LIST_INACTIVE:
+-	row = *(int *) valist;
++        row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->f.row_inactive : (Xv_opaque) XV_ERROR);
+@@ -1408,5 +1408,5 @@
+ 
+     case PANEL_LIST_EXTENSION_DATA:
+-	row = *(int *) valist;
++	row = va_arg(valist, int);
+ 	node = find_or_create_nth_row(dp, row, FALSE);
+ 	return (node ? (Xv_opaque) node->exten_data : (Xv_opaque) XV_ERROR);
diff --git a/x11/xview-lib/patches/patch-ax b/x11/xview-lib/patches/patch-ax
new file mode 100644
index 00000000000..b839c008767
--- /dev/null
+++ b/x11/xview-lib/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2001/05/02 21:46:09 dmcmahill Exp $
+
+--- ./lib/libxview/panel/p_mlinetxt.c.nbsd	Sat Apr 28 21:49:11 2001
++++ ./lib/libxview/panel/p_mlinetxt.c	Sat Apr 28 21:49:49 2001
+@@ -449,7 +449,7 @@
+ 	return (Xv_opaque) dp->rows_displayed;
+ 
+       case PANEL_ITEM_NTH_WINDOW:
+-	switch (*(int *) valist) {
++	switch (va_arg(valist, int)) {
+ 	  case 0:
+ 	    return dp->view;
+ 	  case 1:
diff --git a/x11/xview-lib/pkg/PLIST b/x11/xview-lib/pkg/PLIST
index 7c65a401070..d9d7a6d1709 100644
--- a/x11/xview-lib/pkg/PLIST
+++ b/x11/xview-lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:11:04 agc Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/05/02 21:46:09 dmcmahill Exp $
 include/bitmaps/1x1
 include/bitmaps/2x2
 include/bitmaps/black
@@ -75,23 +75,267 @@ include/bitmaps/xlogo11
 include/bitmaps/xlogo16
 include/bitmaps/xlogo32
 include/bitmaps/xlogo64
+include/images/PSdoc.icon
+include/images/abc.pr
+include/images/abstk.pr
+include/images/abstk_up.pr
+include/images/alert_bang32.pr
+include/images/alert_qmark32.pr
+include/images/basic_cursor.pr
+include/images/basic_text_cursor.pr
 include/images/bg1.xbm
 include/images/bg2.xbm
 include/images/bg3.xbm
+include/images/bind.icon
+include/images/black.cursor
+include/images/black.icon
+include/images/blank.pr
+include/images/boggle.icon
+include/images/box.pr
+include/images/bullseye.cursor
+include/images/busy.cursor
+include/images/button_stack.pr
+include/images/calctool.icon
+include/images/canfield.icon
+include/images/canvas_demo.icon
+include/images/cardback.icon
+include/images/chess.clock.icon
+include/images/chesstool.icon
+include/images/choice_12_off.pr
+include/images/choice_12_on.pr
+include/images/choice_14_off.pr
+include/images/choice_14_on.pr
+include/images/choice_16_off.pr
+include/images/choice_16_on.pr
+include/images/choice_19_off.pr
+include/images/choice_19_on.pr
+include/images/choice_24_off.pr
+include/images/choice_24_on.pr
+include/images/choice_32_off.pr
+include/images/choice_32_on.pr
+include/images/choice_stack.pr
+include/images/circle.pr
+include/images/circle_0.pr
+include/images/circle_25.pr
+include/images/circle_50.pr
+include/images/circle_75.pr
+include/images/circle_black.pr
+include/images/circle_root.pr
+include/images/clock.icon
+include/images/clock.rom.icon
+include/images/cmdtool.icon
+include/images/cmdtool_mask.icon
+include/images/cmrb14.pr
+include/images/cmrr14.pr
+include/images/compose.icon
+include/images/compress.icon
+include/images/confirm.cursor
+include/images/confirm.pr
+include/images/confirm_left.pr
+include/images/confirm_middle.pr
+include/images/confirm_right.pr
+include/images/copy.cursor
+include/images/copy_cursor.pr
+include/images/copyletter.cursor
+include/images/copyletter.pr
+include/images/copyletters.cursor
+include/images/copyletters.pr
+include/images/core_eye.icon
+include/images/coredoc.icon
+include/images/cursor_demo.icon
+include/images/cycle.pr
+include/images/dbxtool.icon
+include/images/dead.icon
 include/images/default.icon
+include/images/default_pin_out.pr
+include/images/defaultsedit.icon
+include/images/dos.icon
+include/images/down_arrow.pr
+include/images/down_button_10.pr
+include/images/down_button_12.pr
+include/images/down_button_14.pr
+include/images/down_button_19.pr
+include/images/draw.icon
+include/images/drawdoc.icon
+include/images/dup.cursor
 include/images/dup_cursor.pr
+include/images/empty_letter.icon
+include/images/equal.icon
+include/images/filemgr.icon
 include/images/fl_arrow.xbm
 include/images/fl_doc.xbm
 include/images/fl_folder.xbm
+include/images/fm_clock.icon
+include/images/fm_cmdtool.icon
+include/images/fm_dbxtool.icon
+include/images/fm_fontedit.icon
+include/images/fm_iconedit.icon
+include/images/fm_mailtool.icon
+include/images/fm_textedit.icon
+include/images/fm_traffic.icon
 include/images/focus_right.cursor
 include/images/focus_up.cursor
+include/images/folder.pr
+include/images/fontdoc.icon
+include/images/fontedit.icon
+include/images/framedoc.icon
+include/images/fv.icon
+include/images/gallant19.pr
+include/images/gallantr19.pr
+include/images/gammon.icon
+include/images/gfxtool.icon
+include/images/glass.cursor
+include/images/gr_25.cursor
+include/images/gr_50.cursor
+include/images/gr_75.cursor
+include/images/gr_root.cursor
+include/images/grey_stencil_50.pr
+include/images/grid.pr
+include/images/hello_world.icon
+include/images/hglass.cursor
+include/images/ibeam.cursor
+include/images/icondoc.icon
+include/images/iconedit.icon
+include/images/indentdefaults.icon
+include/images/jump1.icon
+include/images/jump2.icon
+include/images/jump3.icon
+include/images/jump4.icon
+include/images/jump5.icon
+include/images/jump6.icon
+include/images/k1.pr
+include/images/k2.pr
+include/images/k3.pr
+include/images/k4.pr
+include/images/k5.pr
+include/images/letter.pr
+include/images/letters.pr
+include/images/life.icon
+include/images/line.pr
+include/images/lockscreen.icon
+include/images/mail.icon
+include/images/maildoc.icon
+include/images/mailseen.icon
+include/images/maze.icon
 include/images/mglass.icon
 include/images/mglass_mask.icon
+include/images/mouse_left_hand.pr
+include/images/mouse_left_hand_grey.pr
+include/images/mouse_mid_hand.pr
+include/images/mouse_mid_hand_grey.pr
+include/images/move.cursor
+include/images/move_cursor.pr
+include/images/move_h.cursor
+include/images/move_v.cursor
+include/images/moveletter.cursor
+include/images/moveletter.pr
+include/images/moveletters.cursor
+include/images/moveletters.pr
+include/images/nautilus.icon
+include/images/nomail.icon
+include/images/none.cursor
+include/images/off.pr
+include/images/on.pr
+include/images/overview.icon
+include/images/paintdoc.icon
+include/images/painting_hand.pr
+include/images/panel_button.pr
+include/images/panel_button_arrow.pr
+include/images/panel_check_choice.pr
+include/images/panel_check_off.pr
+include/images/panel_check_on.pr
+include/images/panel_choice_off.pr
+include/images/panel_choice_on.pr
+include/images/panel_choose_many.pr
+include/images/panel_choose_one.pr
+include/images/panel_default_button.pr
+include/images/panel_flush.pr
+include/images/panel_left_arrow.pr
+include/images/panel_menu_on.pr
+include/images/panel_pulldown.pr
+include/images/panel_pullright.pr
+include/images/panel_right_arrow.pr
+include/images/panel_switch.pr
+include/images/panel_text.pr
+include/images/perfmeter.icon
+include/images/pin_in.pr
+include/images/pin_out.pr
+include/images/plus.icon
+include/images/point.pr
+include/images/printer.icon
+include/images/puzzle.icon
 include/images/qmark.cursor
+include/images/quick_move_cursor.pr
+include/images/reply.icon
+include/images/rolo.icon
+include/images/rspeedometer.icon
+include/images/sched.icon
+include/images/screenb12.pr
+include/images/screenb14.pr
+include/images/screenr11.pr
+include/images/screenr12.pr
+include/images/screenr14.pr
+include/images/screenr7.pr
+include/images/scrollbar_demo.icon
+include/images/shine.pr
+include/images/size_pointer.pr
+include/images/snapshot.icon
+include/images/speedometer.icon
+include/images/spreadsheet.icon
+include/images/square_0.pr
 include/images/square_17.pr
 include/images/square_25.pr
+include/images/square_50.pr
 include/images/square_75.pr
+include/images/square_80.pr
+include/images/square_black.pr
+include/images/square_root.pr
+include/images/stretchNE.cursor
+include/images/stretchNW.cursor
+include/images/stretchSE.cursor
+include/images/stretchSW.cursor
+include/images/stretch_h.cursor
+include/images/stretch_v.cursor
+include/images/sun30.icon
+include/images/sundraw.icon
+include/images/sunpaint.icon
+include/images/sunview_manual.icon
+include/images/sunwrite.icon
+include/images/switcher.icon
+include/images/tapetool.icon
+include/images/tektool.icon
+include/images/template.icon
+include/images/terminal.icon
+include/images/terminal_mask.icon
 include/images/text_move_cursor.pr
+include/images/textedit.icon
+include/images/toggle_12_off.pr
+include/images/toggle_12_on.pr
+include/images/toggle_14_off.pr
+include/images/toggle_14_on.pr
+include/images/toggle_16_off.pr
+include/images/toggle_16_on.pr
+include/images/toggle_19_off.pr
+include/images/toggle_19_on.pr
+include/images/toggle_24_off.pr
+include/images/toggle_24_on.pr
+include/images/toggle_32_off.pr
+include/images/toggle_32_on.pr
+include/images/traffic.icon
+include/images/tri_down.pr
+include/images/tri_left.pr
+include/images/tri_right.pr
+include/images/tri_up.pr
+include/images/undelete.image
+include/images/up_button_10.pr
+include/images/up_button_12.pr
+include/images/up_button_14.pr
+include/images/up_button_19.pr
+include/images/vitool.icon
+include/images/white.icon
+include/images/white.pr
+include/images/writedoc.icon
+include/images/xsol.icon
 include/olgx/olgx.h
 include/olgx_private/busy.h
 include/olgx_private/grey.h
@@ -265,13 +509,24 @@ include/xview_private/xv_color.h
 include/xview_private/xv_debug.h
 include/xview_private/xv_list.h
 include/xview_private/xv_path_util.h
-@dirrm include/xview_private
-@dirrm include/xview
-@dirrm include/pixrect
-@dirrm include/olgx_private
-@dirrm include/olgx
-@dirrm include/images
-@dirrm include/bitmaps
+lib/.text_extras_menu
+lib/.textswrc
+lib/.ttyswrc
+@unexec install-info --delete --info-dir=%D/info %D/lib/help/props.info
+lib/help/props.info
+@exec install-info --info-dir=%D/info %D/lib/help/props.info
+@unexec install-info --delete --info-dir=%D/info %D/lib/help/textedit.info
+lib/help/textedit.info
+@exec install-info --info-dir=%D/info %D/lib/help/textedit.info
+@unexec install-info --delete --info-dir=%D/info %D/lib/help/textsw.info
+lib/help/textsw.info
+@exec install-info --info-dir=%D/info %D/lib/help/textsw.info
+@unexec install-info --delete --info-dir=%D/info %D/lib/help/ttysw.info
+lib/help/ttysw.info
+@exec install-info --info-dir=%D/info %D/lib/help/ttysw.info
+@unexec install-info --delete --info-dir=%D/info %D/lib/help/xview.info
+lib/help/xview.info
+@exec install-info --info-dir=%D/info %D/lib/help/xview.info
 lib/libolgx.a
 lib/libolgx.so
 lib/libolgx.so.3
@@ -281,16 +536,15 @@ lib/libxview.sa.3.2
 lib/libxview.so
 lib/libxview.so.3
 lib/libxview.so.3.2
-lib/.text_extras_menu
-lib/.textswrc
-lib/.ttyswrc
 lib/text_extras_menu
 lib/textswrc
 lib/ttyswrc
-lib/help/textsw.info
-lib/help/ttysw.info
-lib/help/xview.info
-lib/help/props.info
-lib/help/textedit.info
-@dirrm lib/help
 man/cat1/xview.0
+@dirrm lib/help
+@dirrm include/xview_private
+@dirrm include/xview
+@dirrm include/pixrect
+@dirrm include/olgx_private
+@dirrm include/olgx
+@dirrm include/images
+@dirrm include/bitmaps