diff options
Diffstat (limited to 'x11/xview-lib')
122 files changed, 0 insertions, 4283 deletions
diff --git a/x11/xview-lib/DESCR b/x11/xview-lib/DESCR deleted file mode 100644 index 221e0a82038..00000000000 --- a/x11/xview-lib/DESCR +++ /dev/null @@ -1,20 +0,0 @@ -What Is XView -------------- -XView (X Window-System-based Visual/Integrated Environment for Workstations) -is a user-interface toolkit to support interactive, graphics-based -applications running under the X Window System. XView provides a set of -pre-built, user-interface objects such as canvases, scrollbars, menus, and -control panels. The appearance and functionality of these objects follow -the OPEN LOOK Graphical User Interface (GUI) specification. XView features -an object-oriented style Application Programmer's Interface (API) that is -straightforward and easy to learn. - -This package contains the libraries, headers and support files -necessary to build XView applications. - -Source Notes ------------- -This version of the XView source corresponds to that provided with -OpenWindows Version 3.2 from SunSoft Inc. Libraries generated with this -source should be interchangeable with those from the OpenWindows Version 3.2 -release. diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile deleted file mode 100644 index 472d14a63df..00000000000 --- a/x11/xview-lib/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# $NetBSD: Makefile,v 1.34 2007/02/22 19:27:30 wiz Exp $ - -DISTNAME= xview3.2p1-X11R6 -PKGNAME= xview-lib-3.2.1 -PKGREVISION= 6 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_LOCAL} - -MAINTAINER= pkgsrc-users@NetBSD.org -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 -# builds, but binaries in../xview-clients all crash -NOT_FOR_PLATFORM= *-*-alpha - -USE_IMAKE= yes - -post-install: - cd ${PREFIX}/lib && ${LN} -fs libolgx.so.3.2 libolgx.so.3 && \ - ${LN} -fs libxview.so.3.2 libxview.so.3 - -.include "../../x11/libX11/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/x11/xview-lib/PLIST b/x11/xview-lib/PLIST deleted file mode 100644 index 2dfb926241b..00000000000 --- a/x11/xview-lib/PLIST +++ /dev/null @@ -1,540 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2003/03/03 04:17:26 jschauma Exp $ -include/bitmaps/1x1 -include/bitmaps/2x2 -include/bitmaps/black -include/bitmaps/boxes -include/bitmaps/calculator -include/bitmaps/cntr_ptr -include/bitmaps/cntr_ptrmsk -include/bitmaps/cross_weave -include/bitmaps/dimple1 -include/bitmaps/dimple3 -include/bitmaps/dot -include/bitmaps/dropbar7 -include/bitmaps/dropbar8 -include/bitmaps/escherknot -include/bitmaps/flagdown -include/bitmaps/flagup -include/bitmaps/flipped_gray -include/bitmaps/gray -include/bitmaps/gray1 -include/bitmaps/gray3 -include/bitmaps/hlines2 -include/bitmaps/hlines3 -include/bitmaps/icon -include/bitmaps/keyboard16 -include/bitmaps/left_ptr -include/bitmaps/left_ptrmsk -include/bitmaps/letters -include/bitmaps/light_gray -include/bitmaps/mailempty -include/bitmaps/mailemptymsk -include/bitmaps/mailfull -include/bitmaps/mailfullmsk -include/bitmaps/mensetmanus -include/bitmaps/menu10 -include/bitmaps/menu12 -include/bitmaps/menu16 -include/bitmaps/menu8 -include/bitmaps/noletters -include/bitmaps/opendot -include/bitmaps/opendotMask -include/bitmaps/plaid -include/bitmaps/right_ptr -include/bitmaps/right_ptrmsk -include/bitmaps/root_weave -include/bitmaps/scales -include/bitmaps/sipb -include/bitmaps/star -include/bitmaps/starMask -include/bitmaps/stipple -include/bitmaps/target -include/bitmaps/terminal -include/bitmaps/tie_fighter -include/bitmaps/txtdup -include/bitmaps/txtdupmask -include/bitmaps/txtdupmore -include/bitmaps/txtdupok -include/bitmaps/txtdupokmask -include/bitmaps/txtdupokmore -include/bitmaps/txtmv -include/bitmaps/txtmvmask -include/bitmaps/txtmvmore -include/bitmaps/txtmvok -include/bitmaps/txtmvokmask -include/bitmaps/txtmvokmore -include/bitmaps/vlines2 -include/bitmaps/vlines3 -include/bitmaps/weird_size -include/bitmaps/wide_weave -include/bitmaps/wierd_size -include/bitmaps/wingdogs -include/bitmaps/woman -include/bitmaps/xfd_icon -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 -include/olgx_private/olgx_impl.h -include/pixrect/bw2var.h -include/pixrect/cg12_var.h -include/pixrect/cg2reg.h -include/pixrect/cg2var.h -include/pixrect/cg3var.h -include/pixrect/cg4var.h -include/pixrect/cg8var.h -include/pixrect/cg9var.h -include/pixrect/gp1cmds.h -include/pixrect/gp1reg.h -include/pixrect/mem32_var.h -include/pixrect/mem_rop_impl_ops.h -include/pixrect/mem_rop_impl_util.h -include/pixrect/memreg.h -include/pixrect/memvar.h -include/pixrect/pixfont.h -include/pixrect/pixrect.h -include/pixrect/pixrect_hs.h -include/pixrect/pr_dblbuf.h -include/pixrect/pr_impl_make.h -include/pixrect/pr_impl_util.h -include/pixrect/pr_io.h -include/pixrect/pr_line.h -include/pixrect/pr_planegroups.h -include/pixrect/pr_util.h -include/pixrect/rasterfile.h -include/pixrect/traprop.h -include/pixrect/tv1var.h -include/xview/alert.h -include/xview/attr.h -include/xview/attrol.h -include/xview/base.h -include/xview/canvas.h -include/xview/cms.h -include/xview/cms_grays.h -include/xview/cms_mono.h -include/xview/cms_rgb.h -include/xview/cmsrainbow.h -include/xview/cursor.h -include/xview/db.h -include/xview/defaults.h -include/xview/dragdrop.h -include/xview/drawable.h -include/xview/expandname.h -include/xview/file_chsr.h -include/xview/file_list.h -include/xview/font.h -include/xview/frame.h -include/xview/fullscreen.h -include/xview/generic.h -include/xview/hist.h -include/xview/icon.h -include/xview/icon_load.h -include/xview/notice.h -include/xview/notify.h -include/xview/openmenu.h -include/xview/openwin.h -include/xview/panel.h -include/xview/path.h -include/xview/pixwin.h -include/xview/pkg.h -include/xview/pkg_public.h -include/xview/rect.h -include/xview/rectlist.h -include/xview/screen.h -include/xview/scrollbar.h -include/xview/sel_attrs.h -include/xview/sel_compat.h -include/xview/sel_pkg.h -include/xview/sel_svc.h -include/xview/selection.h -include/xview/seln.h -include/xview/server.h -include/xview/str_utils.h -include/xview/sun.h -include/xview/svrimage.h -include/xview/termsw.h -include/xview/text.h -include/xview/textsw.h -include/xview/tty.h -include/xview/ttysw.h -include/xview/win_enum.h -include/xview/win_env.h -include/xview/win_event.h -include/xview/win_input.h -include/xview/win_notify.h -include/xview/win_screen.h -include/xview/win_struct.h -include/xview/window.h -include/xview/window_hs.h -include/xview/wmgr.h -include/xview/xv_c_types.h -include/xview/xv_error.h -include/xview/xv_i18n.h -include/xview/xv_version.h -include/xview/xv_xrect.h -include/xview/xview.h -include/xview/xview_xvin.h -include/xview_private/attr_impl.h -include/xview_private/bitmask.h -include/xview_private/charimage.h -include/xview_private/charscreen.h -include/xview_private/cms_impl.h -include/xview_private/cnvs_impl.h -include/xview_private/curs_impl.h -include/xview_private/dndimpl.h -include/xview_private/draw_impl.h -include/xview_private/ei.h -include/xview_private/es.h -include/xview_private/ev.h -include/xview_private/ev_impl.h -include/xview_private/fchsr_impl.h -include/xview_private/filter.h -include/xview_private/finger_tbl.h -include/xview_private/flist_impl.h -include/xview_private/fm_impl.h -include/xview_private/font_impl.h -include/xview_private/frame_base.h -include/xview_private/frame_cmd.h -include/xview_private/frame_help.h -include/xview_private/fs_impl.h -include/xview_private/gen_impl.h -include/xview_private/gettext.h -include/xview_private/hashfn.h -include/xview_private/hist_impl.h -include/xview_private/i18n_impl.h -include/xview_private/icon_impl.h -include/xview_private/io_stream.h -include/xview_private/item_impl.h -include/xview_private/ndet.h -include/xview_private/ndis.h -include/xview_private/nint.h -include/xview_private/noticeimpl.h -include/xview_private/ntfy.h -include/xview_private/ntfy_ctbl.h -include/xview_private/om_impl.h -include/xview_private/omi_impl.h -include/xview_private/ow_impl.h -include/xview_private/p_lst_impl.h -include/xview_private/panel_impl.h -include/xview_private/path_impl.h -include/xview_private/portable.h -include/xview_private/primal.h -include/xview_private/ps_impl.h -include/xview_private/pw_impl.h -include/xview_private/sb_impl.h -include/xview_private/scrn_impl.h -include/xview_private/scrn_vis.h -include/xview_private/sel_impl.h -include/xview_private/seln_impl.h -include/xview_private/site_impl.h -include/xview_private/svr_atom.h -include/xview_private/svr_impl.h -include/xview_private/svr_kmdata.h -include/xview_private/svrim_impl.h -include/xview_private/term_impl.h -include/xview_private/tty_impl.h -include/xview_private/ttyansi.h -include/xview_private/txt_18impl.h -include/xview_private/txt_impl.h -include/xview_private/ultrix_cpt.h -include/xview_private/win_info.h -include/xview_private/win_keymap.h -include/xview_private/windowimpl.h -include/xview_private/wmgr_decor.h -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 -lib/.text_extras_menu -lib/.textswrc -lib/.ttyswrc -lib/help/props.info -lib/help/textedit.info -lib/help/textsw.info -lib/help/ttysw.info -lib/help/xview.info -lib/libolgx.a -lib/libolgx.so -lib/libolgx.so.3 -lib/libolgx.so.3.2 -lib/libxview.a -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 -${IMAKE_MAN_DIR}/xview.${IMAKE_MANNEWSUFFIX} -@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 diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk deleted file mode 100644 index e1c6ebf2f7e..00000000000 --- a/x11/xview-lib/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/12/27 13:37:47 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xview-lib -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxview-lib} -BUILDLINK_PACKAGES+= xview-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xview-lib - -.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1 -BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb6 -BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib -.endif # XVIEW_LIB_BUILDLINK3_MK - -.include "../../x11/libX11/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo deleted file mode 100644 index c4da769f578..00000000000 --- a/x11/xview-lib/distinfo +++ /dev/null @@ -1,122 +0,0 @@ -$NetBSD: distinfo,v 1.10 2006/01/05 18:25:57 joerg Exp $ - -SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a -RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb -Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes -SHA1 (patch-aa) = 8fa528f2569e395fc432c19bc70fd14b16f0f80f -SHA1 (patch-ab) = f119539e73ce6885a9b1ec155e61076ede89b752 -SHA1 (patch-ac) = 56484fc24a4ad8ccbe8067bb703179b3e74582ca -SHA1 (patch-ad) = 7260078b17bb0cc905c626965572b3510259cc42 -SHA1 (patch-ae) = 7cc93ff7a26d1b01518b244c7fb0a0e79d7b4b7c -SHA1 (patch-af) = 87e21efc3f3fe59889136b6ee836fdc49c9edad4 -SHA1 (patch-ag) = 2329e9cb1290f7704e547b328d0e852c7ff56a18 -SHA1 (patch-ah) = 7331c4107005cfc98c6507f62b567f765d56aaff -SHA1 (patch-ai) = 8f1dfe2f952db58f1ce2ddad80efcddc337199b6 -SHA1 (patch-aj) = 9acc575fb736b7c4ec6448cab1f98f1ff00ea34e -SHA1 (patch-ak) = 5c59e967d89e379108feae01f41c349d13188b11 -SHA1 (patch-al) = b5a795c0eef28302276b112ee34feb5dc3fbf460 -SHA1 (patch-am) = e2c403ec892f9da9da910aab95a66298eb98a409 -SHA1 (patch-an) = b918e9d72ba90b1b9099f6610e021c3e85b1e056 -SHA1 (patch-ao) = 07d5522729a526153b8012899f7df03b7b952fd3 -SHA1 (patch-ap) = 5458cd0e65dcca28da727d17494350369ece59f0 -SHA1 (patch-aq) = 7a13c8cd72b88061308fd85033fe53e1b1b6affe -SHA1 (patch-ar) = ebc5412b91216ca3559db9dbbb9f5fe565cf744f -SHA1 (patch-as) = 5fefb12b0c5f087d371f8241b028adedd0810435 -SHA1 (patch-at) = 9f0b508e285e80db49b811441264e7042c5f3c51 -SHA1 (patch-au) = 4be6221b6b3660d5c74c043b7edf8aae946b7148 -SHA1 (patch-av) = fea7e5575fe913dfedbdd1e744ac60b75be737d2 -SHA1 (patch-aw) = e848355e0b704bdf6d726dc00cd4a49353e5eddb -SHA1 (patch-ax) = a286aade16c09dec32698cb175e5cf4634260b25 -SHA1 (patch-ay) = 4ca316c0b53c8624070e9ef106799587cba4dc02 -SHA1 (patch-az) = 45e1f2faa2236ababcdda9543be3eb99ea96a44e -SHA1 (patch-ba) = 146ca5c3717a1000d48042eaf04b3b1e520469cc -SHA1 (patch-bb) = c1e12875a186a54e3ae1b73937dd5138b1d6e369 -SHA1 (patch-bc) = fe68f9c615e18efbead4845c982fd5b45ae6f459 -SHA1 (patch-bd) = 26bf677853829de6e3890a6878f8eb8c5bdd0acb -SHA1 (patch-be) = cae01f00621001d6b6a6f8caa9fefdb23802ce5f -SHA1 (patch-bf) = e9ef8998743584639959d07d811c0f7ba4abec50 -SHA1 (patch-bg) = dc144d4782761aa7b1d2c8bece52a72d374240ef -SHA1 (patch-bh) = 5cbcfc9e39fea96be1bdea67e96fd060c9f8dfae -SHA1 (patch-bi) = 89209c7b2b74468ca3aae5da5363887f156663b8 -SHA1 (patch-bj) = 644f5111266be02bcf2ea1182ec8fafb46c8e377 -SHA1 (patch-bk) = 38e97fcb4ed18d76fd8f910cf4688ca2e87f2642 -SHA1 (patch-bl) = 67598fa0425dd633e86d3c06d03877d99daa4df2 -SHA1 (patch-bm) = ff33e3cc6ba41f3dfddd6b2a22c060625bce8bd9 -SHA1 (patch-bn) = 44a1a7844627cfc933181d19b6116adb4661601d -SHA1 (patch-bo) = 219ad93d0daebcc847c6b63b8727bea2ad2a2880 -SHA1 (patch-bp) = 7d77e6aa2f3decec97a427873bfd4df25f1fe0fe -SHA1 (patch-bq) = f1da72e863f329034ee88ba1cbfefb67bd7b55a9 -SHA1 (patch-br) = 72264dc8bfc46a93a6f77186f6b4e50a94571039 -SHA1 (patch-bs) = cb87cb887804b81d37a734f7aad14471ad99ec51 -SHA1 (patch-bt) = 007ff555e8cea7276b25af708010e25c515a52e9 -SHA1 (patch-bu) = 27e19f44cfc28ab3354c73f9d9463f1a21da9995 -SHA1 (patch-bv) = d5043afd77f21109317e90832c21444f4b2eb61a -SHA1 (patch-bw) = f93122e3f197c2aa97c8ece8e9c70a9c5fbd71e0 -SHA1 (patch-bx) = 6d93a92a9a1d1177061e6e5c5e9c4c49981159f4 -SHA1 (patch-by) = 6046f9f506cf02a03d035b591265c5d3a51f4618 -SHA1 (patch-bz) = 5e7e6798e2316701e79481be5b66a1fe5c40ada1 -SHA1 (patch-ca) = e449576f1a7fd3b25142e6638ec2d5b364547583 -SHA1 (patch-cb) = 477a0f540d0ce8c9f7cf36dcd81f8b31986a3891 -SHA1 (patch-cc) = d7c31dd95bedcc124372e86a08833352a4fde16c -SHA1 (patch-cd) = b524da105d049b06406824582e842f6d4938933b -SHA1 (patch-ce) = 0a4d875d578b51f1ef30eadb0228c0ad5bd44a57 -SHA1 (patch-cf) = 6addd9b52dea9c4646797405904e95853f110635 -SHA1 (patch-cg) = 9c3643e0507a62226447712b1f1173973f6ebd5f -SHA1 (patch-ch) = 4ca1610b5ede24852dec3b3087e48680e3ec1aa2 -SHA1 (patch-ci) = 645b94302a5d6ba09f29bd5e06f321ac388b592a -SHA1 (patch-cj) = 4d95e94699fda4a1ed26dcd63a7acece2ce7623d -SHA1 (patch-ck) = 59b8c342a8bcd32bea0db9003e7da5b7da3d1376 -SHA1 (patch-cl) = 6ada5a7257c2495781c805f55e38d4b2b8bcc323 -SHA1 (patch-cm) = e743e951a0a4b34a60f091df0e37850bc6dde99e -SHA1 (patch-cn) = 86bede62bc40d3213b5e4801f84707bc2088f747 -SHA1 (patch-co) = 8983ff1dbd11907d9399b2cf497d74378291a4df -SHA1 (patch-cp) = d989a4a195622b2aba899d70f1700b602eeb771f -SHA1 (patch-cq) = 3d9022971b371500bdf14f800a7e392beefefee0 -SHA1 (patch-cr) = 025e5607cd3ecbc0c261f473bf0ddb31e9f70265 -SHA1 (patch-cs) = b4b224a0215dc11e20a1e54588d166a29621a997 -SHA1 (patch-ct) = 36d8a2eaeeed831e307e74ccba97007e037b61f2 -SHA1 (patch-cu) = ce19d2151f259e0cb5358a0c4350b391da94cbd9 -SHA1 (patch-cv) = 56fffeff6ca82ca661ee5ef72deb1d328777fb3e -SHA1 (patch-cw) = ab33630d7854e7d93190a37d232ea481fc49159c -SHA1 (patch-cx) = 3df44c86e60ed0e542a6746d04695b7e65adca73 -SHA1 (patch-cy) = 5d511a7d6cd4a0aefd0b05e0e1e26b3b8567ec08 -SHA1 (patch-cz) = d772125c6aeebec919bccd083f997cdd425c5a1d -SHA1 (patch-da) = 58f289767fd9a6f6a334e0e5a770564b780a1212 -SHA1 (patch-db) = 94c13bd10197c4b209a46da3e8008685db22adb6 -SHA1 (patch-dc) = d0240a7a6e330af56167b5707cd91fcade334d5f -SHA1 (patch-dd) = 935f97cffd10b44c5bd7d80e599b3f897d56b049 -SHA1 (patch-de) = 7896d70ab94054d8a77049df47eceb2505c60ed1 -SHA1 (patch-df) = 1140349bd309cfdc43c586e39914b607f2cb8e7a -SHA1 (patch-dg) = 1c757673e8d21f90363997f853492c7d98192098 -SHA1 (patch-dh) = b0b7c1d3b99991c64e4d70a27f601993baa1f91b -SHA1 (patch-di) = da64503892d0e421bce6f8f07da879884a757bcb -SHA1 (patch-dj) = 7b13ec762f5dc0f21a1416c311e20c4ed2b62afc -SHA1 (patch-dk) = ed02c7f7aa8ee25c4227843e115689952f765caf -SHA1 (patch-dl) = 0aef1fe619dc5ff228d813d816f5e974d49bf829 -SHA1 (patch-dm) = 205ac73da2105f82d497279507f93a6ec703a5d0 -SHA1 (patch-dn) = b0ccb6467097b3b1937810d9f1fc6a2b21fbabc2 -SHA1 (patch-do) = 14d0e4cb02758b457b2c78ae1ee5d0899b0faa65 -SHA1 (patch-dp) = 94c78bf81c6125d14df071eb0d2738eef95b5f17 -SHA1 (patch-dq) = 951faffa9e5b377f8709c3e155b9bbf36b76e19c -SHA1 (patch-dr) = e7c97b18c3b6db18411f86af87f4987f186eb755 -SHA1 (patch-ds) = 9e94de59e2979bd51cab164a4464ae0bdfb4eaa2 -SHA1 (patch-dt) = 38168d6d296814f166a528e35cd92c2686e8a98e -SHA1 (patch-du) = f1ffe17e2aae3199885bb4f2889c6935089f4926 -SHA1 (patch-dv) = 7326dba16b9043ede173a9aeaa6eabce4a83c730 -SHA1 (patch-dw) = 9002f1f1477d4d8d1e587c19749b01fc46211615 -SHA1 (patch-dx) = 3e437213954b74af62045bc0b650ded6be73ed46 -SHA1 (patch-dy) = b336b712f3fb7964ee4a5ed76ec4cab8a5ad72b7 -SHA1 (patch-dz) = b8304af8ac019af3224f0df0212e5d4da4226eac -SHA1 (patch-ea) = ac9158bfc79aba18b318f1e2e7ac0fa2427cfbec -SHA1 (patch-eb) = 05fcefb5b5f0799b92828b72938a57854707a69b -SHA1 (patch-ec) = 76f2a9d23643b4603fffc933c2fd0860fa4c3052 -SHA1 (patch-ed) = 6a377819f933cea63580b82be6328d47376d7b7d -SHA1 (patch-ee) = 1bd444f2e77d0637c86a054e94229cd714ad0875 -SHA1 (patch-ef) = f16205feb29f7ea282e098ad9434f56900d12e02 -SHA1 (patch-eg) = e746accd7d17649d6f7cd7f8195ef2357d231c98 -SHA1 (patch-eh) = 73cc36fe2cba94e9c1fbab06628dfefb90d96994 -SHA1 (patch-ei) = 65e504ea6b78958b5ff3a805559d4429f4f6e798 -SHA1 (patch-ej) = 8eb2a61821f1ebf778ae1fa7a828de3a0b8e2ae6 -SHA1 (patch-ek) = 49c51048cb416e53279d9f319466f5eaf5c28ae0 -SHA1 (patch-el) = 51e1d47e1f42e1cc62d53b1e4c3426b9dbf4a798 -SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d diff --git a/x11/xview-lib/patches/patch-aa b/x11/xview-lib/patches/patch-aa deleted file mode 100644 index ecebda530b2..00000000000 --- a/x11/xview-lib/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/12/20 09:19:54 tron Exp $ - ---- bitmaps/Imakefile.orig Tue Jun 29 07:19:54 1993 -+++ bitmaps/Imakefile Thu Dec 20 10:09:16 2001 -@@ -34,9 +34,9 @@ - - ALLFILES = $(BITMAPS) - --all: $(SRCS) -+all:: $(SRCS) - --BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),/**/) -+BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.) - - install:: $(SRCS) - $(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC) diff --git a/x11/xview-lib/patches/patch-ab b/x11/xview-lib/patches/patch-ab deleted file mode 100644 index b3cced157f4..00000000000 --- a/x11/xview-lib/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2001/12/20 09:19:54 tron Exp $ - ---- doc/Imakefile.orig Tue Jun 29 07:13:15 1993 -+++ doc/Imakefile Thu Dec 20 10:09:16 2001 -@@ -17,7 +17,7 @@ - ALLFILES = $(DOCFILES) - - install:: -- $(MKDIRHIER) $(DOC_DEST) -+ $(MKDIRHIER) $(DOC_DEST) - - InstallNonExecList($(DOCFILES),$(DOC_DEST)) - PopulateSCCSTree(h,$(ALLFILES) README) diff --git a/x11/xview-lib/patches/patch-ac b/x11/xview-lib/patches/patch-ac deleted file mode 100644 index b720e1334d9..00000000000 --- a/x11/xview-lib/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2001/12/20 09:19:54 tron Exp $ - ---- images/Imakefile.orig Tue Jun 29 07:18:41 1993 -+++ images/Imakefile Thu Dec 20 10:09:16 2001 -@@ -99,9 +99,9 @@ - - ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES) - --all: $(SRCS) -+all:: $(SRCS) - --BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/) -+BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.) - - install:: $(SRCS) - $(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC) diff --git a/x11/xview-lib/patches/patch-ad b/x11/xview-lib/patches/patch-ad deleted file mode 100644 index 7c5a98532b2..00000000000 --- a/x11/xview-lib/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2001/12/20 09:19:54 tron Exp $ - ---- lib/libxview/attr/attr_copy.c.orig Tue Jun 29 07:14:35 1993 -+++ lib/libxview/attr/attr_copy.c Thu Dec 20 10:09:16 2001 -@@ -12,6 +12,11 @@ - - #include <xview/attr.h> - -+static int copy_1_attr(); -+static int copy_counted_list(); -+static int copy_singleton(); -+static int copy_null_list(); -+ - /* - * attr_copy: copy an attribute list, returning the size in bytes - */ diff --git a/x11/xview-lib/patches/patch-ae b/x11/xview-lib/patches/patch-ae deleted file mode 100644 index c66a7713720..00000000000 --- a/x11/xview-lib/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2001/12/20 09:19:54 tron Exp $ - ---- lib/libxview/base/Imakefile.orig Tue Jun 29 07:14:40 1993 -+++ lib/libxview/base/Imakefile Thu Dec 20 10:09:16 2001 -@@ -37,7 +37,7 @@ - drawable.o\ - xv_debug.o\ - xv_parse.o\ -- xv_list.o\ -+ xv_list.o\ - xv_error.o - - SRCS=\ diff --git a/x11/xview-lib/patches/patch-af b/x11/xview-lib/patches/patch-af deleted file mode 100644 index 7bd4c787550..00000000000 --- a/x11/xview-lib/patches/patch-af +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-af,v 1.3 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/base/base.h.orig Tue Jun 29 07:14:42 1993 -+++ lib/libxview/base/base.h Thu Dec 20 10:09:16 2001 -@@ -6,10 +6,15 @@ - * file for terms of the license. - */ - -+#include <sys/param.h> - #ifndef xview_base_DEFINED - #define xview_base_DEFINED - #include <string.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - - #include <xview/xv_c_types.h> - -@@ -54,10 +59,12 @@ - * non-SVR4 systems. - */ - #ifndef SUNOS41 -+#if !(defined(BSD) && (BSD >= 199103)) - #define XV_OS_SVR4 --#define XV_USE_TTCOMPAT - #define SYSV_WAIT - #define SYSV_UCONTEXT -+#endif -+#define XV_USE_TTCOMPAT - #define XV_USE_XVFCNTL - #endif - diff --git a/x11/xview-lib/patches/patch-ag b/x11/xview-lib/patches/patch-ag deleted file mode 100644 index dc18dcd5481..00000000000 --- a/x11/xview-lib/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/base/xv_debug.h.orig Tue Jun 29 07:14:44 1993 -+++ lib/libxview/base/xv_debug.h Thu Dec 20 10:09:16 2001 -@@ -9,11 +9,16 @@ - #ifndef _xv_debug_h_already_included - #define _xv_debug_h_already_included - -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <xview/pkg.h> /* needed to get definition of Xv_private */ - /* diff --git a/x11/xview-lib/patches/patch-ah b/x11/xview-lib/patches/patch-ah deleted file mode 100644 index e92f214e665..00000000000 --- a/x11/xview-lib/patches/patch-ah +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/base/xv_error.c.orig Tue Jun 29 07:14:42 1993 -+++ lib/libxview/base/xv_error.c Thu Dec 20 10:10:01 2001 -@@ -11,15 +11,20 @@ - */ - - #include <stdio.h> -+#include <sys/param.h> - #include <xview/pkg_public.h> - #include <X11/Xlib.h> - #include <xview_private/i18n_impl.h> - #include <xview_private/portable.h> - - /* Unix system error variables */ -+#if (defined(BSD) && (BSD >= 199306)) -+#include <errno.h> -+#else - extern int sys_nerr; --extern char *sys_errlist[]; - extern int errno; -+extern char *sys_errlist[]; -+#endif - - Xv_private_data char *xv_app_name; - Xv_private int (*xv_error_proc) (); diff --git a/x11/xview-lib/patches/patch-ai b/x11/xview-lib/patches/patch-ai deleted file mode 100644 index e7531c67ca1..00000000000 --- a/x11/xview-lib/patches/patch-ai +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/canvas/cnvs_input.c.orig Tue Jun 29 07:14:46 1993 -+++ lib/libxview/canvas/cnvs_input.c Thu Dec 20 10:10:42 2001 -@@ -415,20 +415,25 @@ - register Event *event; - { - Xv_Window paint_window; -- Event tmp_event; -+ Event *tmp_event; - int x, y; - -+ if ( (tmp_event = (Event *) malloc(sizeof(Event))) == NULL){ -+ fprintf(stderr,"canvas_window_event: malloc failed\n"); -+ exit(1); -+ } - paint_window = xv_get(canvas_public, CANVAS_NTH_PAINT_WINDOW, 0); - if (paint_window == NULL) { - /* call xv_error */ - return (event); - } -- tmp_event = *event; -+ -+ memcpy(tmp_event,event,sizeof(Event)); - win_translate_xy(paint_window, canvas_public, - event_x(event), event_y(event), &x, &y); -- event_set_x(&tmp_event, x); -- event_set_y(&tmp_event, y); -- return (&tmp_event); -+ event_set_x(tmp_event, x); -+ event_set_y(tmp_event, y); -+ return (tmp_event); - } - - /* -@@ -440,20 +445,24 @@ - register Event *event; - { - Xv_Window paint_window; -- Event tmp_event; -+ Event *tmp_event; - int x, y; - -+ if ( (tmp_event = (Event *) malloc(sizeof(Event))) == NULL){ -+ fprintf(stderr,"canvas_window_event: malloc failed\n"); -+ exit(1); -+ } - paint_window = xv_get(canvas_public, CANVAS_NTH_PAINT_WINDOW, 0); - if (paint_window == NULL) { - /* call xv_error */ - return (event); - } -- tmp_event = *event; -+ memcpy(tmp_event,event,sizeof(Event)); - win_translate_xy(paint_window, canvas_public, - event_x(event), event_y(event), &x, &y); -- event_set_x(&tmp_event, x); -- event_set_y(&tmp_event, y); -- return (&tmp_event); -+ event_set_x(tmp_event, x); -+ event_set_y(tmp_event, y); -+ return (tmp_event); - } - - diff --git a/x11/xview-lib/patches/patch-aj b/x11/xview-lib/patches/patch-aj deleted file mode 100644 index 88442a9b30d..00000000000 --- a/x11/xview-lib/patches/patch-aj +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/filter/filter.c.orig Tue Jun 29 07:14:57 1993 -+++ lib/libxview/filter/filter.c Thu Dec 20 10:09:16 2001 -@@ -39,11 +39,12 @@ - - char *stream_fgets(); - --enum CharClass -+static enum CharClass - breakProc(); --struct CharAction -+static struct CharAction - digits(); -- -+static -+ any_shell_meta(); - - struct filter_rec ** - xv_parse_filter_table(in, filename) -@@ -203,10 +204,10 @@ - { - int i; - for (i = 0; table[i] != NULL; i++) { -- cfree((char *) table[i]->call); -+ free((char *) table[i]->call); - free((char *) table[i]); - } -- cfree((char *) table); -+ free((char *) table); - } - - static struct CharAction diff --git a/x11/xview-lib/patches/patch-ak b/x11/xview-lib/patches/patch-ak deleted file mode 100644 index 88ab9a59de3..00000000000 --- a/x11/xview-lib/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/font/font.c.orig Tue Jun 29 07:15:01 1993 -+++ lib/libxview/font/font.c Thu Dec 20 10:09:16 2001 -@@ -67,6 +67,10 @@ - Xv_private char *xv_font_scale_cmdline(); - Xv_private char *xv_font_scale(); - -+static int font_setup_defaults(); -+static int font_construct_name(); -+static int font_init_create_attrs(); -+ - /* - * delimiters - */ diff --git a/x11/xview-lib/patches/patch-al b/x11/xview-lib/patches/patch-al deleted file mode 100644 index dfe72c173cf..00000000000 --- a/x11/xview-lib/patches/patch-al +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/font/font_get.c.orig Tue Jun 29 07:15:00 1993 -+++ lib/libxview/font/font_get.c Thu Dec 20 10:10:24 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-am b/x11/xview-lib/patches/patch-am deleted file mode 100644 index 01ea8af66af..00000000000 --- a/x11/xview-lib/patches/patch-am +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-am,v 1.4 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/io_stream/file_strms.c.orig Tue Jun 29 07:15:07 1993 -+++ lib/libxview/io_stream/file_strms.c Thu Dec 20 10:09:16 2001 -@@ -17,7 +17,11 @@ - - #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static struct xv_file_input_stream_data { -+#else -+struct xv_file_input_stream_data { -+#endif - FILE *fp; - int lineno; - }; -@@ -156,7 +160,11 @@ - - #define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static struct xv_file_output_stream_data { -+#else -+struct xv_file_output_stream_data { -+#endif - FILE *fp; - int lineno; - }; diff --git a/x11/xview-lib/patches/patch-an b/x11/xview-lib/patches/patch-an deleted file mode 100644 index 700732443d6..00000000000 --- a/x11/xview-lib/patches/patch-an +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-an,v 1.4 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/io_stream/othr_strms.c.orig Tue Jun 29 07:15:05 1993 -+++ lib/libxview/io_stream/othr_strms.c Thu Dec 20 10:09:16 2001 -@@ -17,7 +17,11 @@ - - #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static struct xv_filter_comments_stream_data { -+#else -+struct xv_filter_comments_stream_data { -+#endif - Bool backed_up; - char backup, lastchar; - }; diff --git a/x11/xview-lib/patches/patch-ao b/x11/xview-lib/patches/patch-ao deleted file mode 100644 index 4db78ab12af..00000000000 --- a/x11/xview-lib/patches/patch-ao +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/io_stream/str_strms.c.orig Tue Jun 29 07:15:06 1993 -+++ lib/libxview/io_stream/str_strms.c Thu Dec 20 10:09:16 2001 -@@ -17,7 +17,11 @@ - - #define GetSISData struct string_input_stream_data *data = (struct string_input_stream_data*) in->client_data - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static struct string_input_stream_data { -+#else -+struct string_input_stream_data { -+#endif - char *string; - int charpos; - }; -@@ -148,7 +152,11 @@ - - #define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static struct string_output_stream_data { -+#else -+struct string_output_stream_data { -+#endif - char *string; - int charpos; - }; diff --git a/x11/xview-lib/patches/patch-ap b/x11/xview-lib/patches/patch-ap deleted file mode 100644 index 8ee575ae17a..00000000000 --- a/x11/xview-lib/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/rect/rect_util.c.orig Tue Jun 29 07:15:17 1993 -+++ lib/libxview/rect/rect_util.c Thu Dec 20 10:09:17 2001 -@@ -16,6 +16,8 @@ - - #include <xview/rect.h> - -+static int rect_nearest_edge(); -+ - /* - * Compute the distance from rect to (x, y). If (x, y) is in rect, zero is - * returned. If x_used or y_used are non-zero, the projection point is diff --git a/x11/xview-lib/patches/patch-aq b/x11/xview-lib/patches/patch-aq deleted file mode 100644 index 5c11505a474..00000000000 --- a/x11/xview-lib/patches/patch-aq +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2001/12/20 09:19:55 tron Exp $ - ---- lib/libxview/sel/sel_agent.c.orig Sun Jun 26 20:46:20 1994 -+++ lib/libxview/sel/sel_agent.c Thu Dec 20 10:09:17 2001 -@@ -63,7 +63,7 @@ - static void selection_agent_do_function(); - static Atom get_atom(); - static Seln_attribute save_atom(); -- -+static int waitforReadableTimeout(); - - Xv_private Seln_result seln_convert_request_to_property(); - /* called by seln_svc.c -@@ -309,7 +309,11 @@ - struct stat stat_buf; - int count, size; - char *destp; -+#if (defined(BSD) && (BSD >= 199306)) -+ extern off_t lseek(); -+#else - extern long lseek(); -+#endif - - if (fstat(fd, &stat_buf) != 0) { - perror(XV_MSG("Agent couldn't reply about a file")); diff --git a/x11/xview-lib/patches/patch-ar b/x11/xview-lib/patches/patch-ar deleted file mode 100644 index 20b5df70dbc..00000000000 --- a/x11/xview-lib/patches/patch-ar +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ar,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/sel/seln_impl.h.orig Tue Jun 29 07:15:25 1993 -+++ lib/libxview/sel/seln_impl.h Thu Dec 20 10:09:17 2001 -@@ -9,12 +9,17 @@ - * file for terms of the license. - */ - -+#ifdef NULL -+#undef NULL -+#endif - #include <errno.h> - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #include <sys/types.h> -@@ -27,10 +32,6 @@ - #include <xview/sel_attrs.h> - #include <X11/Xlib.h> - --extern int errno; -- -- -- - /* - * Procedure IDs for client-module procedures - */ diff --git a/x11/xview-lib/patches/patch-as b/x11/xview-lib/patches/patch-as deleted file mode 100644 index 142078f4943..00000000000 --- a/x11/xview-lib/patches/patch-as +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-as,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/server/server.c.orig Sun Jun 26 20:53:40 1994 -+++ lib/libxview/server/server.c Thu Dec 20 10:09:17 2001 -@@ -65,6 +65,7 @@ - static unsigned int string_to_modmask(); - static Server_atom_type save_atom(); - static void server_yield_modifiers(); -+static int xv_set_scheduler(); - - Xv_private char *xv_strtok(); - -@@ -440,7 +441,7 @@ - /* lumpi@dobag.in-berlin.de */ - if (XrmGetDatabase((Display *)server->xdisplay)) { - server->db = XrmGetStringDatabase( -- (XrmGetDatabase((Display *)server->xdisplay))); -+ (char *) (XrmGetDatabase((Display *)server->xdisplay))); - #else - if (((Display *)server->xdisplay)->xdefaults) { - server->db = XrmGetStringDatabase( diff --git a/x11/xview-lib/patches/patch-at b/x11/xview-lib/patches/patch-at deleted file mode 100644 index 35ace1ac800..00000000000 --- a/x11/xview-lib/patches/patch-at +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-at,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/win/win_input.c.orig Mon Jun 27 00:27:53 1994 -+++ lib/libxview/win/win_input.c Thu Dec 20 10:09:19 2001 -@@ -56,6 +56,7 @@ static int BlockForEvent(); - static int GetButtonEvent(); - static int win_translate_KP_keysym(); - static int translate_key(); -+static int xevent_to_event(); - - extern struct rectlist *win_get_damage(); - extern void server_set_timestamp(); -@@ -853,7 +854,9 @@ ContProcess: - #ifdef X11R6 - /* lumpi@dobag.in-berlin.de */ - int ksym_pcc; -- XGetKeyboardMapping(display,NoSymbol,0,&ksym_pcc); -+ int tc_min_keycode, tc_max_keycode; -+ XDisplayKeycodes(display, &tc_min_keycode, &tc_max_keycode); -+ XGetKeyboardMapping(display,tc_min_keycode,tc_max_keycode-tc_min_keycode-1,&ksym_pcc); - for (index = 0; index < ksym_pcc; index++) { - #else - for (index = 0; index < display->keysyms_per_keycode; index++) { -@@ -861,7 +864,7 @@ ContProcess: - if ((ksym = XLookupKeysym(ek, index)) != NoSymbol) - if (IsKeypadKey(ksym)) { - /* See if key has been rebound. */ -- if (!translate_key(display, ksym, ek->state, -+ if (translate_key(display, ksym, ek->state, - buffer, BUFFERSIZE)) { - (void)win_translate_KP_keysym(ksym, buffer); - } -@@ -2341,7 +2344,6 @@ BlockForEvent(display, xevent, usec, pre - int result; - struct timeval timeout; - struct timeval starttime, curtime, diff1, diff2; -- extern int errno; - - timeout.tv_sec = 0; - timeout.tv_usec = usec; -@@ -2720,8 +2722,10 @@ win_translate_KP_keysym(keysym, buffer) - * Xlib's. - */ - --#ifdef X11R6 --/* lumpi@dobag.in-berlin.de */ -+#ifdef X11R6 -+/* lumpi@dobag.in-berlin.de -+ tom@sees.bangor.ac.uk this replacement for X11R6 doesn't work. At least -+ it should now return sensible values though. */ - static int - translate_key(dpy, symbol, modifiers, buffer, nbytes) - Display *dpy; -@@ -2731,11 +2735,18 @@ translate_key(dpy, symbol, modifiers, bu - int nbytes; - { - /* This is _very_ rude ! */ -- strcpy(buffer,XKeysymToString(symbol)); -+ char *string; -+ string = XKeysymToString(symbol); -+ if (string) { -+ strncpy(buffer,XKeysymToString(symbol),nbytes); -+ return(strlen(buffer)); -+ } -+ else -+ return 0; - } - --#else - -+#else - static int - translate_key(dpy, symbol, modifiers, buffer, nbytes) - Display *dpy; -@@ -2761,4 +2772,4 @@ translate_key(dpy, symbol, modifiers, bu - } - return 0; - } --#endif -+#endif diff --git a/x11/xview-lib/patches/patch-au b/x11/xview-lib/patches/patch-au deleted file mode 100644 index 6091cd623a1..00000000000 --- a/x11/xview-lib/patches/patch-au +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-au,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/win/win_env.c.orig Tue Jun 29 07:15:40 1993 -+++ lib/libxview/win/win_env.c Thu Dec 20 10:10:47 2001 -@@ -15,6 +15,7 @@ - * other functions) - */ - -+#include <string.h> - #include <xview/rect.h> - #include <xview/win_env.h> - #include <xview/win_struct.h> diff --git a/x11/xview-lib/patches/patch-av b/x11/xview-lib/patches/patch-av deleted file mode 100644 index 495780cbd5c..00000000000 --- a/x11/xview-lib/patches/patch-av +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-av,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/color/cms_pblc.c.orig Tue Jun 29 07:15:53 1993 -+++ lib/libxview/color/cms_pblc.c Thu Dec 20 10:10:18 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-aw b/x11/xview-lib/patches/patch-aw deleted file mode 100644 index 8206378cf15..00000000000 --- a/x11/xview-lib/patches/patch-aw +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/dnd/dnd.c.orig Tue Jun 29 07:15:57 1993 -+++ lib/libxview/dnd/dnd.c Thu Dec 20 10:09:16 2001 -@@ -38,6 +38,10 @@ - extern int DndContactDSDM(); - extern int DndFindSite(); - extern XID DndGetCursor(); -+static int SendTrigger(); -+static int SendOldDndEvent(); -+static int WaitForAck(); -+static int IsV2App(); - - Xv_public int - dnd_send_drop(dnd_public) diff --git a/x11/xview-lib/patches/patch-ax b/x11/xview-lib/patches/patch-ax deleted file mode 100644 index c4c64a5f905..00000000000 --- a/x11/xview-lib/patches/patch-ax +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/dnd/site.c.orig Tue Jun 29 07:15:58 1993 -+++ lib/libxview/dnd/site.c Thu Dec 20 10:09:16 2001 -@@ -19,6 +19,7 @@ - #ifdef SVR4 - #include <stdlib.h> - #endif SVR4 -+#include <sys/param.h> - - static void TransCoords(); - Xv_private Xv_Window win_get_top_level(); -@@ -246,7 +247,11 @@ - /* (rectNode->rect) is of the wrong type. */ - memmove(rect, &(rectNode->rect), sizeof(Rect)); - #else -+#if (defined(BSD) && (BSD >= 199103)) -+ bcopy(&(rectNode->rect), rect, sizeof(Rect)); -+#else - bcopy(rectNode->rect, rect, sizeof(Rect)); -+#endif - #endif SVR4 - - return((Xv_opaque)rect); diff --git a/x11/xview-lib/patches/patch-ay b/x11/xview-lib/patches/patch-ay deleted file mode 100644 index cda3d697a0e..00000000000 --- a/x11/xview-lib/patches/patch-ay +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/selection/sel_own.c.orig Sun Jun 26 03:05:22 1994 -+++ lib/libxview/selection/sel_own.c Thu Dec 20 10:09:17 2001 -@@ -35,6 +35,7 @@ - static int sel_set_ownership(/* sel_owner */); - static int (*OldErrorHandler)(); - static int SelOwnerErrorHandler(); -+static int SendIncr(); - static int ValidatePropertyEvent(); - - static void SelClean(); diff --git a/x11/xview-lib/patches/patch-az b/x11/xview-lib/patches/patch-az deleted file mode 100644 index 74c61243d29..00000000000 --- a/x11/xview-lib/patches/patch-az +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-az,v 1.2 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/selection/sel_req.c.orig Sun Jun 26 03:05:21 1994 -+++ lib/libxview/selection/sel_req.c Thu Dec 20 10:09:17 2001 -@@ -55,7 +55,10 @@ - static int GetSelection(); - static int ProcessReply(); - static Requestor *SelGetReq(); -- -+static int XvGetRequestedValue(); -+static int ProcessNonBlkIncr(); -+static int ProcessReq(); -+static int OldPkgIsOwner(); - - /*ARGSUSED*/ - Pkg_private int -@@ -1226,7 +1229,7 @@ - } - - --static XID -+Pkg_private XID - SelGetOwnerXID( selReq ) - Sel_req_info *selReq; - { diff --git a/x11/xview-lib/patches/patch-ba b/x11/xview-lib/patches/patch-ba deleted file mode 100644 index 86dd2ce074a..00000000000 --- a/x11/xview-lib/patches/patch-ba +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ba,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/selection/sel_util.c.orig Tue Jun 29 07:16:03 1993 -+++ lib/libxview/selection/sel_util.c Thu Dec 20 10:09:17 2001 -@@ -23,6 +23,7 @@ static void tvdiff(); - static void FreeMultiProp(); - static int SelMatchReply(); - static Sel_req_tbl *SelMatchReqTbl(); -+static int SelFindReply(); - - Pkg_private struct timeval * - xv_sel_cvt_xtime_to_timeval( XTime ) -@@ -510,7 +511,6 @@ char *arg; - int result; - struct timeval timeout; - struct timeval starttime, curtime, diff1, diff2; -- extern int errno; - - timeout.tv_sec = seconds; - timeout.tv_usec = 0; -@@ -601,7 +601,7 @@ Sel_reply_info *reply; - reqTbl->reply = reply; - reqTbl->next = NULL; - (void)XSaveContext( dpy, DefaultRootWindow(dpy),replyCtx, -- (caddr_t *)reqTbl); -+ (XPointer)reqTbl); - return reqTbl; - } - return (Sel_req_tbl *) xv_sel_add_new_req( reqTbl, reply ); diff --git a/x11/xview-lib/patches/patch-bb b/x11/xview-lib/patches/patch-bb deleted file mode 100644 index 7cf2ea25a47..00000000000 --- a/x11/xview-lib/patches/patch-bb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2001/12/20 09:19:56 tron Exp $ - ---- lib/libxview/frame/fm_get.c.orig Tue Jun 29 07:16:10 1993 -+++ lib/libxview/frame/fm_get.c Thu Dec 20 10:09:16 2001 -@@ -10,6 +10,7 @@ - * file for terms of the license. - */ - -+#include <ctype.h> - #include <xview_private/fm_impl.h> - #include <xview_private/draw_impl.h> - #include <xview/server.h> diff --git a/x11/xview-lib/patches/patch-bc b/x11/xview-lib/patches/patch-bc deleted file mode 100644 index 39eebc7dfd1..00000000000 --- a/x11/xview-lib/patches/patch-bc +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/fm_impl.h.orig Tue Jun 29 07:16:15 1993 -+++ lib/libxview/frame/fm_impl.h Thu Dec 20 10:09:16 2001 -@@ -17,11 +17,16 @@ - #define _frame_impl_h_already_included - - /* standard includes */ -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #ifdef OW_I18N diff --git a/x11/xview-lib/patches/patch-bd b/x11/xview-lib/patches/patch-bd deleted file mode 100644 index 4d66c612bd3..00000000000 --- a/x11/xview-lib/patches/patch-bd +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/fm_props.h.orig Tue Jun 29 07:16:14 1993 -+++ lib/libxview/frame/fm_props.h Thu Dec 20 10:09:16 2001 -@@ -13,11 +13,16 @@ - #define _frame_props_h_already_included - - /* standard includes */ -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #include <xview/notify.h> diff --git a/x11/xview-lib/patches/patch-be b/x11/xview-lib/patches/patch-be deleted file mode 100644 index 4c8184b6f1c..00000000000 --- a/x11/xview-lib/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/fmcmd_set.c.orig Tue Jun 29 07:16:07 1993 -+++ lib/libxview/frame/fmcmd_set.c Thu Dec 20 10:09:16 2001 -@@ -18,6 +18,8 @@ - #include <xview/panel.h> - #include <xview/server.h> - -+static int update_default_pin_state(); -+ - Pkg_private Xv_opaque - frame_cmd_set_avlist(frame_public, avlist) - Frame frame_public; diff --git a/x11/xview-lib/patches/patch-bf b/x11/xview-lib/patches/patch-bf deleted file mode 100644 index 8541441fb03..00000000000 --- a/x11/xview-lib/patches/patch-bf +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/frame_base.h.orig Tue Jun 29 07:16:14 1993 -+++ lib/libxview/frame/frame_base.h Thu Dec 20 10:09:16 2001 -@@ -17,11 +17,16 @@ - #define _frame_base_h_already_included - - /* standard includes */ -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #include <xview/notify.h> diff --git a/x11/xview-lib/patches/patch-bg b/x11/xview-lib/patches/patch-bg deleted file mode 100644 index 0b5e86ff610..00000000000 --- a/x11/xview-lib/patches/patch-bg +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/frame_cmd.h.orig Tue Jun 29 07:16:14 1993 -+++ lib/libxview/frame/frame_cmd.h Thu Dec 20 10:09:16 2001 -@@ -17,11 +17,16 @@ - #define _frame_cmd_h_already_included - - /* standard includes */ -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #include <xview/notify.h> diff --git a/x11/xview-lib/patches/patch-bh b/x11/xview-lib/patches/patch-bh deleted file mode 100644 index f8f2177c087..00000000000 --- a/x11/xview-lib/patches/patch-bh +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2001/12/20 09:19:57 tron Exp $ - ---- lib/libxview/frame/frame_help.h.orig Tue Jun 29 07:16:10 1993 -+++ lib/libxview/frame/frame_help.h Thu Dec 20 10:09:16 2001 -@@ -17,11 +17,16 @@ - #define _frame_help_h_already_included - - /* standard includes */ -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/time.h> - #include <xview/notify.h> diff --git a/x11/xview-lib/patches/patch-bi b/x11/xview-lib/patches/patch-bi deleted file mode 100644 index 508f7f92de0..00000000000 --- a/x11/xview-lib/patches/patch-bi +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2001/12/20 09:19:58 tron Exp $ - ---- lib/libxview/menu/Imakefile.orig Tue Jun 29 07:16:27 1993 -+++ lib/libxview/menu/Imakefile Thu Dec 20 10:09:16 2001 -@@ -28,7 +28,7 @@ - TEXT_OBJS =\ - omi.o\ - om_public.o\ -- om_render.o\ -+ om_render.o\ - om_set.o\ - om_get.o\ - om_compat.o diff --git a/x11/xview-lib/patches/patch-bj b/x11/xview-lib/patches/patch-bj deleted file mode 100644 index ed447e2d6b7..00000000000 --- a/x11/xview-lib/patches/patch-bj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bj,v 1.1 2001/12/20 09:19:58 tron Exp $ - ---- lib/libxview/menu/om_render.c.orig Tue Jun 29 07:16:26 1993 -+++ lib/libxview/menu/om_render.c Thu Dec 20 10:09:16 2001 -@@ -470,9 +470,9 @@ - * Define the menu and shadow window dimensions. Note: shadow rect width & - * height = menu rect width & height - */ -- xv_set(m->window, XV_RECT, m->fs_menurect, 0); -+ xv_set(m->window, XV_RECT, &m->fs_menurect, 0); - if (!m->group_info->three_d) -- xv_set(m->shadow_window, XV_RECT, shadowrect, 0); -+ xv_set(m->shadow_window, XV_RECT, &shadowrect, 0); - - XFlush(XV_DISPLAY_FROM_WINDOW(m->window)); - diff --git a/x11/xview-lib/patches/patch-bk b/x11/xview-lib/patches/patch-bk deleted file mode 100644 index 423b44b13af..00000000000 --- a/x11/xview-lib/patches/patch-bk +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bk,v 1.1 2001/12/20 09:19:58 tron Exp $ - ---- lib/libxview/menu/om_set.c.orig Tue Jun 29 07:16:24 1993 -+++ lib/libxview/menu/om_set.c Thu Dec 20 10:09:16 2001 -@@ -12,6 +12,7 @@ - - /* --------------------------------------------------------------------- */ - #include <sys/types.h> -+#include <ctype.h> - #include <xview_private/om_impl.h> - #include <xview_private/draw_impl.h> - #include <xview_private/fm_impl.h> diff --git a/x11/xview-lib/patches/patch-bl b/x11/xview-lib/patches/patch-bl deleted file mode 100644 index bb3c23ae4dc..00000000000 --- a/x11/xview-lib/patches/patch-bl +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2001/12/20 09:19:58 tron Exp $ - ---- lib/libxview/misc/Imakefile.orig Tue Jun 29 07:16:36 1993 -+++ lib/libxview/misc/Imakefile Thu Dec 20 10:09:16 2001 -@@ -29,8 +29,8 @@ - xv_i18n.c \ - xv_path.c - --OFILES.misc.3 = ${CFILES.misc.3:%.c=%.o} --OFILES.misc.4 = ${CFILES.misc.4:%.c=%.o} -+OFILES.misc.3 = ${CFILES.misc.3:.c=.o} -+OFILES.misc.4 = ${CFILES.misc.4:.c=.o} - - HFILES.misc.3 = - HFILES.misc.4 = -@@ -43,7 +43,7 @@ - GETTEXT.C = - #endif - --GETTEXT.O = ${GETTEXT.C:%.c=%.o} -+GETTEXT.O = ${GETTEXT.C:.c=.o} - - HDRSPUBLIC= cms_grays.h cms_mono.h cmsrainbow.h cms_rgb.h sun.h \ - window_hs.h expandname.h xv_c_types.h attrol.h db.h \ -@@ -57,7 +57,7 @@ - demorandom.o\ - getlogindr.o\ - expandname.o\ -- expandpath.o\ -+ expandpath.o\ - bitmask.o\ - hashfn.o\ - db_conv.o\ -@@ -76,7 +76,7 @@ - demorandom.c\ - getlogindr.c\ - expandname.c\ -- expandpath.c\ -+ expandpath.c\ - bitmask.c\ - hashfn.c\ - db_conv.c\ -@@ -95,7 +95,7 @@ - demorandom.o\ - getlogindr.o\ - expandname.o\ -- expandpath.o\ -+ expandpath.o\ - bitmask.o\ - hashfn.o\ - db_conv.o\ -@@ -115,7 +115,7 @@ - demorandom.c\ - getlogindr.c\ - expandname.c\ -- expandpath.c\ -+ expandpath.c\ - bitmask.c\ - hashfn.c\ - db_conv.c\ diff --git a/x11/xview-lib/patches/patch-bm b/x11/xview-lib/patches/patch-bm deleted file mode 100644 index abcb531dcaa..00000000000 --- a/x11/xview-lib/patches/patch-bm +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bm,v 1.1 2001/12/20 09:19:58 tron Exp $ - ---- lib/libxview/misc/getlogindr.c.orig Tue Jun 29 07:16:30 1993 -+++ lib/libxview/misc/getlogindr.c Thu Dec 20 10:09:16 2001 -@@ -17,6 +17,7 @@ - - #include <stdio.h> - #include <pwd.h> -+#include <sys/param.h> - #include <xview_private/i18n_impl.h> - #include <xview/xv_error.h> - diff --git a/x11/xview-lib/patches/patch-bn b/x11/xview-lib/patches/patch-bn deleted file mode 100644 index f4d684255db..00000000000 --- a/x11/xview-lib/patches/patch-bn +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bn,v 1.1 2001/12/20 09:19:59 tron Exp $ - ---- lib/libxview/misc/i18n_impl.h.orig Tue Jun 29 07:16:31 1993 -+++ lib/libxview/misc/i18n_impl.h Thu Dec 20 10:09:16 2001 -@@ -25,6 +25,10 @@ - - #include <locale.h> - -+#ifndef LC_MESSAGES -+#define LC_MESSAGES 0 -+#endif -+ - extern char *dgettext(); - - #define XV_I18N_MSG(d,s) (dgettext(d,s)) diff --git a/x11/xview-lib/patches/patch-bo b/x11/xview-lib/patches/patch-bo deleted file mode 100644 index dfb7e536ae9..00000000000 --- a/x11/xview-lib/patches/patch-bo +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2001/12/20 09:19:59 tron Exp $ - ---- lib/libxview/misc/portable.h.orig Tue Jun 29 07:16:34 1993 -+++ lib/libxview/misc/portable.h Thu Dec 20 10:09:16 2001 -@@ -10,6 +10,7 @@ - #ifndef xview_portable_h_DEFINED - #define xview_portable_h_DEFINED - -+#include <sys/param.h> - #include <xview/attr.h> - - #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) -@@ -70,7 +71,11 @@ - #define XV_USE_TERMIOS - #define XV_USE_SVR4_PTYS - #else /* SVR4 */ -+#if (defined(BSD) && (BSD >= 199103)) -+#define XV_USE_TERMIOS -+#else - #undef XV_USE_TERMIOS -+#endif - #undef XV_USE_SVR4_PTYS - #endif /* SVR4 */ - diff --git a/x11/xview-lib/patches/patch-bp b/x11/xview-lib/patches/patch-bp deleted file mode 100644 index 6c43b5caa60..00000000000 --- a/x11/xview-lib/patches/patch-bp +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-bp,v 1.1 2001/12/20 09:19:59 tron Exp $ - ---- lib/libxview/misc/expandname.c.orig Tue Jun 29 07:16:30 1993 -+++ lib/libxview/misc/expandname.c Thu Dec 20 10:09:49 2001 -@@ -23,6 +23,9 @@ - #include <string.h> - #include <sgtty.h> - -+#if defined(BSD) && (BSD >= 199306) -+#include <unistd.h> -+#else - #ifdef sparc - #ifdef SVR4 - #include <unistd.h> -@@ -30,6 +33,7 @@ - #include <vfork.h> - #endif SVR4 - #endif -+#endif - - #ifdef SVR4 - #include <sys/signal.h> -@@ -120,7 +124,9 @@ - } - (void) close(pivec[0]); - #ifndef SVR4 -+#if !(defined(BSD) && (BSD >= 199103)) - while (wait((union wait *) & status) != pid); -+#endif - #else SVR4 - while (wait( & status) != pid); - #endif SVR4 diff --git a/x11/xview-lib/patches/patch-bq b/x11/xview-lib/patches/patch-bq deleted file mode 100644 index 421f55c4ac0..00000000000 --- a/x11/xview-lib/patches/patch-bq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bq,v 1.1 2001/12/20 09:19:59 tron Exp $ - ---- lib/libxview/notice/notice_pt.c.orig Tue Jun 29 07:16:40 1993 -+++ lib/libxview/notice/notice_pt.c Thu Dec 20 10:09:16 2001 -@@ -58,6 +58,7 @@ - static void notice_copy_event(); - static Xv_window notice_get_focus_win(); - static int notice_show_focus_win(); -+static int notice_quadrant(); - - /* - * --------------------------- STATICS ------------------------------ diff --git a/x11/xview-lib/patches/patch-br b/x11/xview-lib/patches/patch-br deleted file mode 100644 index f3082a02bc4..00000000000 --- a/x11/xview-lib/patches/patch-br +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-br,v 1.1 2001/12/20 09:20:00 tron Exp $ - ---- lib/libxview/notice/notice_get.c.orig Tue Jun 29 07:16:39 1993 -+++ lib/libxview/notice/notice_get.c Thu Dec 20 10:10:28 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-bs b/x11/xview-lib/patches/patch-bs deleted file mode 100644 index 93ee80d6995..00000000000 --- a/x11/xview-lib/patches/patch-bs +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bs,v 1.1 2001/12/20 09:20:00 tron Exp $ - ---- lib/libxview/openwin/ow_view.c.orig Tue Jun 29 07:16:43 1993 -+++ lib/libxview/openwin/ow_view.c Thu Dec 20 10:09:16 2001 -@@ -48,6 +48,7 @@ - static openwin_init_view(); - static openwin_free_view(); - static openwin_remove_scrollbars(); -+static int openwin_check_view(); - static openwin_create_viewwindow(); - static openwin_test_for_sb(); - static openwin_link_view(); diff --git a/x11/xview-lib/patches/patch-bt b/x11/xview-lib/patches/patch-bt deleted file mode 100644 index 4b848ab746f..00000000000 --- a/x11/xview-lib/patches/patch-bt +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bt,v 1.1 2001/12/20 09:20:00 tron Exp $ - ---- lib/libxview/panel/item_set.c.orig Tue Jun 29 07:16:50 1993 -+++ lib/libxview/panel/item_set.c Thu Dec 20 10:09:16 2001 -@@ -28,6 +28,8 @@ - - extern Notify_value panel_base_event_handler(); - -+static fix_positions(); -+ - Pkg_private Xv_opaque - item_set_avlist(item_public, avlist) - Panel_item item_public; diff --git a/x11/xview-lib/patches/patch-bu b/x11/xview-lib/patches/patch-bu deleted file mode 100644 index 6a888098522..00000000000 --- a/x11/xview-lib/patches/patch-bu +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bu,v 1.1 2001/12/20 09:20:00 tron Exp $ - ---- lib/libxview/panel/p_btn.c.orig Tue Jun 29 07:16:52 1993 -+++ lib/libxview/panel/p_btn.c Thu Dec 20 10:09:16 2001 -@@ -203,7 +203,7 @@ - if (pin_is_default) { - image.im_type = PIT_STRING; - image_string(&image) = NULL; -- label = ""; -+ label = (Xv_opaque) ""; - } else if (!(image_string(&image) = (char *) xv_get(default_menu_item, - MENU_STRING))) { - olgx_state |= OLGX_LABEL_IS_PIXMAP; diff --git a/x11/xview-lib/patches/patch-bv b/x11/xview-lib/patches/patch-bv deleted file mode 100644 index 9cdfc317775..00000000000 --- a/x11/xview-lib/patches/patch-bv +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-bv,v 1.1 2001/12/20 09:20:00 tron Exp $ - ---- lib/libxview/panel/p_choice.c.orig Tue Jun 29 07:16:57 1993 -+++ lib/libxview/panel/p_choice.c Thu Dec 20 10:09:16 2001 -@@ -106,6 +106,10 @@ - static int choice_number(); - static int choice_x_gap(); - static int choice_y_gap(); -+static int find_choice(); -+static int modify_choice(); -+static int move_specified(); -+static int re_alloc_choices(); - static unsigned int choice_value(); - static void choice_create_menu(); - static void choice_images_to_menu_items(); -@@ -120,7 +124,6 @@ - static void update_item_rect(); - static void update_value_rect(); - static Xv_opaque choice_do_menu_item(); -- - - static Panel_ops ops = { - panel_default_handle_event, /* handle_event() */ diff --git a/x11/xview-lib/patches/patch-bw b/x11/xview-lib/patches/patch-bw deleted file mode 100644 index 29d22691bae..00000000000 --- a/x11/xview-lib/patches/patch-bw +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bw,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_drop.c.orig Tue Jun 29 07:17:04 1993 -+++ lib/libxview/panel/p_drop.c Thu Dec 20 10:09:16 2001 -@@ -10,7 +10,12 @@ - * file for terms of the license. - */ - -+#include <sys/param.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - #include <xview_private/draw_impl.h> - #include <xview_private/i18n_impl.h> - #include <xview_private/panel_impl.h> diff --git a/x11/xview-lib/patches/patch-bx b/x11/xview-lib/patches/patch-bx deleted file mode 100644 index 5cba0063ed0..00000000000 --- a/x11/xview-lib/patches/patch-bx +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bx,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_gauge.c.orig Tue Jun 29 07:17:04 1993 -+++ lib/libxview/panel/p_gauge.c Thu Dec 20 10:09:16 2001 -@@ -47,6 +47,7 @@ - /* Local functions */ - static void paint_gauge(); - static void update_rects(); -+static int etoi(); - - static Panel_ops ops = { - panel_default_handle_event, /* handle_event() */ diff --git a/x11/xview-lib/patches/patch-by b/x11/xview-lib/patches/patch-by deleted file mode 100644 index d3f712d7259..00000000000 --- a/x11/xview-lib/patches/patch-by +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-by,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_get.c.orig Tue Jun 29 07:16:49 1993 -+++ lib/libxview/panel/p_get.c Thu Dec 20 10:09:16 2001 -@@ -16,6 +16,7 @@ - #include <xview/scrollbar.h> - - static int shrink_to_fit(); -+static panel_shrink_margin(); - - #define MAX_NEGATIVE_SHRINK 2000 - #define SHRINK_MARGIN 4 diff --git a/x11/xview-lib/patches/patch-bz b/x11/xview-lib/patches/patch-bz deleted file mode 100644 index 57555403693..00000000000 --- a/x11/xview-lib/patches/patch-bz +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bz,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_set.c.orig Tue Jun 29 07:16:59 1993 -+++ lib/libxview/panel/p_set.c Thu Dec 20 10:09:16 2001 -@@ -25,6 +25,8 @@ - - static void panel_set_fonts(); - -+static int column_from_absolute_x(); -+static int row_from_absolute_y(); - - Pkg_private Xv_opaque - panel_set_avlist(panel_public, avlist) diff --git a/x11/xview-lib/patches/patch-ca b/x11/xview-lib/patches/patch-ca deleted file mode 100644 index 4007a4d9fb2..00000000000 --- a/x11/xview-lib/patches/patch-ca +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_slider.c.orig Tue Jun 29 07:17:02 1993 -+++ lib/libxview/panel/p_slider.c Thu Dec 20 10:09:17 2001 -@@ -54,6 +54,8 @@ - static Panel_setting get_value(); - static void paint_slider(); - static void update_rects(); -+static int etoi(); -+static int itoe(); - - static Panel_ops ops = { - panel_default_handle_event, /* handle_event() */ diff --git a/x11/xview-lib/patches/patch-cb b/x11/xview-lib/patches/patch-cb deleted file mode 100644 index 05fa94e2e99..00000000000 --- a/x11/xview-lib/patches/patch-cb +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cb,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/p_txt.c.orig Tue Jun 29 07:16:55 1993 -+++ lib/libxview/panel/p_txt.c Thu Dec 20 10:09:17 2001 -@@ -10,7 +10,12 @@ - * file for terms of the license. - */ - -+#include <sys/param.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - #include <string.h> - #include <ctype.h> - #include <X11/X.h> diff --git a/x11/xview-lib/patches/patch-cc b/x11/xview-lib/patches/patch-cc deleted file mode 100644 index c99eb1ad880..00000000000 --- a/x11/xview-lib/patches/patch-cc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2001/12/20 09:20:01 tron Exp $ - ---- lib/libxview/panel/panel.c.orig Tue Jun 29 07:16:57 1993 -+++ lib/libxview/panel/panel.c Thu Dec 20 10:09:17 2001 -@@ -27,6 +27,7 @@ - Pkg_private int panel_destroy(); - - static int panel_layout(); -+static int panel_unregister_view(); - - Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4]; - diff --git a/x11/xview-lib/patches/patch-cd b/x11/xview-lib/patches/patch-cd deleted file mode 100644 index dba50ddf3c3..00000000000 --- a/x11/xview-lib/patches/patch-cd +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/panel/panel_impl.h.orig Tue Jun 29 07:16:50 1993 -+++ lib/libxview/panel/panel_impl.h Thu Dec 20 10:09:17 2001 -@@ -9,11 +9,16 @@ - #ifndef panel_impl_defined - #define panel_impl_defined - -+#ifdef NULL -+#undef NULL -+#endif - #ifndef FILE - #ifndef SVR4 --#undef NULL - #endif SVR4 - #include <stdio.h> -+#ifndef NULL -+#define NULL 0 -+#endif - #endif FILE - #include <sys/types.h> - #include <X11/Xlib.h> diff --git a/x11/xview-lib/patches/patch-ce b/x11/xview-lib/patches/patch-ce deleted file mode 100644 index 4464d6c5fd8..00000000000 --- a/x11/xview-lib/patches/patch-ce +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-ce,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/panel/p_list.c.orig Tue Jun 29 07:16:48 1993 -+++ lib/libxview/panel/p_list.c Thu Dec 20 10:10:33 2001 -@@ -1239,7 +1239,7 @@ - return ((Xv_opaque) dp->choose_one); - - case PANEL_ITEM_NTH_WINDOW: -- if (*(int *) valist == 0) -+ if (va_arg(valist, int *) == 0) - return (Xv_opaque) dp->list_sb; - else - return (Xv_opaque) NULL; -@@ -1266,7 +1266,7 @@ - return (Xv_opaque) dp->list_sb; - - 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); - -@@ -1278,7 +1278,7 @@ - return -1; /* no rows selected */ - - case PANEL_LIST_NEXT_SELECTED: -- row = *(int *) valist; -+ row = va_arg(valist, int); - node = find_or_create_nth_row(dp, row, FALSE); - if (!node) - return -1; /* specified row doesn't exist */ -@@ -1289,7 +1289,7 @@ - return -1; /* no subsequent row selected */ - - 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); - -@@ -1297,7 +1297,7 @@ - #ifdef OW_I18N - 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 - if (node != NULL) -@@ -1312,7 +1312,7 @@ - #endif /* OW_I18N */ - - 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); - -@@ -1328,7 +1328,7 @@ - #endif /* OW_I18N */ - - 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); - -@@ -1352,7 +1352,7 @@ - - - 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); - -@@ -1407,7 +1407,7 @@ - } - - 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-cf b/x11/xview-lib/patches/patch-cf deleted file mode 100644 index c5aad021748..00000000000 --- a/x11/xview-lib/patches/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/panel/p_mlinetxt.c.orig Tue Jun 29 07:17:05 1993 -+++ lib/libxview/panel/p_mlinetxt.c Thu Dec 20 10:10:38 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/patches/patch-cg b/x11/xview-lib/patches/patch-cg deleted file mode 100644 index 4bcd264f662..00000000000 --- a/x11/xview-lib/patches/patch-cg +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cg,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/ttysw/cim_change.c.orig Tue Jun 29 07:17:12 1993 -+++ lib/libxview/ttysw/cim_change.c Thu Dec 20 10:09:17 2001 -@@ -17,10 +17,10 @@ - #include <xview_private/i18n_impl.h> - #include <sys/types.h> - #include <pixrect/pixrect.h> --#include <xview_private/ttyansi.h> - #include <xview_private/charimage.h> - #include <xview_private/charscreen.h> - #include <xview_private/tty_impl.h> -+#include <xview_private/ttyansi.h> - - char boldify; - diff --git a/x11/xview-lib/patches/patch-ch b/x11/xview-lib/patches/patch-ch deleted file mode 100644 index 81040d5d33d..00000000000 --- a/x11/xview-lib/patches/patch-ch +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ch,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/ttysw/tty_gtty.c.orig Tue Jun 29 07:17:20 1993 -+++ lib/libxview/ttysw/tty_gtty.c Thu Dec 20 10:09:17 2001 -@@ -14,6 +14,7 @@ - * Ttysw parameter retrieval mechanism to get original tty settings to pty. - */ - -+#include <sys/param.h> - #include <sys/types.h> - #include <stdio.h> - #include <xview_private/portable.h> /* for tty_mode_t and XV* defines */ -@@ -34,6 +35,7 @@ - */ - #ifdef XV_USE_TERMIOS - -+#if !(defined(BSD) && (BSD >= 199103)) - static struct termios default_modes = { - BRKINT|ICRNL|IXON|IGNPAR|IMAXBEL, /* input modes */ - OPOST|ONLCR, /* output modes */ -@@ -57,6 +59,20 @@ - CWERASE, /* VWERASE */ - CLNEXT, /* VLNEXT */ - }; -+#else -+#include <sys/ttydefaults.h> -+static struct termios default_modes = { -+ TTYDEF_IFLAG, /* input modes */ -+ TTYDEF_OFLAG, /* output modes */ -+ TTYDEF_CFLAG, /* control modes */ -+ TTYDEF_LFLAG, /* local modes */ -+ /* control characters */ -+ { CEOF, CEOL, CEOL, CERASE, CWERASE, CKILL, CREPRINT, -+ _POSIX_VDISABLE, CINTR, CQUIT, CSUSP, CDSUSP, CSTART, CSTOP, CLNEXT, -+ CDISCARD, CMIN, CTIME, CSTATUS, _POSIX_VDISABLE }, -+ TTYDEF_SPEED, TTYDEF_SPEED /* input and output speeds */ -+}; -+#endif - - #else /* XV_USE_TERMIOS */ - diff --git a/x11/xview-lib/patches/patch-ci b/x11/xview-lib/patches/patch-ci deleted file mode 100644 index 708551bccff..00000000000 --- a/x11/xview-lib/patches/patch-ci +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ci,v 1.1 2001/12/20 09:20:02 tron Exp $ - ---- lib/libxview/ttysw/tty_impl.h.orig Tue Jun 29 07:17:18 1993 -+++ lib/libxview/ttysw/tty_impl.h Thu Dec 20 10:09:17 2001 -@@ -14,6 +14,7 @@ - * terminal emulation for teletype based programs. - */ - -+#include <sys/param.h> - #include <xview_private/portable.h> /* tty and pty configuration info */ - - #ifdef XV_USE_TERMIOS -@@ -210,7 +211,13 @@ - * Access functions for tty characteristics. - */ - #ifdef XV_USE_TERMIOS -+#if (defined(BSD) && (BSD >= 199103)) -+#include <sys/ioctl.h> -+#include <sys/ioctl_compat.h> -+#define tty_gettabs(t) ((t)->termios.c_oflag & OXTABS) -+#else - #define tty_gettabs(t) ((t)->termios.c_oflag & XTABS) -+#endif - #define tty_getdsuspc(t) ((int) ((t)->termios.c_cc[VDSUSP])) - #define tty_geteofc(t) ((int) ((t)->termios.c_cc[VEOF])) - #define tty_geteolc(t) ((int) ((t)->termios.c_cc[VEOL])) diff --git a/x11/xview-lib/patches/patch-cj b/x11/xview-lib/patches/patch-cj deleted file mode 100644 index 52dc0cb581a..00000000000 --- a/x11/xview-lib/patches/patch-cj +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-cj,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/tty_init.c.orig Tue Jun 29 07:17:19 1993 -+++ lib/libxview/ttysw/tty_init.c Thu Dec 20 10:09:17 2001 -@@ -14,6 +14,7 @@ - * Ttysw initialization, destruction and error procedures - */ - -+#include <sys/param.h> - #include <sys/time.h> - #include <sys/types.h> - #include <sys/stat.h> -@@ -82,7 +83,11 @@ - - extern char *strncpy(); - extern char *strcpy(); -+#if (defined(BSD) && (BSD >= 199306)) -+extern off_t lseek(); -+#else - extern long lseek(); -+#endif - char *textsw_checkpoint_undo(); - - /* static */ void ttysw_parseargs(); -@@ -106,6 +111,7 @@ - - extern int ttysel_use_seln_service; - -+static int ttyinit(); - - struct ttysw_createoptions { - int becomeconsole; /* be the console */ -@@ -518,6 +524,9 @@ - (void) dup2(ttysw->ttysw_tty, 2); - (void) close(ttysw->ttysw_tty); - -+#if (defined(BSD) && (BSD >= 199103)) -+ (void) ioctl(0, TIOCSCTTY, NULL); -+#endif - if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) { - /* Process arg list */ - int argc; -@@ -955,7 +964,11 @@ - struct utmpx utmp; - #endif - struct passwd *passwdent; -+#if !(defined(BSD) && (BSD >= 199103)) - extern struct passwd *getpwuid(); -+#else -+ struct passwd *getpwuid __P((uid_t)); -+#endif - int f; - char *ttyn; - extern char *ttyname(); -@@ -1007,13 +1020,22 @@ - XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n")); - return (0); - } -+#if !(defined(BSD) && (BSD >= 199103)) - if ((f = open("/etc/utmp", 1)) >= 0) { -+#else -+ if ((f = open(_PATH_UTMP, 1)) >= 0) { -+#endif - (void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0); - (void) write(f, (char *) &utmp, sizeof(utmp)); - (void) close(f); - } else { - (void) fprintf(stderr, -+#if !(defined(BSD) && (BSD >= 199103)) - XV_MSG("make sure that you can write /etc/utmp!\n")); -+#else -+ XV_MSG("make sure that you can write ")); -+ (void) fprintf(stderr, "%s!\n", _PATH_UTMP); -+#endif - return (0); - } - return (ttyslotuse); diff --git a/x11/xview-lib/patches/patch-ck b/x11/xview-lib/patches/patch-ck deleted file mode 100644 index 0fab4f122a9..00000000000 --- a/x11/xview-lib/patches/patch-ck +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ck,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/tty_main.c.orig Tue Jun 29 07:17:22 1993 -+++ lib/libxview/ttysw/tty_main.c Thu Dec 20 10:09:17 2001 -@@ -75,6 +75,11 @@ - int committed_left = 0; - #endif - -+static int ttysw_process_point(); -+static int ttysw_process_adjust(); -+static int ttysw_process_motion(); -+static int ttysw_process_keyboard(); -+ - extern Textsw_index textsw_insert(); - #ifdef OW_I18N - extern Textsw_index textsw_insert_wcs(); -@@ -906,8 +911,12 @@ - - if (int_ucntl == (tiocsti & 0xff)) - ttysw_process_STI(ttysw, owbp, cc - 1); -+#ifndef XV_USE_TERMIOS - (void) ioctl(ttysw->ttysw_tty, TIOCGETC, &ttysw->tchars); - (void) ioctl(ttysw->ttysw_tty, TIOCGLTC, &ttysw->ltchars); -+#else -+ (void) tcgetattr(ttysw->ttysw_tty, &ttysw->termios); -+#endif - ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw)); /* jcb for nng */ - } else - #ifdef OW_I18N diff --git a/x11/xview-lib/patches/patch-cl b/x11/xview-lib/patches/patch-cl deleted file mode 100644 index 25cdf7269f8..00000000000 --- a/x11/xview-lib/patches/patch-cl +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-cl,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/tty_ntfy.c.orig Tue Jun 29 07:17:17 1993 -+++ lib/libxview/ttysw/tty_ntfy.c Thu Dec 20 10:09:17 2001 -@@ -171,10 +171,14 @@ - * SIGWINCHes on resize. - */ - /* Notify process group that terminal has changed. */ -+#if !(defined(BSD) && (BSD >= 199103)) - if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &pgrp) == -1) { - perror(XV_MSG("ttysw_sigwinch, can't get tty process group")); - return; - } -+#else -+ pgrp = tcgetpgrp(ttysw->ttysw_pty); -+#endif - /* - * Only killpg when pgrp is not tool's. This is the case of haven't - * completed ttysw_fork yet (or even tried to do it yet). -@@ -204,7 +208,11 @@ - return; - } - /* Send the signal to the process group of the controlling tty */ -+#if !(defined(BSD) && (BSD >= 199103)) - if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &control_pg) >= 0) { -+#else -+ if ((control_pg = tcgetpgrp(ttysw->ttysw_pty)) >= 0) { -+#endif - /* - * Flush our buffers of completed and partial commands. Be sure to do - * this BEFORE killpg, or we'll flush the prompt coming back from the -@@ -227,11 +235,11 @@ - termsw->cmd_started = 0; - termsw->pty_owes_newline = 0; - } --# if defined(XV_USE_SVR4_PTYS) || defined(sun) -+#if defined(XV_USE_SVR4_PTYS) || defined(sun) - (void) ioctl(ttysw->ttysw_pty, TIOCSIGNAL, &sig);; --# else -+#else - (void) killpg(control_pg, sig); --# endif -+#endif - } else - perror(XV_MSG("ioctl")); - } diff --git a/x11/xview-lib/patches/patch-cm b/x11/xview-lib/patches/patch-cm deleted file mode 100644 index bbb4a02f163..00000000000 --- a/x11/xview-lib/patches/patch-cm +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cm,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/ttyansi.c.orig Tue Jun 29 07:17:21 1993 -+++ lib/libxview/ttysw/ttyansi.c Thu Dec 20 10:09:17 2001 -@@ -31,6 +31,10 @@ - - #include <xview/sel_attrs.h> - -+static int send_input_to_textsw(); -+static int ansi_lf(); -+static int ansi_char(); -+ - char *strncpy(); - char *textsw_checkpoint_undo(); - Textsw_index textsw_replace_i18n(), textsw_erase_i18n(); diff --git a/x11/xview-lib/patches/patch-cn b/x11/xview-lib/patches/patch-cn deleted file mode 100644 index 64f45cde5a3..00000000000 --- a/x11/xview-lib/patches/patch-cn +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cn,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/ttyselect.c.orig Sun Jun 26 03:05:23 1994 -+++ lib/libxview/ttysw/ttyselect.c Thu Dec 20 10:09:17 2001 -@@ -75,6 +75,8 @@ - #endif - ttysel_reply(); - -+static ttysel_resynch(); -+ - static struct ttyselection * - ttysel_from_rank(); - diff --git a/x11/xview-lib/patches/patch-co b/x11/xview-lib/patches/patch-co deleted file mode 100644 index 51e2867a10b..00000000000 --- a/x11/xview-lib/patches/patch-co +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-co,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/ttysw/tty_mapkey.c.orig Tue Jun 29 07:17:20 1993 -+++ lib/libxview/ttysw/tty_mapkey.c Thu Dec 20 10:09:19 2001 -@@ -500,7 +500,7 @@ - * have more time. - */ - --#ifdef i386 -+#if defined(i386) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - static void - ttysw_arrow_keys_to_string(xv_id, str) - unsigned xv_id; diff --git a/x11/xview-lib/patches/patch-cp b/x11/xview-lib/patches/patch-cp deleted file mode 100644 index 164a4ef0f9c..00000000000 --- a/x11/xview-lib/patches/patch-cp +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-cp,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/cim_size.c.orig Tue Jun 29 07:17:14 1993 -+++ lib/libxview/ttysw/cim_size.c Thu Dec 20 10:09:19 2001 -@@ -156,19 +156,19 @@ - { - - if (lines_ptr) { -- cfree((CHAR *) (lines_ptr)); -+ free((CHAR *) (lines_ptr)); - lines_ptr = NULL; - } - if (image) { -- cfree((CHAR **) image); -+ free((CHAR **) image); - image = NULL; - } - if (mode_ptr) { -- cfree((char *) (mode_ptr)); -+ free((char *) (mode_ptr)); - mode_ptr = NULL; - } - if (screenmode) { -- cfree((char **) screenmode); -+ free((char **) screenmode); - screenmode = NULL; - } - } diff --git a/x11/xview-lib/patches/patch-cq b/x11/xview-lib/patches/patch-cq deleted file mode 100644 index ab739015ed3..00000000000 --- a/x11/xview-lib/patches/patch-cq +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cq,v 1.1 2001/12/20 09:20:03 tron Exp $ - ---- lib/libxview/ttysw/termsw.c.orig Tue Jun 29 07:17:15 1993 -+++ lib/libxview/ttysw/termsw.c Thu Dec 20 10:10:10 2001 -@@ -252,8 +252,12 @@ - - /* Generate a new temporary file name and open the file up. */ - (void) strcpy(tmpfile_name, "/tmp/tty.txt.XXXXXX"); -+#if (defined(BSD) && (BSD >= 199103)) -+ if ((fd = mkstemp(tmpfile_name)) < 0) { -+#else - (void) mktemp(tmpfile_name); - if ((fd = open(tmpfile_name, O_CREAT | O_RDWR | O_EXCL, 0600)) < 0) { -+#endif - return (XV_ERROR); - } - (void) close(fd); diff --git a/x11/xview-lib/patches/patch-cr b/x11/xview-lib/patches/patch-cr deleted file mode 100644 index feefcf069db..00000000000 --- a/x11/xview-lib/patches/patch-cr +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-cr,v 1.1 2001/12/20 09:20:04 tron Exp $ - ---- lib/libxview/wmgr/wmgr_menu.c.orig Tue Jun 29 07:17:24 1993 -+++ lib/libxview/wmgr/wmgr_menu.c Thu Dec 20 10:09:53 2001 -@@ -10,16 +10,22 @@ - * file for terms of the license. - */ - -+#include <sys/param.h> - #include <sys/types.h> - #include <stdio.h> - #include <ctype.h> - #include <string.h> -+ -+#if defined(BSD) && (BSD >= 199306) -+#include <unistd.h> -+#else - #ifdef sparc - #ifdef SVR4 - #include <unistd.h> - #else - #include <vfork.h> - #endif SVR4 -+#endif sparc - #endif - - #include <xview/frame.h> diff --git a/x11/xview-lib/patches/patch-cs b/x11/xview-lib/patches/patch-cs deleted file mode 100644 index 5bb7d9bf395..00000000000 --- a/x11/xview-lib/patches/patch-cs +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cs,v 1.1 2001/12/20 09:20:04 tron Exp $ - ---- lib/libxview/textsw/ei_text.c.orig Tue Jun 29 07:17:37 1993 -+++ lib/libxview/textsw/ei_text.c Thu Dec 20 10:09:17 2001 -@@ -121,6 +121,7 @@ - #endif - static struct ei_span_result ei_plain_text_span_of_group(); - static struct ei_process_result ei_plain_text_expand(); -+static paint_batch(); - - struct ei_ops ei_plain_text_ops = { - ei_plain_text_destroy, diff --git a/x11/xview-lib/patches/patch-ct b/x11/xview-lib/patches/patch-ct deleted file mode 100644 index 23d81e69e4c..00000000000 --- a/x11/xview-lib/patches/patch-ct +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ct,v 1.1 2001/12/20 09:20:04 tron Exp $ - ---- lib/libxview/textsw/es_attr.c.orig Tue Jun 29 07:17:31 1993 -+++ lib/libxview/textsw/es_attr.c Thu Dec 20 10:09:17 2001 -@@ -22,7 +22,7 @@ - - Pkg_private int - #ifdef ANSI_FUNC_PROTO --es_set(register Es_handle esh, ...) -+es_set(Es_handle esh, ...) - #else - es_set(esh, va_alist) - register Es_handle esh; diff --git a/x11/xview-lib/patches/patch-cu b/x11/xview-lib/patches/patch-cu deleted file mode 100644 index fd9937f6ce3..00000000000 --- a/x11/xview-lib/patches/patch-cu +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cu,v 1.1 2001/12/20 09:20:04 tron Exp $ - ---- lib/libxview/textsw/ev_op_bdry.c.orig Tue Jun 29 07:17:30 1993 -+++ lib/libxview/textsw/ev_op_bdry.c Thu Dec 20 10:09:17 2001 -@@ -28,6 +28,9 @@ - static Ev_finger_handle ev_insert_finger(); - static Ev_mark_object last_generated_id; - -+static int ev_find_finger_internal(); -+static ev_remove_finger_internal(); -+ - #define FORALL(index_var) \ - for (index_var = 0; index_var < fingers->last_plus_one; index_var++) - diff --git a/x11/xview-lib/patches/patch-cv b/x11/xview-lib/patches/patch-cv deleted file mode 100644 index 93cd892b86c..00000000000 --- a/x11/xview-lib/patches/patch-cv +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-cv,v 1.1 2001/12/20 09:20:04 tron Exp $ - ---- lib/libxview/textsw/ps_impl.c.orig Tue Jun 29 07:17:39 1993 -+++ lib/libxview/textsw/ps_impl.c Thu Dec 20 10:09:17 2001 -@@ -62,6 +62,10 @@ - static Es_index ps_replace(), ps_scratch_replace(); - static int ps_set(); - -+static int get_current_offset(); -+ -+static copy_pieces(); -+ - static Es_index write_header_etc(); - - static struct es_ops ps_ops = { diff --git a/x11/xview-lib/patches/patch-cw b/x11/xview-lib/patches/patch-cw deleted file mode 100644 index 804da95bc16..00000000000 --- a/x11/xview-lib/patches/patch-cw +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-cw,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_again.c.orig Tue Jun 29 07:17:32 1993 -+++ lib/libxview/textsw/txt_again.c Thu Dec 20 10:11:57 2001 -@@ -28,6 +28,8 @@ Pkg_private CHAR *STRNCPY(); - Pkg_private Es_index textsw_do_input(); - Pkg_private Es_index textsw_do_pending_delete(); - -+static int textsw_string_min_free(); -+ - string_t null_string = {0, 0, 0}; - - #define TEXT_DELIMITER "\\" -@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi - * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT: - * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine. - */ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #ifndef SVR4 - - /* VARARGS2 */ -@@ -325,6 +328,46 @@ va_dcl - - #endif /* SVR4 */ - -+#elif defined(__DragonFly__) -+static int -+textsw_printf(register string_t *ptr_to_string, char *fmt, ...) -+{ -+ int result; -+ va_list args; -+ -+ VA_START(args, fmt); -+ result = vsnprintf(TXTSW_STRING_FREE(ptr_to_string), ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string), fmt, args); -+ if (result >=0) -+ TXTSW_STRING_FREE(ptr_to_string) += result; -+ return(result); -+} -+ -+ -+#else /* __FreeBSD__ */ -+/*inspiration taken from sprintf.c */ -+ -+static int -+textsw_printf(register string_t *ptr_to_string, char *fmt, ...) -+{ -+ FILE _strbuf; -+ int result; -+ va_list args; -+ _strbuf._flags = __SWR | __SSTR; -+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string); -+ _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string); -+ VA_START(args, fmt); -+ result = vfprintf (&_strbuf, fmt, args); -+ va_end(args); -+ TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p; -+#ifndef lint -+ if (result >= 0) -+ putc('\0', &_strbuf); -+#endif -+ return (result); -+} -+ -+#endif /* __FreeBSD__ */ -+ - static void - textsw_record_buf(again, buffer, buffer_length) - register string_t *again; -@@ -619,6 +662,8 @@ textsw_record_trash_insert(textsw) - */ - /* VARARGS2 */ - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) -+ - static int - #ifdef ANSI_FUNC_PROTO - textsw_scanf(register string_t *ptr_to_string, register char *fmt, ...) -@@ -705,6 +750,57 @@ va_dcl - - #endif /* OW_I18N */ - } -+#elif defined(__DragonFly__) -+static int -+textsw_scanf(register string_t *ptr_to_string, char *fmt, ...) -+{ -+ va_list args; -+ int result; -+ size_t len = TXTSW_STRING_LENGTH(ptr_to_string); -+ char *str = malloc(len + 1); -+ if (str == NULL) -+ return -1; -+ memcpy(str, TXTSW_STRING_BASE(ptr_to_string), len); -+ str[len] = '\0'; -+ VA_START(args, fmt); -+ result = vsscanf(str, fmt, args); -+ va_end(args); -+ free(str); -+ return(result); -+} -+ -+#else /* __FreeBSD__ */ -+/*inspiration/code taken from sscanf.c */ -+ -+static int -+eofread(cookie, buf, len) -+ void *cookie; -+ char *buf; -+ int len; -+{ -+ -+ return (0); -+} -+ -+static int -+textsw_scanf(register string_t *ptr_to_string, char *fmt, ...) -+{ -+ FILE _strbuf; -+ int result; -+ va_list args; -+ -+ memset(&_strbuf, '\0', sizeof(_strbuf)); -+ _strbuf._flags = __SRD; -+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string); -+ _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string); -+ _strbuf._read = eofread; -+ VA_START(args, fmt); -+ result = __svfscanf(&_strbuf, fmt, args); -+ va_end(args); -+ TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p; -+ return (result); -+} -+#endif /* __FreeBSD__ */ - - static int - textsw_next_is_delimiter(again) diff --git a/x11/xview-lib/patches/patch-cx b/x11/xview-lib/patches/patch-cx deleted file mode 100644 index d650952f7af..00000000000 --- a/x11/xview-lib/patches/patch-cx +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-cx,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_e_menu.c.orig Tue Jun 29 07:17:42 1993 -+++ lib/libxview/textsw/txt_e_menu.c Thu Dec 20 10:09:17 2001 -@@ -45,13 +45,16 @@ static char sccsid[] = "@(#)txt_e_me - * Declare errno. Some BSD systems do not have errno declared in - * <errno.h> - */ --extern int errno; - - #define ERROR -1 - - #define MAX_FILES 40 -+#ifndef MAXPATHLEN - #define MAXPATHLEN 1024 -+#endif -+#ifndef EXTRASMENU - #define EXTRASMENU "text_extras_menu" -+#endif - #define MAXSTRLEN 256 - #define MAXARGS 20 - -@@ -78,6 +81,8 @@ static char *check_filename_locale(); - - extern int EXTRASMENU_FILENAME_KEY; - -+static any_shell_meta(); -+ - Pkg_private char * - textsw_get_extras_filename(mi) - Menu_item mi; -@@ -136,7 +141,7 @@ textsw_get_extras_filename(mi) - goto found; - } - --#ifdef notdef -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - /* Gee, still?... We will try the old fashioned way */ - (void) sprintf(tmp, "%s/lib/.%s", - filename, EXTRASMENU); diff --git a/x11/xview-lib/patches/patch-cy b/x11/xview-lib/patches/patch-cy deleted file mode 100644 index 9d4aae8e785..00000000000 --- a/x11/xview-lib/patches/patch-cy +++ /dev/null @@ -1,440 +0,0 @@ -$NetBSD: patch-cy,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_file.c.orig 1993-06-29 07:17:48.000000000 +0200 -+++ lib/libxview/textsw/txt_file.c 2004-09-30 22:24:41.000000000 +0200 -@@ -18,6 +18,7 @@ static char sccsid[] = "@(#)txt_file - #include <xview_private/txt_impl.h> - #include <xview_private/ev_impl.h> - #include <xview_private/txt_18impl.h> -+#include <limits.h> - #ifdef SVR4 - #include <dirent.h> - #include <string.h> -@@ -45,13 +46,27 @@ static char sccsid[] = "@(#)txt_file - - extern CHAR *STRCAT(); - extern CHAR *STRNCAT(); --#ifdef SVR4 -+ -+#if (defined(SVR4) || (__NetBSD_Version__ >= 103080000)) || defined(__DragonFly__) -+#define GETCWD -+#endif -+ -+#ifdef GETCWD - extern char *getcwd(); - #else - extern char *getwd(); --#endif /* SVR4 */ -+#endif /* GETCWD */ -+#if (defined(BSD) && (BSD >= 199306)) -+#if defined(__DragonFly__) || (defined(__NetBSD__) && __NetBSD_Version__ > 103080000) -+#include <errno.h> -+#else -+extern int errno, sys_nerr; -+extern const char *const sys_errlist[]; -+#endif -+#else - extern int errno, sys_nerr; - extern char *sys_errlist[]; -+#endif - - Pkg_private int textsw_change_directory(); - Pkg_private void textsw_display(), textsw_display_view_margins(); -@@ -314,7 +329,11 @@ textsw_load_selection(folio, locx, locy, - register int locx, locy; - int no_cd; - { -+#ifdef NAME_MAX -+ CHAR filename[NAME_MAX]; -+#else - CHAR filename[MAXNAMLEN]; -+#endif - register int result; - - if (textsw_get_selection_as_filename( -@@ -354,21 +373,21 @@ textsw_full_pathname(name) - } - - #ifdef OW_I18N --#ifdef SVR4 -+#ifdef GETCWD - if (getcwd(pathname_mb, MAXPATHLEN) == 0) - #else - if (getwd(pathname_mb) == 0) --#endif /* SVR4 */ -+#endif /* GETCWD */ - return (0); - (void) mbstowcs(pathname, pathname_mb, MAXPATHLEN-1); - - #else /* OW_I18N */ - --#ifdef SVR4 -+#ifdef GETCWD - if (getcwd(pathname, MAXPATHLEN) == 0) - #else - if (getwd(pathname) == 0) --#endif /* SVR4 */ -+#endif /* GETCWD */ - return (0); - #endif /* OW_I18N */ - -@@ -459,8 +478,13 @@ textsw_load_file(abstract, filename, res - int reset_views; - int locx, locy; - { -+#ifdef NAME_MAX -+ char notice_msg_buf[NAME_MAX + 100]; -+ CHAR scratch_name[NAME_MAX]; -+#else - char notice_msg_buf[MAXNAMLEN + 100]; - CHAR scratch_name[MAXNAMLEN]; -+#endif - int result; - Es_status status; - Es_handle new_esh; -@@ -546,7 +570,11 @@ textsw_load_file_quietly(abstract, filen - int reset_views; - int locx, locy; - { -+#ifdef NAME_MAX -+ CHAR scratch_name[NAME_MAX]; -+#else - CHAR scratch_name[MAXNAMLEN]; -+#endif - Es_status status; - Es_handle new_esh; - Es_index start_at; -@@ -587,7 +615,11 @@ textsw_save_store_common(folio, output_n - CHAR *output_name; - int reload; - { -+#ifdef NAME_MAX -+ CHAR scratch_name[NAME_MAX]; -+#else - CHAR scratch_name[MAXNAMLEN]; -+#endif - Es_handle new_esh; - register Es_handle output; - Es_status result; -@@ -604,9 +636,16 @@ textsw_save_store_common(folio, output_n - es_destroy(output); - if (folio->checkpoint_name) { - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char temp_mb[NAME_MAX]; -+ -+ (void) wcstombs(temp_mb, folio->checkpoint_name, NAME_MAX); -+#else - char temp_mb[MAXNAMLEN]; - - (void) wcstombs(temp_mb, folio->checkpoint_name, MAXNAMLEN); -+#endif -+ - if (unlink(temp_mb) == -1) { /* } for match */ - #else - if (unlink(folio->checkpoint_name) == -1) { -@@ -733,7 +772,11 @@ textsw_save_internal(folio, error_buf, l - int locx, locy; /* Currently unused */ - { - Pkg_private Es_handle es_file_make_backup(); -+#ifdef NAME_MAX -+ CHAR original_name[NAME_MAX], *name; -+#else - CHAR original_name[MAXNAMLEN], *name; -+#endif - register char *msg; - Es_handle backup, original = ES_NULL; - int status; -@@ -826,10 +869,16 @@ Was the file edited with another editor? - textsw_save_store_common(folio, original_name, RELOAD)) { - case ES_SUCCESS: { - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char original_name_mb[NAME_MAX]; -+ -+ (void) wcstombs(original_name_mb, original_name, NAME_MAX); -+#else - char original_name_mb[MAXNAMLEN]; - - (void) wcstombs(original_name_mb, original_name, MAXNAMLEN); - #endif -+#endif - (void) es_destroy(original); - textsw_notify(folio->first_view, - #ifdef OW_I18N -@@ -868,7 +917,11 @@ textsw_save(abstract, locx, locy) - Textsw abstract; - int locx, locy; - { -+#ifdef NAME_MAX -+ char error_buf[NAME_MAX]; -+#else - char error_buf[MAXNAMLEN + 100]; -+#endif - Es_status status; - Textsw_view_handle view = VIEW_ABS_TO_REP(abstract); - -@@ -969,7 +1022,11 @@ textsw_cd(textsw, locx, locy) - Textsw_folio textsw; - int locx, locy; - { -+#ifdef NAME_MAX -+ CHAR buf[NAME_MAX]; -+#else - CHAR buf[MAXNAMLEN]; -+#endif - - if (0 == textsw_get_selection_as_filename( - textsw, buf, SIZEOF(buf), locx, locy)) { -@@ -988,15 +1045,27 @@ textsw_get_from_file(view, filename, pri - int fd; - Es_status status; - Textsw_status result = TEXTSW_STATUS_CANNOT_INSERT_FROM_FILE; -+#ifdef NAME_MAX -+ CHAR buf[NAME_MAX]; -+#else - CHAR buf[MAXNAMLEN]; -+#endif - - if (!TXTSW_IS_READ_ONLY(folio) && ((int)STRLEN(filename) > 0)) { - STRCPY(buf, filename); - #ifdef OW_I18N -+#ifdef NAME_MAX -+ if (textsw_expand_filename(folio, buf, NAME_MAX, -1, -1) == 0) {/* } */ -+ char buf_mb[NAME_MAX]; -+ -+ (void) wcstombs(buf_mb, buf, NAME_MAX); -+#else - if (textsw_expand_filename(folio, buf, MAXNAMLEN, -1, -1) == 0) {/* } */ - char buf_mb[MAXNAMLEN]; - - (void) wcstombs(buf_mb, buf, MAXNAMLEN); -+#endif -+ - if ((fd = open(buf_mb, 0)) >= 0) { /* } for match */ - textsw_implicit_commit(folio); - #else -@@ -1034,9 +1103,15 @@ textsw_file_stuff(view, locx, locy) - { - Textsw_folio folio = FOLIO_FOR_VIEW(view); - int fd; -+#ifdef NAME_MAX -+ CHAR buf[NAME_MAX]; -+ char msg[NAME_MAX + 100], *sys_msg; -+ char notice_msg1[NAME_MAX + 100]; -+#else - CHAR buf[MAXNAMLEN]; - char msg[MAXNAMLEN + 100], *sys_msg; - char notice_msg1[MAXNAMLEN + 100]; -+#endif - char *notice_msg2; - Es_status status; - int cannot_open = 0; -@@ -1047,9 +1122,15 @@ textsw_file_stuff(view, locx, locy) - if (0 == textsw_get_selection_as_filename( - folio, buf, SIZEOF(buf), locx, locy)) { - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char buf_mb[NAME_MAX]; -+ -+ (void) wcstombs(buf_mb, buf, NAME_MAX); -+#else - char buf_mb[MAXNAMLEN]; - - (void) wcstombs(buf_mb, buf, MAXNAMLEN); -+#endif - if ((fd = open(buf_mb, 0)) < 0) { /* } for match */ - #else - if ((fd = open(buf, 0)) < 0) { -@@ -1141,8 +1222,13 @@ textsw_file_stuff_from_str(view, buf, lo - { - Textsw_folio folio = FOLIO_FOR_VIEW(view); - int fd; -+#ifdef NAME_MAX -+ char msg[NAME_MAX + 100], *sys_msg; -+ char notice_msg1[NAME_MAX + 100]; -+#else - char msg[MAXNAMLEN + 100], *sys_msg; - char notice_msg1[MAXNAMLEN + 100]; -+#endif - char *notice_msg2; - Es_status status; - int cannot_open = 0; -@@ -1150,9 +1236,15 @@ textsw_file_stuff_from_str(view, buf, lo - Xv_Notice text_notice; - Frame frame; - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char buf_mb[NAME_MAX]; -+ -+ (void) wcstombs(buf_mb, buf, NAME_MAX); -+#else - char buf_mb[MAXNAMLEN]; - - (void) wcstombs(buf_mb, buf, MAXNAMLEN); -+#endif - if ((fd = open(buf_mb, 0)) < 0) { /* } for match */ - #else - if ((fd = open(buf, 0)) < 0) { -@@ -1245,9 +1337,15 @@ textsw_store_init(textsw, filename) - { - struct stat stat_buf; - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char filename_mb[NAME_MAX]; -+ -+ (void) wcstombs(filename_mb, filename, NAME_MAX); -+#else - char filename_mb[MAXNAMLEN]; - - (void) wcstombs(filename_mb, filename, MAXNAMLEN); -+#endif - if (stat(filename_mb, &stat_buf) == 0) { /* } for match */ - #else - if (stat(filename, &stat_buf) == 0) { -@@ -1310,10 +1408,16 @@ textsw_process_store_error(textsw, filen - case ES_CANNOT_OVERWRITE: - #ifdef OW_I18N - { -+#ifdef NAME_MAX -+ char filename_mb[NAME_MAX]; -+ -+ (void) wcstombs(filename_mb, filename, NAME_MAX); -+#else - char filename_mb[MAXNAMLEN]; - - (void) wcstombs(filename_mb, filename, MAXNAMLEN); - #endif -+#endif - frame = FRAME_FROM_FOLIO_OR_VIEW(textsw); - text_notice = (Xv_Notice)xv_get(frame, - XV_KEY_DATA, text_notice_key, -@@ -1465,9 +1569,12 @@ textsw_store_file_internal(abstract, fil - if (status == ES_SUCCESS) { - if (textsw->state & TXTSW_STORE_CHANGES_FILE) { - #ifdef OW_I18N -- char filename_mbs[MAXNAMLEN]; -+#ifdef NAME_MAX -+ char filename_mbs[NAME_MAX]; - -- (void) wcstombs(filename_mbs, filename, MAXNAMLEN); -+ (void) wcstombs(filename_mbs, filename, NAME_MAX); -+#else -+#endif - textsw_notify(textsw->first_view, - TEXTSW_ACTION_LOADED_FILE, filename_mbs, - TEXTSW_ACTION_LOADED_FILE_WCS, filename, 0); -@@ -1491,9 +1598,15 @@ textsw_store_file(abstract, filename, lo - int locx, locy; - { - #ifdef OW_I18N -+#ifdef NAME_MAX -+ CHAR filename_wcs[NAME_MAX]; -+ -+ (void) mbstowcs(filename_wcs, filename, NAME_MAX); -+#else - CHAR filename_wcs[MAXNAMLEN]; - - (void) mbstowcs(filename_wcs, filename, MAXNAMLEN); -+#endif - return (textsw_store_file_internal(abstract, filename_wcs, locx, locy)); - #else - return (textsw_store_file_internal(abstract, filename, locx, locy)); -@@ -1516,7 +1629,11 @@ textsw_store_to_selection(textsw, locx, - Textsw_folio textsw; - int locx, locy; - { -+#ifdef NAME_MAX -+ CHAR filename[NAME_MAX]; -+#else - CHAR filename[MAXNAMLEN]; -+#endif - - if (textsw_get_selection_as_filename( - textsw, filename, SIZEOF(filename), locx, locy)) -@@ -1545,11 +1662,19 @@ textsw_reset_2(abstract, locx, locy, pre - #endif /* SVR4 */ - Pkg_private Es_handle es_mem_create(); - Es_handle piece_esh, old_original_esh, new_original_esh; -+ char *temp_name; -+#ifdef NAME_MAX -+#ifdef OW_I18N -+ CHAR *name, save_name[NAME_MAX], scratch_name[NAME_MAX]; -+#else -+ char *name, save_name[NAME_MAX], scratch_name[NAME_MAX]; -+#endif -+#else - #ifdef OW_I18N - CHAR *name, save_name[MAXNAMLEN], scratch_name[MAXNAMLEN]; -- char *temp_name; - #else -- char *name, save_name[MAXNAMLEN], scratch_name[MAXNAMLEN], *temp_name; -+ char *name, save_name[MAXNAMLEN], scratch_name[MAXNAMLEN]; -+#endif - #endif - int status; - Textsw_folio folio = FOLIO_FOR_VIEW(VIEW_ABS_TO_REP(abstract)); -@@ -1591,7 +1716,11 @@ textsw_reset_2(abstract, locx, locy, pre - (char *) window_get(abstract, TEXTSW_TEMP_FILENAME); - if (temp_name) - #ifdef OW_I18N -+#ifdef NAME_MAX -+ (void) mbstowcs(save_name, temp_name, NAME_MAX); -+#else - (void) mbstowcs(save_name, temp_name, MAXNAMLEN); -+#endif - #else - (void) STRCPY(save_name, temp_name); - #endif -@@ -2150,7 +2279,11 @@ textsw_post_error(folio_or_view, locx, l - int locx, locy; /* Unused */ - char *msg1, *msg2; - { -+#ifdef NAME_MAX -+ char buf[NAME_MAX + 1000]; -+#else - char buf[MAXNAMLEN + 1000]; -+#endif - int size_to_use = sizeof(buf); - Frame frame; - Xv_Notice text_notice; -@@ -2226,8 +2359,13 @@ textsw_change_directory(textsw, filename - CHAR *full_pathname_wc; - char filename[MAXPATHLEN]; - #endif -+#ifdef NAME_MAX -+ char msg[NAME_MAX + 100]; -+ char notice_msg[NAME_MAX + 100]; -+#else - char msg[MAXNAMLEN + 100]; - char notice_msg[MAXNAMLEN + 100]; -+#endif - struct stat stat_buf; - int result = 0; - int notice_result; -@@ -2402,8 +2540,13 @@ textsw_checkpoint_internal(folio) - CHAR *name; - if (textsw_file_name(folio, &name) != 0) - return (ES_CANNOT_GET_NAME); -+#ifdef NAME_MAX -+ if ((folio->checkpoint_name = (CHAR *) MALLOC(NAME_MAX)) == 0) -+ return (ES_CANNOT_GET_NAME); -+#else - if ((folio->checkpoint_name = (CHAR *) MALLOC(MAXNAMLEN)) == 0) - return (ES_CANNOT_GET_NAME); -+#endif - #ifdef OW_I18N - (void) SPRINTF(folio->checkpoint_name, "%ws%%%%", name); - #else -@@ -2773,7 +2916,11 @@ textsw_invalid_data_notice(view, filenam - int flag; - { - Xv_Notice text_notice; -+#ifdef NAME_MAX -+ char notice_msg[NAME_MAX + 300]; -+#else - char notice_msg[MAXNAMLEN + 300]; -+#endif - Frame frame = FRAME_FROM_FOLIO_OR_VIEW(view); - - if (flag) { diff --git a/x11/xview-lib/patches/patch-cz b/x11/xview-lib/patches/patch-cz deleted file mode 100644 index c025db47305..00000000000 --- a/x11/xview-lib/patches/patch-cz +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cz,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_input.c.orig Tue Jun 29 07:17:42 1993 -+++ lib/libxview/textsw/txt_input.c Thu Dec 20 10:09:17 2001 -@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)txt_inpu - #include <stdlib.h> - #endif /* SVR4 */ - --extern int errno; -- - Pkg_private Xv_Cursor move_cursor, dup_cursor; /* laf */ - Pkg_private void termsw_menu_set(); - Pkg_private Key_map_handle textsw_do_filter(); -@@ -57,6 +55,8 @@ static void textsw_do_undo(); - Pkg_private void textsw_implicit_commit_doit(); - #endif - -+static int textsw_do_newline(); -+ - #define SPACE_CHAR 0x20 - - Pkg_private int diff --git a/x11/xview-lib/patches/patch-da b/x11/xview-lib/patches/patch-da deleted file mode 100644 index d5a5c9189e2..00000000000 --- a/x11/xview-lib/patches/patch-da +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-da,v 1.1 2001/12/20 09:20:05 tron Exp $ - ---- lib/libxview/textsw/txt_move.c.orig Tue Jun 29 07:17:47 1993 -+++ lib/libxview/textsw/txt_move.c Thu Dec 20 10:09:17 2001 -@@ -55,7 +55,7 @@ - - static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */ - static int dnd_view_key = 0; --static int DndConvertProc(); -+int DndConvertProc(); - - Pkg_private Es_handle textsw_esh_for_span(); - Pkg_private Es_index ev_resolve_xy(); -@@ -688,7 +688,7 @@ - xv_destroy(dnd_accept_cursor); - } - --static int -+int - DndConvertProc(dnd, type, data, length, format) - Dnd dnd; - Atom *type; diff --git a/x11/xview-lib/patches/patch-db b/x11/xview-lib/patches/patch-db deleted file mode 100644 index 82018f5a5c9..00000000000 --- a/x11/xview-lib/patches/patch-db +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-db,v 1.1 2001/12/20 09:20:05 tron Exp $ - ---- lib/libxview/textsw/txt_popup.c.orig Tue Jun 29 07:17:38 1993 -+++ lib/libxview/textsw/txt_popup.c Thu Dec 20 10:09:17 2001 -@@ -95,6 +95,10 @@ - static int TEXTSW_POPUP_KEY; /* key data holding one of the above - key names */ - -+static void add_exten_item(); -+static int fc_exten_func(); -+static void show_dot_files_proc(); -+ - Panel_item store_panel_items[MAX_FILE_PANEL_ITEMS]; - Panel_item load_panel_items[MAX_FILE_PANEL_ITEMS]; - Panel_item include_panel_items[MAX_FILE_PANEL_ITEMS]; -@@ -135,7 +139,6 @@ - Frame popup_frame, base_frame; - Panel panel = NULL; - char *label; -- void add_exten_item(); - #ifdef OW_I18N - int win_use_im = ((popup_type != TEXTSW_MENU_SEL_MARK_TEXT) && - (popup_type != TEXTSW_MENU_NORMALIZE_LINE)); -@@ -502,8 +505,6 @@ - int frame_width; - int frame_height; - Panel_item item; -- void show_dot_files_proc(); -- int fc_exten_func(); - - - panel = xv_get(fc, FRAME_CMD_PANEL); diff --git a/x11/xview-lib/patches/patch-dc b/x11/xview-lib/patches/patch-dc deleted file mode 100644 index 62a7e6c4551..00000000000 --- a/x11/xview-lib/patches/patch-dc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dc,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_putkey.c.orig Tue Jun 29 07:17:41 1993 -+++ lib/libxview/textsw/txt_putkey.c Thu Dec 20 10:09:17 2001 -@@ -19,7 +19,7 @@ static char sccsid[] = "@(#)txt_putk - #include <xview_private/ev_impl.h> - #include <errno.h> - --extern int errno; -+static int textsw_do_put(); - - Pkg_private Ev_finger_handle ev_add_finger(); - Pkg_private int ev_get_selection(); diff --git a/x11/xview-lib/patches/patch-dd b/x11/xview-lib/patches/patch-dd deleted file mode 100644 index ba04fed73f7..00000000000 --- a/x11/xview-lib/patches/patch-dd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-dd,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_selsvc.c.orig Sun Jun 26 03:05:23 1994 -+++ lib/libxview/textsw/txt_selsvc.c Thu Dec 20 10:09:17 2001 -@@ -24,7 +24,7 @@ static char sccsid[] = "@(#)txt_sels - #include <stdlib.h> - #endif /* SVR4 */ - --extern int errno; -+static int textsw_should_ask_seln_svc(); - - Pkg_private Es_status es_copy(); - static Seln_result textsw_seln_yield(); diff --git a/x11/xview-lib/patches/patch-de b/x11/xview-lib/patches/patch-de deleted file mode 100644 index 51310191f4e..00000000000 --- a/x11/xview-lib/patches/patch-de +++ /dev/null @@ -1,134 +0,0 @@ -$NetBSD: patch-de,v 1.3 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/es_file.c.orig 1993-06-29 05:17:34.000000000 +0000 -+++ lib/libxview/textsw/es_file.c -@@ -85,18 +85,15 @@ static char sccsid[] = "@(#)es_file. - - #include <string.h> - #include <fcntl.h> --#ifdef SVR4 - #include <stdlib.h> - #include <dirent.h> --#else --#include <sys/dir.h> --#endif /* SVR4 */ --#include <sys/errno.h> -+#include <errno.h> - #include <sys/param.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/file.h> - #include <stdio.h> -+#include <limits.h> - #include <xview/pkg.h> - #include <xview/attrol.h> - #include <xview_private/primal.h> -@@ -109,9 +106,14 @@ static char sccsid[] = "@(#)es_file. - #include <xview_private/txt_18impl.h> - - -+#if (defined(BSD) && (BSD >= 199306)) -+extern const char *const sys_err_list[]; -+extern off_t lseek(); -+#else - extern int errno, sys_nerr; - extern char *sys_errlist[]; - extern long lseek(); -+#endif - - static void update_read_buf(); /* update the read buf if overlaps write buf */ - static Es_status es_file_commit(); -@@ -330,6 +332,16 @@ es_file_create(name, options, status) - int open_option; - struct stat buf; - Es_status dummy_status; -+#ifdef NAME_MAX -+#ifndef BACKUP_AT_HEAD_OF_LINK -+ char *temp_name, true_name[NAME_MAX]; -+ int link_count, true_name_len; -+#endif -+#ifdef OW_I18N -+ char name[NAME_MAX]; -+ (void) wcstombs(name, name_wc, NAME_MAX); -+#endif /* OW_I18N */ -+#else - #ifndef BACKUP_AT_HEAD_OF_LINK - char *temp_name, true_name[MAXNAMLEN]; - int link_count, true_name_len; -@@ -338,6 +350,7 @@ es_file_create(name, options, status) - char name[MAXNAMLEN]; - (void) wcstombs(name, name_wc, MAXNAMLEN); - #endif /* OW_I18N */ -+#endif - - if (status == 0) - status = &dummy_status; -@@ -1146,9 +1159,16 @@ es_file_copy_status(esh, to) - Es_file_data private = ABS_TO_REP(esh); - int dummy; - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char to_mb[NAME_MAX]; -+ -+ (void) wcstombs(to_mb,to,NAME_MAX); -+#else - char to_mb[MAXNAMLEN]; - - (void) wcstombs(to_mb,to,MAXNAMLEN); -+#endif -+ - return (es_copy_status(to_mb,private->fd, &dummy)); - #else - return (es_copy_status(to, private->fd, &dummy)); -@@ -1163,7 +1183,11 @@ es_file_make_backup(esh, backup_pattern, - /* Currently backup_pattern must be of the form "%s<suffix>" */ - { - register Es_file_data private; -+#ifdef NAME_MAX -+ CHAR backup_name[NAME_MAX]; -+#else - CHAR backup_name[MAXNAMLEN]; -+#endif - int fd, len, retrying = FALSE; - Es_status dummy_status; - Es_handle result; -@@ -1200,9 +1224,15 @@ Retry: - * cannot be overwritten, so try to remove it first. - */ - #ifdef OW_I18N -+#ifdef NAME_MAX -+ char dummy[NAME_MAX]; -+ -+ (void) wcstombs(dummy, backup_name, MAXNAMLEN); -+#else - char dummy[MAXNAMLEN]; - - (void) wcstombs(dummy, backup_name, MAXNAMLEN); -+#endif - if (unlink(dummy) == 0) { /* } for match */ - #else - if (unlink(backup_name) == 0) { -@@ -1239,7 +1269,11 @@ es_file_make_wchar_file(esh, open_option - { - register Es_file_data private; - char *filename; -+#ifdef NAME_MAX -+ char old_filename[NAME_MAX]; -+#else - char old_filename[MAXNAMLEN]; -+#endif - int fd, new_fd, len; - extern int es_mb_to_wc_fd(); - -@@ -1255,7 +1289,11 @@ es_file_make_wchar_file(esh, open_option - - filename = tempnam(NULL,NULL); - -+#ifdef NAME_MAX -+ (void)wcstombs(old_filename, private->name, NAME_MAX); -+#else - (void)wcstombs(old_filename, private->name, MAXNAMLEN); -+#endif - private->skipped = 0; - - if (es_mb_to_wc_fd(old_filename, filename, fd, &private->skipped) == 0) { diff --git a/x11/xview-lib/patches/patch-df b/x11/xview-lib/patches/patch-df deleted file mode 100644 index 142770663de..00000000000 --- a/x11/xview-lib/patches/patch-df +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-df,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_filter.c.orig Tue Jun 29 07:17:39 1993 -+++ lib/libxview/textsw/txt_filter.c Thu Dec 20 10:09:58 2001 -@@ -28,10 +28,11 @@ static char sccsid[] = "@(#)txt_filt - #include <xview_private/txt_18impl.h> - #include <xview/notify.h> - #include <fcntl.h> -+#include <limits.h> - #include <signal.h> - #include <string.h> - --#ifdef sparc -+#if defined(sparc) && !(defined(BSD) && (BSD >= 199306)) - #ifdef SVR4 - #include <unistd.h> - #else -@@ -66,8 +67,8 @@ extern int dtablesize_cache; - (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize())) - #endif /* SVR4 */ - -- --extern int errno; -+static int talk_to_filter(); -+static int start_filter(); - - Xv_public char *xv_getlogindir(); - Pkg_private Es_index textsw_do_input(); -@@ -934,7 +935,12 @@ Pkg_private int - textsw_parse_rc(textsw) - Textsw_folio textsw; - { -- char *base_name = ".textswrc", file_name[MAXNAMLEN], *login_dir; -+ char *base_name = ".textswrc", *login_dir; -+#ifdef NAME_MAX -+ char file_name[NAME_MAX]; -+#else -+ char file_name[MAXNAMLEN]; -+#endif - STREAM *rc_stream = NULL; - STREAM *rc_wo_comments_stream = NULL; - Key_map_handle current_key; diff --git a/x11/xview-lib/patches/patch-dg b/x11/xview-lib/patches/patch-dg deleted file mode 100644 index 90d484a8775..00000000000 --- a/x11/xview-lib/patches/patch-dg +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-dg,v 1.1 2001/12/20 09:20:06 tron Exp $ - ---- lib/libxview/textsw/txt_incl.c.orig Tue Jun 29 07:17:32 1993 -+++ lib/libxview/textsw/txt_incl.c Thu Dec 20 10:10:06 2001 -@@ -35,6 +35,12 @@ - #include <string.h> - #endif /* SVR4 */ - -+#include <sys/param.h> -+ -+#if (defined(SVR4) || (__NetBSD_Version__ >= 103080000)) -+#define GETCWD -+#endif -+ - #define MAX_DISPLAY_LENGTH 50 - #define MAX_STR_LENGTH 1024 - -@@ -108,18 +114,18 @@ - - /* if "cd" is not disabled and the "cd" dir is not the current dir */ - #ifdef OW_I18N --#ifdef SVR4 -+#ifdef GETCWD - (void) getcwd(curr_dir_mb, MAX_STR_LENGTH); - #else - (void) getwd(curr_dir_mb); --#endif /* SVR4 */ -+#endif /* GETCWD */ - (void) mbstowcs(curr_dir, curr_dir_mb, MAX_STR_LENGTH); - #else /* OW_I18N */ --#ifdef SVR4 -+#ifdef GETCWD - (void) getcwd(curr_dir, MAX_STR_LENGTH); - #else - (void) getwd(curr_dir); --#endif /* SVR4 */ -+#endif /* GETCWD */ - #endif /* OW_I18N */ - - textsw_changed_directory = FALSE; -@@ -272,11 +278,11 @@ - include_string[0] = NULL; - (void) textsw_get_selection(view, &dummy, &dummy, include_string, - MAX_STR_LENGTH); --#ifdef SVR4 -+#ifdef GETCWD - (void) getcwd(current_dir_include_string, MAX_STR_LENGTH); - #else - (void) getwd(current_dir_include_string); --#endif /* SVR4 */ -+#endif /* GETCWD */ - include_panel_items[(int) DIR_STRING_ITEM] = - panel_create_item(panel, PANEL_TEXT, - PANEL_LABEL_X, ATTR_COL(0), -@@ -384,18 +390,18 @@ - - /* if "cd" is not disabled and the "cd" dir is not the current dir */ - #ifdef OW_I18N --#ifdef SVR4 -+#ifdef GETCWD - (void) getcwd(curr_dir_mb, MAX_STR_LENGTH); - #else - (void) getwd(curr_dir_mb); --#endif /* SVR4 */ -+#endif /* GETCWD */ - (void) mbstowcs(curr_dir, curr_dir_mb, MAX_STR_LENGTH); - #else /* OW_I18N */ --#ifdef SVR4 -+#ifdef GETCWD - (void) getcwd(curr_dir, MAX_STR_LENGTH); - #else - (void) getwd(curr_dir); --#endif /* SVR4 */ -+#endif /* GETCWD */ - #endif /* OW_I18N */ - - textsw_changed_directory = FALSE; diff --git a/x11/xview-lib/patches/patch-dh b/x11/xview-lib/patches/patch-dh deleted file mode 100644 index 7e4b4b128a8..00000000000 --- a/x11/xview-lib/patches/patch-dh +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-dh,v 1.1 2001/12/20 09:20:06 tron Exp $ - ---- lib/libxview/file_chooser/Imakefile.orig Tue Jun 29 07:17:58 1993 -+++ lib/libxview/file_chooser/Imakefile Thu Dec 20 10:09:16 2001 -@@ -27,35 +27,35 @@ - path_impl.h hist_impl.h - - DATA_OBJS = fchsr_data.o\ -- flist_data.o\ -- path_data.o\ -- hist_data.o -+ flist_data.o\ -+ path_data.o\ -+ hist_data.o - - TEXT_OBJS =\ -- file_chsr.o\ -+ file_chsr.o\ - fc_layout.o\ - file_list.o\ - path.o\ - xv_path_util.o\ - hist_list.o\ - hist_menu.o\ -- fchsr_data.o\ -- flist_data.o\ -- path_data.o\ -+ fchsr_data.o\ -+ flist_data.o\ -+ path_data.o\ - hist_data.o - - - SRCS =\ -- file_chsr.c\ -- fc_layout.c\ -- file_list.c\ -- path.c\ -- xv_path_util.c\ -- hist_list.c\ -- hist_menu.c\ -- fchsr_data.c\ -- flist_data.c\ -- path_data.c\ -+ file_chsr.c\ -+ fc_layout.c\ -+ file_list.c\ -+ path.c\ -+ xv_path_util.c\ -+ hist_list.c\ -+ hist_menu.c\ -+ fchsr_data.c\ -+ flist_data.c\ -+ path_data.c\ - hist_data.c - - LIBTARGET = xview diff --git a/x11/xview-lib/patches/patch-di b/x11/xview-lib/patches/patch-di deleted file mode 100644 index 63a70a71e40..00000000000 --- a/x11/xview-lib/patches/patch-di +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-di,v 1.1 2001/12/20 09:20:06 tron Exp $ - ---- lib/libxview/file_chooser/fc_layout.c.orig Tue Jun 29 07:17:55 1993 -+++ lib/libxview/file_chooser/fc_layout.c Thu Dec 20 10:09:16 2001 -@@ -464,8 +464,8 @@ - - new_height - = (* private->exten_func)( FC_PUBLIC(private), -- private->rect, -- exten_rect, -+ &private->rect, -+ &exten_rect, - COLS(2), - private->rect.r_width - COLS(2), - max_height diff --git a/x11/xview-lib/patches/patch-dj b/x11/xview-lib/patches/patch-dj deleted file mode 100644 index b203fdf7c10..00000000000 --- a/x11/xview-lib/patches/patch-dj +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/file_chooser/file_list.c.orig Tue Jun 29 07:17:56 1993 -+++ lib/libxview/file_chooser/file_list.c Thu Dec 20 10:09:16 2001 -@@ -23,6 +23,9 @@ - #include <xview_private/flist_impl.h> - #include <xview_private/portable.h> - -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) -+#include <regex.h> -+#endif - - - /* X bitmaps for default glyphs */ -@@ -41,6 +44,7 @@ - static int flist_list_notify(); - static int validate_new_directory(); - static void flist_new_dir(); -+static int flist_match_regex(); - - #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) - static void flist_error(File_list_private *private, char *format, ...); -@@ -521,7 +525,11 @@ - if (status == DESTROY_CLEANUP) { - xv_free_ref( private->directory ); - xv_free_ref( private->regex_pattern ); -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - xv_free_ref( private->regex_compile ); -+#else -+ xv_free_regex_t( (regex_t *)private->regex_compile ); -+#endif - xv_free_ref( private->dotdot_string ); - if ( private->dir_ptr ) - (void) closedir( private->dir_ptr ); -@@ -1174,14 +1182,16 @@ - static int step(); - #endif /* SVR4 */ - -- -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <regexp.h> -+#endif - - - static void - flist_compile_regex( private ) - File_list_private *private; - { -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - char compile_buf[MAXPATHLEN+1]; - char *end_ptr; - size_t num_bytes; -@@ -1197,6 +1207,17 @@ - xv_free_ref( private->regex_compile ); - private->regex_compile = xv_alloc_n(char, num_bytes); - (void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes); -+#else -+ regex_t *compile_buf = malloc(sizeof(regex_t)); -+ if (compile_buf == NULL){ -+ fprintf(stderr, "Couldn't allocate compile buffer\n"); -+ exit(-1); -+ } -+ regcomp(compile_buf, private->regex_pattern, 0); -+ xv_free_regex_t((regex_t *)private->regex_compile); -+ private->regex_compile = (char *)compile_buf; -+#endif -+ - } - - -@@ -1205,7 +1226,11 @@ - char *s; - File_list_private *private; - { -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - return step(s, private->regex_compile); -+#else -+ return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0); -+#endif - } - - /****************************************************************************/ diff --git a/x11/xview-lib/patches/patch-dk b/x11/xview-lib/patches/patch-dk deleted file mode 100644 index 3b0b9d39aa9..00000000000 --- a/x11/xview-lib/patches/patch-dk +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-dk,v 1.1 2001/12/20 09:20:07 tron Exp $ - ---- lib/libxview/file_chooser/xv_path_util.h.orig Sun Jun 26 03:05:20 1994 -+++ lib/libxview/file_chooser/xv_path_util.h Thu Dec 20 10:09:16 2001 -@@ -41,6 +41,7 @@ - - - #define xv_free_ref(str) {if((str)) {xv_free((str)); (str) = NULL;}} -+#define xv_free_regex_t(str) {if((str)) {regfree((str)); free ((str)); (str) = NULL;}} - - - EXTERN_FUNCTION(void xv_error_sprintf, (Frame frame, int use_footer, char *format, DOTDOTDOT) ); diff --git a/x11/xview-lib/patches/patch-dl b/x11/xview-lib/patches/patch-dl deleted file mode 100644 index ae43c9adb17..00000000000 --- a/x11/xview-lib/patches/patch-dl +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dl,v 1.1 2001/12/20 09:20:07 tron Exp $ - ---- lib/libxview/notify/ndet.h.orig Tue Jun 29 07:18:12 1993 -+++ lib/libxview/notify/ndet.h Thu Dec 20 10:09:16 2001 -@@ -17,6 +17,11 @@ - #ifndef NDET_DEFINED - #define NDET_DEFINED - -+#include <sys/param.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <signal.h> -+#endif -+ - /* - ********************** Detector Loop Notes **************************** - Here is some notes on the detector loop: diff --git a/x11/xview-lib/patches/patch-dm b/x11/xview-lib/patches/patch-dm deleted file mode 100644 index f8562c9aedf..00000000000 --- a/x11/xview-lib/patches/patch-dm +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-dm,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ndet_loop.c.orig Tue Jun 29 07:18:19 1993 -+++ lib/libxview/notify/ndet_loop.c Thu Dec 20 10:09:16 2001 -@@ -14,13 +14,18 @@ static char sccsid[] = "@(#)ndet_loo - * Ndet_loop.c - Notification loop. - */ - -+#include <sys/param.h> - #include <xview_private/i18n_impl.h> - #include <xview_private/ntfy.h> - #include <xview_private/ndet.h> - #include <xview_private/nint.h> - #include <xview_private/ndis.h> /* For ndis_dispatch */ - #ifndef SVR4 -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <syscall.h> -+#else -+#include <sys/syscall.h> -+#endif - #else SVR4 - #include <sys/syscall.h> - #include <sys/poll.h> -@@ -35,8 +40,6 @@ static char sccsid[] = "@(#)ndet_loo - #include <stdio.h> /* For temp debugging */ - #include <rpc/rpc.h> - --extern int errno; -- - pkg_private_data u_int ndet_flags = 0; - pkg_private_data NTFY_CLIENT *ndet_clients = 0; - pkg_private_data NTFY_CLIENT *ndet_client_latest = 0; -@@ -224,7 +227,8 @@ notify_start() - * will return with an EINTR when a signal arrives while IN - * select, not ON THE WAY into select). - */ --#ifndef SVR4 -+ -+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103)) - nfds = syscall(SYS_select, - FD_SETSIZE, &ibits, &obits, &ebits, - (sigisempty(&ndet_sigs_received)) ? timer : &ndet_polling_tv); diff --git a/x11/xview-lib/patches/patch-dn b/x11/xview-lib/patches/patch-dn deleted file mode 100644 index 11b09a52c06..00000000000 --- a/x11/xview-lib/patches/patch-dn +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dn,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/sys_fcntl.c.orig Tue Jun 29 07:18:17 1993 -+++ lib/libxview/notify/sys_fcntl.c Thu Dec 20 10:09:16 2001 -@@ -15,7 +15,11 @@ - */ - - #ifndef SVR4 -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <syscall.h> -+#else -+#include <sys/syscall.h> -+#endif - #else SVR4 - #include <sys/syscall.h> - #endif SVR4 diff --git a/x11/xview-lib/patches/patch-do b/x11/xview-lib/patches/patch-do deleted file mode 100644 index 5e2a0a74822..00000000000 --- a/x11/xview-lib/patches/patch-do +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-do,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/sys_read.c.orig Tue Jun 29 07:18:01 1993 -+++ lib/libxview/notify/sys_read.c Thu Dec 20 10:09:16 2001 -@@ -15,7 +15,11 @@ - */ - - #ifndef SVR4 -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <syscall.h> -+#else -+#include <sys/syscall.h> -+#endif - #else SVR4 - #include <sys/syscall.h> - #endif SVR4 diff --git a/x11/xview-lib/patches/patch-dp b/x11/xview-lib/patches/patch-dp deleted file mode 100644 index 2e4d3235698..00000000000 --- a/x11/xview-lib/patches/patch-dp +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-dp,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/sys_select.c.orig Tue Jun 29 07:18:11 1993 -+++ lib/libxview/notify/sys_select.c Thu Dec 20 10:09:16 2001 -@@ -15,7 +15,11 @@ static char sccsid[] = "@(#)sys_sele - */ - - #ifndef SVR4 -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <syscall.h> -+#else -+#include <sys/syscall.h> -+#endif - #else SVR4 - #include <values.h> - #include <sys/time.h> -@@ -28,8 +32,6 @@ static char sccsid[] = "@(#)sys_sele - #include <errno.h> /* For debugging */ - #include <stdio.h> /* For debugging */ - --extern errno; -- - #ifndef NULL - #define NULL 0 - #endif diff --git a/x11/xview-lib/patches/patch-dq b/x11/xview-lib/patches/patch-dq deleted file mode 100644 index 742e3e68272..00000000000 --- a/x11/xview-lib/patches/patch-dq +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-dq,v 1.1 2001/12/20 09:20:08 tron Exp $ - ---- lib/libxview/notify/ndet_fcntl.c.orig Tue Jun 29 07:18:03 1993 -+++ lib/libxview/notify/ndet_fcntl.c Thu Dec 20 10:09:16 2001 -@@ -17,22 +17,39 @@ - - #include <xview_private/ntfy.h> - #include <xview_private/ndet.h> -+#include <sys/param.h> - #include <signal.h> - #include <fcntl.h> - #ifdef SVR4 - #include <sys/file.h> - #endif SVR4 -- -+#if (defined(BSD) && (BSD >= 199103)) -+#include <stdarg.h> -+#endif - extern int - #ifdef SVR4 - xv_fcntl(fd, cmd, arg) - #else -+#if (defined(BSD) && (BSD >= 199103)) -+fcntl(int fd, int cmd, ...) -+#else - fcntl(fd, cmd, arg) -+#endif - #endif SVR4 -+#if !(defined(BSD) && (BSD >= 199103)) - int fd, cmd, arg; -+#endif - { - fd_set bit; - int res; -+ -+#if (defined(BSD) && (BSD >= 199103)) -+ int arg; -+ va_list valist; -+ va_start(valist, cmd); -+ arg = va_arg(valist, int); -+ va_end(valist); -+#endif - - /* Set fd bit */ - FD_ZERO(&bit); diff --git a/x11/xview-lib/patches/patch-dr b/x11/xview-lib/patches/patch-dr deleted file mode 100644 index b436daa2f26..00000000000 --- a/x11/xview-lib/patches/patch-dr +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-dr,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ndet_read.c.orig Tue Jun 29 07:18:04 1993 -+++ lib/libxview/notify/ndet_read.c Thu Dec 20 10:09:16 2001 -@@ -15,12 +15,12 @@ static char sccsid[] = "@(#)ndet_rea - * not already in the middle of it. - */ - -+#include <sys/param.h> - #include <xview_private/ntfy.h> - #include <xview_private/ndet.h> - #include <xview_private/ndis.h> /* For ndis_client == NTFY_CLIENT_NULL check */ - #include <errno.h> - --extern errno; - extern int notify_exclude_fd; - - static Notify_value ndet_read_in_func(); -@@ -29,11 +29,16 @@ static int ndet_read_done; - - static Notify_client ndet_read_nclient = (Notify_client) & ndet_read_done; - -+#if !(defined(BSD) && (BSD >= 199103)) - extern int - read(fd, buf, nbytes) - register int fd; - char *buf; - int nbytes; -+#else -+extern int -+read(int fd, void *buf, size_t nbytes) -+#endif - { - int ndelay; - Notify_error return_code; diff --git a/x11/xview-lib/patches/patch-ds b/x11/xview-lib/patches/patch-ds deleted file mode 100644 index a90bb27d30a..00000000000 --- a/x11/xview-lib/patches/patch-ds +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ds,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993 -+++ lib/libxview/notify/ntfy.h Thu Dec 20 10:09:36 2001 -@@ -22,6 +22,10 @@ - #include <sys/rusage.h> - #endif - #include <sys/resource.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <sys/wait.h> -+#include <sys/signal.h> -+#endif - #include <xview/notify.h> - - /* -@@ -149,7 +153,7 @@ typedef struct ntfy_condition { - */ - typedef struct ntfy_wait3_data { - int pid; /* Process waiting for */ --#ifndef SVR4 -+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103)) - union wait status; /* Return value from wait3 */ - #else SVR4 - int status; /* Return value from wait3 */ -@@ -184,9 +188,12 @@ extern int ntfy_nodes_avail; /* count of - extern sigset_t ntfy_sigs_delayed;/* Bit mask of signals received while in - critical section */ - --#ifdef SVR4 -+#if defined(SVR4) - #define sigisempty(s) (!(((s)->__sigbits[0]) | ((s)->__sigbits[1]) \ - | ((s)->__sigbits[2]) | ((s)->__sigbits[3]))) -+#elif (defined(__NetBSD__) && (__NetBSD_Version__ > 103080000)) || defined(__DragonFly__) -+#define sigisempty(s) (!(((s)->__bits[0]) | ((s)->__bits[1]) \ -+ | ((s)->__bits[2]) | ((s)->__bits[3]))) - #else - #define sigisempty(s) (!(*(s))) - #endif diff --git a/x11/xview-lib/patches/patch-dt b/x11/xview-lib/patches/patch-dt deleted file mode 100644 index b20401ce42f..00000000000 --- a/x11/xview-lib/patches/patch-dt +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-dt,v 1.1 2001/12/20 09:20:08 tron Exp $ - ---- lib/libxview/notify/ntfy_test.c.orig Tue Jun 29 07:18:12 1993 -+++ lib/libxview/notify/ntfy_test.c Thu Dec 20 10:09:16 2001 -@@ -989,7 +989,7 @@ - fprintf(stderr, "%s in unknown destroy status\n", arg1); - goto Error; - } -- if ((ne = notify_post_destroy(client, status)) != NOTIFY_OK) { -+ if ((ne = notify_post_destroy(client, status), NOTIFY_IMMEDIATE) != NOTIFY_OK) { - if (!(status == DESTROY_CHECKING && - ne == NOTIFY_DESTROY_VETOED)) { - notify_perror("notify_destroy"); -@@ -1781,7 +1781,7 @@ - } - /* Send only last client event */ - if (*event_count_ptr > 0) { -- (void) notify_event(nclient, *(events + (*event_count_ptr) - 1)); -+ (void) notify_event(nclient, *(events + (*event_count_ptr) - 1), 0); - *event_count_ptr--; - } - /* Send fd 1 input */ diff --git a/x11/xview-lib/patches/patch-du b/x11/xview-lib/patches/patch-du deleted file mode 100644 index 5a91f112703..00000000000 --- a/x11/xview-lib/patches/patch-du +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-du,v 1.2 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ntfyclient.c.orig Tue Jun 29 07:18:11 1993 -+++ lib/libxview/notify/ntfyclient.c Thu Dec 20 10:09:16 2001 -@@ -18,7 +18,9 @@ - #include <xview_private/ntfy.h> - #include <xview_private/ndis.h> /* For ndis_default_prioritizer */ - #include <xview_private/ndet.h> -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - #include <search.h> -+#endif - #include <xview_private/portable.h> - - /* Variables used in paranoid enumerator (see ntfy_condition) */ -@@ -60,6 +62,7 @@ - if (*client_latest && (*client_latest)->nclient == nclient) - return (*client_latest); - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - if(( client_list == ndet_clients ) && ndet_clients ) { - dummy_client.nclient = nclient; - /* Find client */ -@@ -73,7 +76,9 @@ - return (client); - } - } -- -+#else -+ if(0); -+#endif - else - /* Search entire list */ - for (client = client_list; client; client = next) { -@@ -100,6 +105,7 @@ - register NTFY_CLIENT *client; - static NTFY_CLIENT *new_client; - -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - if( client_list == &ndet_clients ) { - if( new_client == NTFY_CLIENT_NULL ) { - if ((new_client = ntfy_alloc_client()) == NTFY_CLIENT_NULL) -@@ -119,7 +125,9 @@ - else - return client; - } -- -+#else -+ if(0); -+#endif - else if ((client = ntfy_find_nclient(*client_list, nclient, - client_latest)) != NTFY_CLIENT_NULL) - return client; -@@ -163,8 +171,10 @@ - ntfy_remove_condition(client, condition, who); - } - /* Remove & free client from client_list */ -+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - if( client_list == &ndet_clients ) - tdelete( client, ndet_root, ndet_compar ); -+#endif - ntfy_remove_node((NTFY_NODE **) client_list, (NTFY_NODE *) client); - /* Invalidate condition hint */ - *client_latest = NTFY_CLIENT_NULL; diff --git a/x11/xview-lib/patches/patch-dv b/x11/xview-lib/patches/patch-dv deleted file mode 100644 index 6ad06144492..00000000000 --- a/x11/xview-lib/patches/patch-dv +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dv,v 1.1 2001/12/20 09:20:08 tron Exp $ - ---- lib/libxview/notify/ndet_fd.c.orig Tue Jun 29 07:18:08 1993 -+++ lib/libxview/notify/ndet_fd.c Thu Dec 20 10:09:23 2001 -@@ -27,8 +27,9 @@ - #define GETDTABLESIZE() \ - (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX))) - #else --#define GETDTABLESIZE() \ -- (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize())) -+#define GETDTABLESIZE() \ -+ (dtablesize_cache ? dtablesize_cache : \ -+ (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE))) - #endif SVR4 - - static int ndet_fd_table_size; /* Number of descriptor slots diff --git a/x11/xview-lib/patches/patch-dw b/x11/xview-lib/patches/patch-dw deleted file mode 100644 index f9f358d173b..00000000000 --- a/x11/xview-lib/patches/patch-dw +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dw,v 1.1 2001/12/20 09:20:08 tron Exp $ - ---- lib/libxview/notify/ndisdispch.c.orig Tue Jun 29 07:18:06 1993 -+++ lib/libxview/notify/ndisdispch.c Thu Dec 20 10:09:27 2001 -@@ -30,8 +30,9 @@ - #define GETDTABLESIZE() \ - (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX))) - #else --#define GETDTABLESIZE() \ -- (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize())) -+#define GETDTABLESIZE() \ -+ (dtablesize_cache ? dtablesize_cache : \ -+ (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE))) - #endif SVR4 - - pkg_private_data u_int ndis_flags = 0; diff --git a/x11/xview-lib/patches/patch-dx b/x11/xview-lib/patches/patch-dx deleted file mode 100644 index f535fffc14b..00000000000 --- a/x11/xview-lib/patches/patch-dx +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dx,v 1.1 2001/12/20 09:20:09 tron Exp $ - ---- lib/libolgx/ol_init.c.orig Tue Jun 29 07:18:28 1993 -+++ lib/libolgx/ol_init.c Thu Dec 20 10:09:16 2001 -@@ -9,7 +9,10 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <sys/param.h> -+#if !(defined(BSD) && (BSD >= 199103)) - #include <malloc.h> -+#endif - #include <X11/Xlib.h> - #include "olgx_impl.h" - #include "busy.h" diff --git a/x11/xview-lib/patches/patch-dy b/x11/xview-lib/patches/patch-dy deleted file mode 100644 index 2c8914e35b8..00000000000 --- a/x11/xview-lib/patches/patch-dy +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-dy,v 1.1 2001/12/20 09:20:09 tron Exp $ - ---- lib/libolgx/ol_sb.c.orig Tue Jun 29 07:18:29 1993 -+++ lib/libolgx/ol_sb.c Thu Dec 20 10:09:16 2001 -@@ -11,7 +11,12 @@ - */ - - #include <stdio.h> -+#include <sys/param.h> -+#if (defined(BSD) && (BSD >= 199103)) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - #include <X11/Xlib.h> - #include <X11/Xutil.h> - #include "olgx_impl.h" diff --git a/x11/xview-lib/patches/patch-dz b/x11/xview-lib/patches/patch-dz deleted file mode 100644 index f6cfa937d6e..00000000000 --- a/x11/xview-lib/patches/patch-dz +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-dz,v 1.1 2001/12/20 09:20:09 tron Exp $ - ---- lib/pixrect/Imakefile.orig Tue Jun 29 07:18:39 1993 -+++ lib/pixrect/Imakefile Thu Dec 20 10:09:16 2001 -@@ -41,8 +41,8 @@ - all:: - - #if InstallPixrectHeaders --BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),/**/) --BuildIncludes($(HEADERS2),$(INCDIR),/**/) -+BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),.) -+BuildIncludes($(HEADERS2),$(INCDIR),.) - - install:: - $(MKDIRHIER) $(PIXRECT_HEADER_DEST) diff --git a/x11/xview-lib/patches/patch-ea b/x11/xview-lib/patches/patch-ea deleted file mode 100644 index 19329ba197d..00000000000 --- a/x11/xview-lib/patches/patch-ea +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2001/12/20 09:20:09 tron Exp $ - ---- misc/support/Imakefile.orig Tue Jun 29 07:14:23 1993 -+++ misc/support/Imakefile Thu Dec 20 10:09:31 2001 -@@ -5,8 +5,7 @@ - /**/# Imakefile for misc/support files. - - SUPPORTFILES = text_extras_menu textswrc ttyswrc --INFOFILES = textsw.info ttysw.info xview.info clock.info olwm.info props.info \ -- textedit.info -+INFOFILES = textsw.info ttysw.info xview.info props.info textedit.info - - ALLFILES = $(SUPPORTFILES) $(INFOFILES) - diff --git a/x11/xview-lib/patches/patch-eb b/x11/xview-lib/patches/patch-eb deleted file mode 100644 index c27760603f3..00000000000 --- a/x11/xview-lib/patches/patch-eb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-eb,v 1.1 2001/12/20 09:20:09 tron Exp $ - ---- util/Imakefile.orig Tue Jun 29 07:14:22 1993 -+++ util/Imakefile Thu Dec 20 10:10:14 2001 -@@ -16,7 +16,7 @@ - - CONV_DIR = conversion - --MSG_UTIL = xgettext msgfmt -+#MSG_UTIL = xgettext msgfmt - - SUBDIRS = $(CPP_DIR) $(SOELIM_DIR) $(CONV_DIR) $(MSG_UTIL) - diff --git a/x11/xview-lib/patches/patch-ec b/x11/xview-lib/patches/patch-ec deleted file mode 100644 index 15d90eedbd7..00000000000 --- a/x11/xview-lib/patches/patch-ec +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ec,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/misc/gettext.c.orig 1993-06-29 05:16:30.000000000 +0000 -+++ lib/libxview/misc/gettext.c -@@ -8,12 +8,14 @@ static char sccsid[] = "@(#)gettext. - #endif - - #include <xview_private/gettext.h> -- --char *strdup(); --char * dgettext(), *bindtextdomain(); --char *_gettext(); --char *fgets(), *getenv(); --caddr_t mmap(); -+#include <string.h> -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/mman.h> -+ -+char *bindtextdomain(char *, unsigned char *); -+char *dgettext(char *, char*); -+static char *_gettext(); - - static struct domain_binding *firstbind=0, *lastbind=0; - diff --git a/x11/xview-lib/patches/patch-ed b/x11/xview-lib/patches/patch-ed deleted file mode 100644 index 4b9e8145d57..00000000000 --- a/x11/xview-lib/patches/patch-ed +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ed,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ndet_auto.c.orig 2006-01-04 10:32:37.000000000 +0000 -+++ lib/libxview/notify/ndet_auto.c -@@ -25,8 +25,6 @@ static char sccsid[] = "@(#)ndet_aut - #include <stdlib.h> - #endif SVR4 - --extern errno; -- - pkg_private_data sigset_t ndet_sigs_auto; - pkg_private_data Notify_client ndet_auto_nclient = - (Notify_client) & ndet_sigs_auto; diff --git a/x11/xview-lib/patches/patch-ee b/x11/xview-lib/patches/patch-ee deleted file mode 100644 index f2b5bc9c311..00000000000 --- a/x11/xview-lib/patches/patch-ee +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ee,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/sel/seln.c.orig 2006-01-04 10:33:29.000000000 +0000 -+++ lib/libxview/sel/seln.c -@@ -69,7 +69,6 @@ selection_get(sel_read, window) - FILE *file; - int c; - int n; -- extern errno; - - *sel = selnull; - (void) win_lockdata(window); diff --git a/x11/xview-lib/patches/patch-ef b/x11/xview-lib/patches/patch-ef deleted file mode 100644 index 5e80f4e56b6..00000000000 --- a/x11/xview-lib/patches/patch-ef +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ef,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/win/win_cntral.c.orig 2006-01-04 10:38:51.000000000 +0000 -+++ lib/libxview/win/win_cntral.c -@@ -25,7 +25,6 @@ static char sccsid[] = "@(#)win_cntr - - static Notify_error win_send(); - --extern int errno; - extern Event xv_last_event; - - void notify_perror(); diff --git a/x11/xview-lib/patches/patch-eg b/x11/xview-lib/patches/patch-eg deleted file mode 100644 index 73418d40a4b..00000000000 --- a/x11/xview-lib/patches/patch-eg +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-eg,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_once.c.orig 2006-01-04 11:09:00.000000000 +0000 -+++ lib/libxview/textsw/txt_once.c -@@ -18,6 +18,7 @@ static char sccsid[] = "@(#)txt_once.c 2 - #include <xview/textsw.h> - #include <xview_private/txt_impl.h> - #include <fcntl.h> -+#include <limits.h> - #include <signal.h> - #include <pixrect/pr_util.h> - -@@ -548,13 +549,21 @@ textsw_init_internal(folio, status, defa - Es_handle ps_esh; - Ei_handle plain_text_eih; - char *name = 0; -+#ifdef NAME_MAX -+ CHAR scratch_name[NAME_MAX]; -+#else - CHAR scratch_name[MAXNAMLEN]; -+#endif - Es_status es_status; - Frame frame; - Xv_Notice text_notice; - extern void textsw_split_init_proc(); - #ifdef OW_I18N -+#ifdef NAME_MAX -+ CHAR name_wc[NAME_MAX]; -+#else - CHAR name_wc[MAXNAMLEN]; -+#endif - #ifdef FULL_R5 - XVaNestedList va_nested_list; - #endif /* FULL_R5 */ -@@ -642,18 +651,30 @@ textsw_init_internal(folio, status, defa - name = (char *) defaults[1]; - #ifdef OW_I18N - if (name) -+#ifdef NAME_MAX -+ (void) mbstowcs(name_wc, name, NAME_MAX); -+#else - (void) mbstowcs(name_wc, name, MAXNAMLEN); - #endif -+#endif - } - - #ifdef OW_I18N - defaults = attr_find(attrs, TEXTSW_FILE_WCS); - if (*defaults) { -+#ifdef NAME_MAX -+ char name_mb[NAME_MAX]; -+#else - char name_mb[MAXNAMLEN]; -+#endif - - ATTR_CONSUME(*defaults); - STRCPY(name_wc, (CHAR *) defaults[1]); -+#ifdef NAME_MAX -+ (void) wcstombs(name_mb, name_wc, NAME_MAX); -+#else - (void) wcstombs(name_mb, name_wc, MAXNAMLEN); -+#endif - name = name_mb; - } - if (name_wc[0] != NULL) { /* } for match */ diff --git a/x11/xview-lib/patches/patch-eh b/x11/xview-lib/patches/patch-eh deleted file mode 100644 index cd0294587c2..00000000000 --- a/x11/xview-lib/patches/patch-eh +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-eh,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_event.c.orig 2006-01-04 11:15:27.000000000 +0000 -+++ lib/libxview/textsw/txt_event.c -@@ -22,7 +22,6 @@ static char sccsid[] = "@(#)txt_even - #include <xview_private/win_keymap.h> - - --extern int errno; - Pkg_private Notify_error win_post_event(); - Pkg_private void ev_blink_caret(); - diff --git a/x11/xview-lib/patches/patch-ei b/x11/xview-lib/patches/patch-ei deleted file mode 100644 index e9574719128..00000000000 --- a/x11/xview-lib/patches/patch-ei +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ei,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_getkey.c.orig 2006-01-04 11:41:31.000000000 +0000 -+++ lib/libxview/textsw/txt_getkey.c -@@ -21,8 +21,6 @@ static char sccsid[] = "@(#)txt_getk - #include <xview_private/ev_impl.h> /* For declaration of ev_add_finder */ - #include <errno.h> - --extern int errno; -- - static void textsw_do_get(); - Pkg_private Es_index textsw_find_mark_internal(); - Pkg_private Es_index textsw_insert_pieces(); diff --git a/x11/xview-lib/patches/patch-ej b/x11/xview-lib/patches/patch-ej deleted file mode 100644 index 9a307746d14..00000000000 --- a/x11/xview-lib/patches/patch-ej +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ej,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/textsw/txt_attr.c.orig 2006-01-04 11:45:39.000000000 +0000 -+++ lib/libxview/textsw/txt_attr.c -@@ -14,6 +14,7 @@ static char sccsid[] = "@(#)txt_attr - * Attribute set/get routines for text subwindows. - */ - -+#include <limits.h> - #include <xview/pkg.h> - #include <xview/attrol.h> - #include <xview_private/primal.h> -@@ -79,7 +80,11 @@ set_first(view, error_msg, filename, res - int first_line; - int all_views; - { -+#ifdef NAME_MAX -+ char msg_buf[NAME_MAX + 100]; -+#else - char msg_buf[MAXNAMLEN + 100]; -+#endif - char *msg; - Es_status load_status; - Textsw_status result = TEXTSW_STATUS_OKAY; -@@ -96,7 +101,11 @@ set_first(view, error_msg, filename, res - #else - if (filename) { - #endif -+#ifdef NAME_MAX -+ CHAR scratch_name[NAME_MAX]; -+#else - CHAR scratch_name[MAXNAMLEN]; -+#endif - Es_handle new_esh; - #ifdef OW_I18N - char *filename_mb; diff --git a/x11/xview-lib/patches/patch-ek b/x11/xview-lib/patches/patch-ek deleted file mode 100644 index 56d29e172b8..00000000000 --- a/x11/xview-lib/patches/patch-ek +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ek,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ndet_wait.c.orig 2006-01-04 11:52:12.000000000 +0000 -+++ lib/libxview/notify/ndet_wait.c -@@ -18,8 +18,6 @@ static char sccsid[] = "@(#)ndet_wai - #include <xview_private/ndet.h> - #include <errno.h> - --extern errno; -- - pkg_private int - ndet_check_pid(pid) - int pid; diff --git a/x11/xview-lib/patches/patch-el b/x11/xview-lib/patches/patch-el deleted file mode 100644 index da15f0f0da5..00000000000 --- a/x11/xview-lib/patches/patch-el +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-el,v 1.1 2006/01/05 18:25:57 joerg Exp $ - ---- lib/libxview/notify/ndetselect.c.orig 2006-01-04 11:53:02.000000000 +0000 -+++ lib/libxview/notify/ndetselect.c -@@ -28,7 +28,6 @@ static int ndet_select_nfds, ndet_s - - static Notify_client ndet_select_nclient = (Notify_client) & ndet_select_ibits; - --extern errno; - extern int notify_exclude_fd; - - extern int diff --git a/x11/xview-lib/patches/patch-fa b/x11/xview-lib/patches/patch-fa deleted file mode 100644 index 276c1efc453..00000000000 --- a/x11/xview-lib/patches/patch-fa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-fa,v 1.1 2005/02/10 11:03:53 drochner Exp $ - ---- lib/libxview/base/xv_parse.c.orig 2005-02-10 12:41:57.000000000 +0100 -+++ lib/libxview/base/xv_parse.c -@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv) - if (argc <= slot->num_args) { - char dummy[128]; - -- (void) sprintf(dummy, -+ (void) snprintf(dummy, sizeof(dummy), - XV_MSG("%s: missing argument after %s"), - app_name, - argv[0]); -@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv) - if (defaults_lookup(argv[1], known_scales) == -1) { - char dummy[1024]; - -- (void) sprintf(dummy, -+ (void) snprintf(dummy, sizeof(dummy), - XV_MSG("%s: unknown scale \"%s\" used with %s option"), - app_name, argv[1], argv[0]); - xv_error(XV_NULL, -@@ -611,7 +611,7 @@ NegArg: - { - char dummy[128]; - -- (void) sprintf(dummy, -+ (void) snprintf(dummy, sizeof(dummy), - XV_MSG("%s: can't have negative argument %s after %s"), - app_name, argv[bad_arg], argv[0]); - xv_error(XV_NULL, |