Update to 0.9.2, provided by Tracy J. Di Marco White in PR 19393.

The ReleaseNotes say:
Changes in 0.9:
---------------

You're kidding, right?  There have been so many changes here it's not funny.
If you really want to know what they all are, you can read the ChangeLog.  But
I'd settle for this:

 - All new theme format.
 - 3-state image support.
 - Pixmapped scrollbars and popup menus.
 - Action bindings.
 - IPC interface to Eterm and Enlightenment.
 - Auto mode for automatic syncing with Enlightenment themes.

9 files changed, 332 insertions, 358 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 5526e7854f3..622b9c82722 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/08/25 21:52:35 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/12/26 04:58:44 wiz Exp $
 
-DISTNAME=		Eterm-0.8.10
-PKGNAME=		eterm-0.8.10
-PKGREVISION=		1
+DISTNAME=		Eterm-0.9.2
+PKGNAME=		eterm-0.9.2
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.eterm.org/pub/Eterm/ \
 			ftp://alien.eterm.org/pub/Eterm/ \
@@ -21,11 +20,16 @@ PIXMAP_FILES=		Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "i386" && ${USE_MMX} != "NO"
+CONFIGURE_ARGS+=        --enable-mmx
+.endif
+BUILD_DEFS+=		USE_MMX
+
 post-extract:
 	${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
 	cd ${WRKDIR};							\
@@ -41,5 +45,6 @@ post-install:
 	${CHMOD} 4711 ${PREFIX}/bin/Eterm
 .endif
 
-.include "../../graphics/imlib/buildlink2.mk"
+.include "../../devel/libast/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/eterm/PLIST b/x11/eterm/PLIST
index 17d4ed4eabc..92d57d2316c 100644
--- a/x11/eterm/PLIST
+++ b/x11/eterm/PLIST
@@ -1,224 +1,240 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:10:37 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/12/26 04:58:44 wiz Exp $
 bin/Esetroot
 bin/Etbg
-bin/Etcolors.sh
+bin/Etbg_update_list
+bin/Etcolors
 bin/Eterm
-bin/Etmenu.sh
+bin/Etsearch
+bin/Ettable
+bin/kEsetroot
+lib/libEterm-0.9.2.so
 lib/libEterm.a
 lib/libEterm.la
 lib/libEterm.so
-lib/libEterm-0.8.10.so
-lib/libmej.a
-lib/libmej.la
-lib/libmej.so
-lib/libmej-0.8.10.so
 man/man1/Eterm.1
-share/Eterm/pix/004.png
-share/Eterm/pix/014.png
-share/Eterm/pix/015.png
-share/Eterm/pix/017.png
-share/Eterm/pix/021.png
-share/Eterm/pix/024.png
-share/Eterm/pix/026.png
-share/Eterm/pix/033.png
-share/Eterm/pix/15.png
-share/Eterm/pix/22.png
-share/Eterm/pix/35.png
-share/Eterm/pix/36.png
-share/Eterm/pix/4.png
-share/Eterm/pix/40.png
-share/Eterm/pix/43.png
-share/Eterm/pix/45.png
-share/Eterm/pix/47.png
-share/Eterm/pix/50.png
-share/Eterm/pix/53.png
-share/Eterm/pix/54.png
-share/Eterm/pix/55.png
-share/Eterm/pix/59.png
-share/Eterm/pix/6.png
-share/Eterm/pix/7.png
-share/Eterm/pix/70s_marble.png
-share/Eterm/pix/7m.png
-share/Eterm/pix/Bladerunner-bg.png
-share/Eterm/pix/Building.jpg
-share/Eterm/pix/Canyon.jpg
-share/Eterm/pix/Cavefire-bg.png
-share/Eterm/pix/Daughter.jpg
-share/Eterm/pix/Dragon.jpg
-share/Eterm/pix/Evocation.jpg
-share/Eterm/pix/Gas_Station.jpg
-share/Eterm/pix/Hall_of_Mirrors.jpg
-share/Eterm/pix/Neopolis-horizon.png
-share/Eterm/pix/Piramid.jpg
-share/Eterm/pix/Snow.jpg
-share/Eterm/pix/Terraforming.jpg
-share/Eterm/pix/The_Castle.jpg
-share/Eterm/pix/The_New_Base.jpg
-share/Eterm/pix/a10.png
-share/Eterm/pix/a2.png
-share/Eterm/pix/a8.png
-share/Eterm/pix/after_the_storm.jpg
-share/Eterm/pix/alien_spheres.jpg
-share/Eterm/pix/ascension.png
-share/Eterm/pix/atlantis.jpg
-share/Eterm/pix/atoms.png
-share/Eterm/pix/atoms2.png
-share/Eterm/pix/back1.jpg
-share/Eterm/pix/back3.jpg
-share/Eterm/pix/backwave.jpg
-share/Eterm/pix/beacon2.jpg
-share/Eterm/pix/before_the_storm.jpg
-share/Eterm/pix/blackstone.png
-share/Eterm/pix/blue_marble.png
-share/Eterm/pix/blue_maze.png
-share/Eterm/pix/blue_rock.png
-share/Eterm/pix/blue_sandpaper.png
-share/Eterm/pix/blue_water.png
-share/Eterm/pix/blue_weave.png
-share/Eterm/pix/bluerising.jpg
-share/Eterm/pix/blurock.png
-share/Eterm/pix/bow-tiles.png
-share/Eterm/pix/brushed_aluminum.png
-share/Eterm/pix/button1.jpg
-share/Eterm/pix/button5.jpg
-share/Eterm/pix/c0de.jpg
-share/Eterm/pix/castle_verde.jpg
-share/Eterm/pix/chamelea.jpg
-share/Eterm/pix/circuit.png
-share/Eterm/pix/citidel.jpg
-share/Eterm/pix/city3.jpg
-share/Eterm/pix/class_m.jpg
-share/Eterm/pix/coarse_red.png
-share/Eterm/pix/conjunction.jpg
-share/Eterm/pix/coral3.png
-share/Eterm/pix/coral4.png
-share/Eterm/pix/corrugated_metal.png
-share/Eterm/pix/coup_de_grace.jpg
-share/Eterm/pix/crater_lake.jpg
-share/Eterm/pix/cronus.jpg
-share/Eterm/pix/cyber_bg.png
-share/Eterm/pix/dark_marble.png
-share/Eterm/pix/dirt.png
-share/Eterm/pix/distant_kin.jpg
-share/Eterm/pix/dvxvb.jpg
-share/Eterm/pix/elysium.jpg
-share/Eterm/pix/enclosure.jpg
-share/Eterm/pix/ether.png
-share/Eterm/pix/ether_blue.png
-share/Eterm/pix/ether_green.png
-share/Eterm/pix/firering.png
-share/Eterm/pix/fond_mau.png
-share/Eterm/pix/fossil.jpg
-share/Eterm/pix/fourthday.jpg
-share/Eterm/pix/gaia.jpg
-share/Eterm/pix/gaia_station.jpg
-share/Eterm/pix/galleon.jpg
-share/Eterm/pix/gazebo.jpg
-share/Eterm/pix/giger1.png
-share/Eterm/pix/giger2.png
-share/Eterm/pix/good_morning_sunshine.jpg
-share/Eterm/pix/gorgon.jpg
-share/Eterm/pix/green_stucco.png
-share/Eterm/pix/greenred.png
-share/Eterm/pix/greybg.png
-share/Eterm/pix/holding.jpg
-share/Eterm/pix/hour.jpg
-share/Eterm/pix/hubbles_doorstep.jpg
-share/Eterm/pix/icemoon.jpg
-share/Eterm/pix/inlet.jpg
-share/Eterm/pix/iron_temple.jpg
-share/Eterm/pix/kingdom.jpg
-share/Eterm/pix/lake_of_fire.jpg
-share/Eterm/pix/lava2.png
-share/Eterm/pix/legacy.jpg
-share/Eterm/pix/lightb1.png
-share/Eterm/pix/lighthouse.jpg
-share/Eterm/pix/lotus.jpg
-share/Eterm/pix/maple1.png
-share/Eterm/pix/money2.png
-share/Eterm/pix/money3.png
-share/Eterm/pix/moss.png
-share/Eterm/pix/multicolor1_dots.png
-share/Eterm/pix/multicolor3_rock.png
-share/Eterm/pix/nebula.jpg
-share/Eterm/pix/neopolis.jpg
-share/Eterm/pix/night_of_the_dragon.jpg
-share/Eterm/pix/night_watchman.jpg
-share/Eterm/pix/nocturne.jpg
-share/Eterm/pix/observation_deck.jpg
-share/Eterm/pix/pebble1.png
+share/Eterm/pix/bar_horizontal_1.png
+share/Eterm/pix/bar_horizontal_2.png
+share/Eterm/pix/bar_horizontal_3.png
+share/Eterm/pix/bar_vertical_1.png
+share/Eterm/pix/bar_vertical_2.png
+share/Eterm/pix/bar_vertical_3.png
+share/Eterm/pix/button_arrow_down_1.png
+share/Eterm/pix/button_arrow_down_2.png
+share/Eterm/pix/button_arrow_down_3.png
+share/Eterm/pix/button_arrow_up_1.png
+share/Eterm/pix/button_arrow_up_2.png
+share/Eterm/pix/button_arrow_up_3.png
+share/Eterm/pix/exit.png
+share/Eterm/pix/help.png
+share/Eterm/pix/menu1.png
+share/Eterm/pix/menu2.png
+share/Eterm/pix/menu3.png
 share/Eterm/pix/pixmaps.list
-share/Eterm/pix/planeta.png
-share/Eterm/pix/plants.png
-share/Eterm/pix/pond.png
-share/Eterm/pix/pool_blue.png
-share/Eterm/pix/portal.jpg
-share/Eterm/pix/poseidon.png
-share/Eterm/pix/purpgls.png
-share/Eterm/pix/purple_marble2.png
-share/Eterm/pix/purple_stuff.png
-share/Eterm/pix/qube25p.png
-share/Eterm/pix/red_rock.png
-share/Eterm/pix/red_stucco.png
-share/Eterm/pix/redgray_marble.png
-share/Eterm/pix/return_to_giza.jpg
-share/Eterm/pix/ripple.png
-share/Eterm/pix/rising.jpg
-share/Eterm/pix/river_of_lead.jpg
-share/Eterm/pix/roche_limit.jpg
-share/Eterm/pix/sentinel.jpg
-share/Eterm/pix/shale.png
-share/Eterm/pix/silence.jpg
-share/Eterm/pix/sky2.png
-share/Eterm/pix/sleepwalker.jpg
-share/Eterm/pix/soft.png
-share/Eterm/pix/soft_blue.png
-share/Eterm/pix/space.png
-share/Eterm/pix/starry.png
-share/Eterm/pix/still_life_study.jpg
-share/Eterm/pix/strands1.png
-share/Eterm/pix/sun.png
-share/Eterm/pix/the_forest_queen.jpg
-share/Eterm/pix/the_taken_field.jpg
-share/Eterm/pix/traveller.jpg
-share/Eterm/pix/trinity.jpg
-share/Eterm/pix/tunnel.jpg
-share/Eterm/pix/unfriendly_terrain.jpg
-share/Eterm/pix/urmane1.jpg
-share/Eterm/pix/urmane2.jpg
-share/Eterm/pix/urmane3.jpg
-share/Eterm/pix/urmane4.jpg
-share/Eterm/pix/wasteland.jpg
-share/Eterm/pix/waves.png
-share/Eterm/pix/woodish1.png
-share/Eterm/pix/wtrstone.jpg
-share/Eterm/themes/Eterm/Eterm.menu
-share/Eterm/themes/Eterm/MAIN
+share/Eterm/pix/scale/Bladerunner-bg.png
+share/Eterm/pix/scale/Building.jpg
+share/Eterm/pix/scale/Canyon.jpg
+share/Eterm/pix/scale/Cavefire-bg.png
+share/Eterm/pix/scale/Daughter.jpg
+share/Eterm/pix/scale/Dragon.jpg
+share/Eterm/pix/scale/Evocation.jpg
+share/Eterm/pix/scale/Gas_Station.jpg
+share/Eterm/pix/scale/Hall_of_Mirrors.jpg
+share/Eterm/pix/scale/Neopolis-horizon.jpg
+share/Eterm/pix/scale/Neopolis-horizon.png
+share/Eterm/pix/scale/Piramid.jpg
+share/Eterm/pix/scale/Snow.jpg
+share/Eterm/pix/scale/Terraforming.jpg
+share/Eterm/pix/scale/The_Castle.jpg
+share/Eterm/pix/scale/The_New_Base.jpg
+share/Eterm/pix/scale/after_the_storm.jpg
+share/Eterm/pix/scale/alien_spheres.jpg
+share/Eterm/pix/scale/ascension.png
+share/Eterm/pix/scale/atlantis.jpg
+share/Eterm/pix/scale/back1.jpg
+share/Eterm/pix/scale/back3.jpg
+share/Eterm/pix/scale/beacon2.jpg
+share/Eterm/pix/scale/before_the_storm.jpg
+share/Eterm/pix/scale/bluerising.jpg
+share/Eterm/pix/scale/castle_verde.jpg
+share/Eterm/pix/scale/chamelea.jpg
+share/Eterm/pix/scale/citidel.jpg
+share/Eterm/pix/scale/city3.jpg
+share/Eterm/pix/scale/class_m.jpg
+share/Eterm/pix/scale/conjunction.jpg
+share/Eterm/pix/scale/coup_de_grace.jpg
+share/Eterm/pix/scale/crater_lake.jpg
+share/Eterm/pix/scale/cronus.jpg
+share/Eterm/pix/scale/distant_kin.jpg
+share/Eterm/pix/scale/dvxvb.jpg
+share/Eterm/pix/scale/elysium.jpg
+share/Eterm/pix/scale/enclosure.jpg
+share/Eterm/pix/scale/fossil.jpg
+share/Eterm/pix/scale/fourthday.jpg
+share/Eterm/pix/scale/gaia.jpg
+share/Eterm/pix/scale/gaia_station.jpg
+share/Eterm/pix/scale/galleon.jpg
+share/Eterm/pix/scale/gazebo.jpg
+share/Eterm/pix/scale/good_morning_sunshine.jpg
+share/Eterm/pix/scale/gorgon.jpg
+share/Eterm/pix/scale/holding.jpg
+share/Eterm/pix/scale/hour.jpg
+share/Eterm/pix/scale/hubbles_doorstep.jpg
+share/Eterm/pix/scale/icemoon.jpg
+share/Eterm/pix/scale/inlet.jpg
+share/Eterm/pix/scale/iron_temple.jpg
+share/Eterm/pix/scale/kingdom.jpg
+share/Eterm/pix/scale/lake_of_fire.jpg
+share/Eterm/pix/scale/legacy.jpg
+share/Eterm/pix/scale/lighthouse.jpg
+share/Eterm/pix/scale/lotus.jpg
+share/Eterm/pix/scale/nebula.jpg
+share/Eterm/pix/scale/neopolis.jpg
+share/Eterm/pix/scale/night_of_the_dragon.jpg
+share/Eterm/pix/scale/night_watchman.jpg
+share/Eterm/pix/scale/nocturne.jpg
+share/Eterm/pix/scale/observation_deck.jpg
+share/Eterm/pix/scale/planeta.png
+share/Eterm/pix/scale/pond.png
+share/Eterm/pix/scale/portal.jpg
+share/Eterm/pix/scale/poseidon.png
+share/Eterm/pix/scale/return_to_giza.jpg
+share/Eterm/pix/scale/ripple.png
+share/Eterm/pix/scale/rising.jpg
+share/Eterm/pix/scale/river_of_lead.jpg
+share/Eterm/pix/scale/roche_limit.jpg
+share/Eterm/pix/scale/sentinel.jpg
+share/Eterm/pix/scale/silence.jpg
+share/Eterm/pix/scale/sleepwalker.jpg
+share/Eterm/pix/scale/still_life_study.jpg
+share/Eterm/pix/scale/sun.png
+share/Eterm/pix/scale/the_forest_queen.jpg
+share/Eterm/pix/scale/the_taken_field.jpg
+share/Eterm/pix/scale/traveller.jpg
+share/Eterm/pix/scale/trinity.jpg
+share/Eterm/pix/scale/tunnel.jpg
+share/Eterm/pix/scale/unfriendly_terrain.jpg
+share/Eterm/pix/scale/urmane1.jpg
+share/Eterm/pix/scale/urmane2.jpg
+share/Eterm/pix/scale/urmane3.jpg
+share/Eterm/pix/scale/urmane4.jpg
+share/Eterm/pix/scale/wasteland.jpg
+share/Eterm/pix/thumb_1.png
+share/Eterm/pix/thumb_2.png
+share/Eterm/pix/tile/004.png
+share/Eterm/pix/tile/014.jpg
+share/Eterm/pix/tile/014.png
+share/Eterm/pix/tile/015.png
+share/Eterm/pix/tile/017.png
+share/Eterm/pix/tile/021.png
+share/Eterm/pix/tile/024.png
+share/Eterm/pix/tile/026.png
+share/Eterm/pix/tile/033.png
+share/Eterm/pix/tile/15.png
+share/Eterm/pix/tile/22.png
+share/Eterm/pix/tile/35.png
+share/Eterm/pix/tile/36.png
+share/Eterm/pix/tile/4.png
+share/Eterm/pix/tile/40.jpg
+share/Eterm/pix/tile/40.png
+share/Eterm/pix/tile/43.png
+share/Eterm/pix/tile/45.png
+share/Eterm/pix/tile/47.png
+share/Eterm/pix/tile/50.png
+share/Eterm/pix/tile/53.png
+share/Eterm/pix/tile/54.png
+share/Eterm/pix/tile/55.png
+share/Eterm/pix/tile/59.png
+share/Eterm/pix/tile/6.png
+share/Eterm/pix/tile/7.png
+share/Eterm/pix/tile/70s_marble.png
+share/Eterm/pix/tile/7m.png
+share/Eterm/pix/tile/a10.png
+share/Eterm/pix/tile/a2.png
+share/Eterm/pix/tile/a8.png
+share/Eterm/pix/tile/atoms.png
+share/Eterm/pix/tile/atoms2.png
+share/Eterm/pix/tile/backwave.jpg
+share/Eterm/pix/tile/blackstone.jpg
+share/Eterm/pix/tile/blackstone.png
+share/Eterm/pix/tile/blue_marble.png
+share/Eterm/pix/tile/blue_maze.png
+share/Eterm/pix/tile/blue_rock.png
+share/Eterm/pix/tile/blue_sandpaper.png
+share/Eterm/pix/tile/blue_water.png
+share/Eterm/pix/tile/blue_weave.png
+share/Eterm/pix/tile/blurock.png
+share/Eterm/pix/tile/bow-tiles.png
+share/Eterm/pix/tile/brushed_aluminum.png
+share/Eterm/pix/tile/button1.jpg
+share/Eterm/pix/tile/button5.jpg
+share/Eterm/pix/tile/c0de.jpg
+share/Eterm/pix/tile/circuit.jpg
+share/Eterm/pix/tile/circuit.png
+share/Eterm/pix/tile/coarse_red.png
+share/Eterm/pix/tile/coral3.png
+share/Eterm/pix/tile/coral4.png
+share/Eterm/pix/tile/corrugated_metal.png
+share/Eterm/pix/tile/cyber_bg.png
+share/Eterm/pix/tile/dark_marble.png
+share/Eterm/pix/tile/dirt.png
+share/Eterm/pix/tile/ether.png
+share/Eterm/pix/tile/ether_blue.png
+share/Eterm/pix/tile/ether_green.png
+share/Eterm/pix/tile/firering.png
+share/Eterm/pix/tile/fond_mau.png
+share/Eterm/pix/tile/giger1.jpg
+share/Eterm/pix/tile/giger1.png
+share/Eterm/pix/tile/giger2.png
+share/Eterm/pix/tile/green_stucco.png
+share/Eterm/pix/tile/greenred.png
+share/Eterm/pix/tile/greybg.png
+share/Eterm/pix/tile/lava2.png
+share/Eterm/pix/tile/lightb1.png
+share/Eterm/pix/tile/maple1.png
+share/Eterm/pix/tile/money2.png
+share/Eterm/pix/tile/money3.png
+share/Eterm/pix/tile/moss.png
+share/Eterm/pix/tile/multicolor1_dots.png
+share/Eterm/pix/tile/multicolor3_rock.png
+share/Eterm/pix/tile/nebula.jpg
+share/Eterm/pix/tile/pebble1.png
+share/Eterm/pix/tile/plants.png
+share/Eterm/pix/tile/pool_blue.png
+share/Eterm/pix/tile/purpgls.png
+share/Eterm/pix/tile/purple_marble2.png
+share/Eterm/pix/tile/purple_stuff.png
+share/Eterm/pix/tile/qube25p.png
+share/Eterm/pix/tile/red_rock.png
+share/Eterm/pix/tile/red_stucco.png
+share/Eterm/pix/tile/redgray_marble.png
+share/Eterm/pix/tile/shale.png
+share/Eterm/pix/tile/sky2.png
+share/Eterm/pix/tile/soft.png
+share/Eterm/pix/tile/soft_blue.png
+share/Eterm/pix/tile/space.png
+share/Eterm/pix/tile/starry.png
+share/Eterm/pix/tile/strands1.png
+share/Eterm/pix/tile/waves.png
+share/Eterm/pix/tile/woodish1.png
+share/Eterm/pix/tile/wtrstone.jpg
+share/Eterm/themes/Escreen/menus.cfg
+share/Eterm/themes/Escreen/pixmaps.list
+share/Eterm/themes/Escreen/theme.cfg
+share/Eterm/themes/Eterm/menus.cfg
 share/Eterm/themes/Eterm/pixmaps.list
-share/Eterm/themes/chooser/MAIN
-share/Eterm/themes/chooser/chooser.menu
-share/Eterm/themes/chooser/pixmaps.list
-share/Eterm/themes/emacs/MAIN
-share/Eterm/themes/emacs/emacs.menu
-share/Eterm/themes/emacs/pixmaps.list
-share/Eterm/themes/irc/MAIN
-share/Eterm/themes/irc/irc.menu
-share/Eterm/themes/irc/pixmaps.list
-share/Eterm/themes/mutt/MAIN
-share/Eterm/themes/mutt/mutt.menu
-share/Eterm/themes/mutt/pixmaps.list
-share/Eterm/themes/tn3270/MAIN
-share/Eterm/themes/tn3270/pixmaps.list
-share/Eterm/themes/trans/MAIN
+share/Eterm/themes/Eterm/theme.cfg
+share/Eterm/themes/auto/menus.cfg
+share/Eterm/themes/auto/pixmaps.list
+share/Eterm/themes/auto/theme.cfg
+share/Eterm/themes/trans/menus.cfg
 share/Eterm/themes/trans/pixmaps.list
-share/Eterm/themes/trans/trans.menu
-@dirrm share/Eterm/themes/Eterm
-@dirrm share/Eterm/themes/chooser
-@dirrm share/Eterm/themes/emacs
-@dirrm share/Eterm/themes/irc
-@dirrm share/Eterm/themes/mutt
-@dirrm share/Eterm/themes/tn3270
+share/Eterm/themes/trans/theme.cfg
 @dirrm share/Eterm/themes/trans
+@dirrm share/Eterm/themes/auto
+@dirrm share/Eterm/themes/Eterm
+@dirrm share/Eterm/themes/Escreen
 @dirrm share/Eterm/themes
+@dirrm share/Eterm/pix/tile
+@dirrm share/Eterm/pix/scale
 @dirrm share/Eterm/pix
 @dirrm share/Eterm
diff --git a/x11/eterm/distinfo b/x11/eterm/distinfo
index 1ea848c340d..60c9fa2261b 100644
--- a/x11/eterm/distinfo
+++ b/x11/eterm/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 21:52:36 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/12/26 04:58:44 wiz Exp $
 
-SHA1 (Eterm-0.8.10.tar.gz) = 0cafeec2c9d79c874c6b312dcb105b912168ad0d
-Size (Eterm-0.8.10.tar.gz) = 593026 bytes
+SHA1 (Eterm-0.9.2.tar.gz) = 1d3b11323d7c913d89ee546619b21a65c0fe6a6f
+Size (Eterm-0.9.2.tar.gz) = 662636 bytes
 SHA1 (Eterm-bg-scale-1.tar.gz) = 39c6146740edf04ddb0aa40ed4e078e8317b0557
 Size (Eterm-bg-scale-1.tar.gz) = 3420298 bytes
 SHA1 (Eterm-bg-scale-2.tar.gz) = 711365b4478dc7cb3891c77a5d9054778c581184
 Size (Eterm-bg-scale-2.tar.gz) = 3145775 bytes
 SHA1 (Eterm-bg-tile.tar.gz) = 2ccb31a8fd0e80e5dd92aebef6baf5554f66e361
 Size (Eterm-bg-tile.tar.gz) = 1568166 bytes
-SHA1 (patch-aa) = 056585ad4c39b60a3dbf41d8c7e65d31ba5f7fcd
-SHA1 (patch-ab) = cdea7fe7a3c546e9f89a7eb86ec079f34572e984
-SHA1 (patch-ac) = 26b0f5c13f2b621db1c5edf84c5123b315225d8d
-SHA1 (patch-ad) = a750146fe3a0b0b2796997cf2e20e38f14be86bf
-SHA1 (patch-ah) = ebf2fa3ae2d272795f0a292b201586cc2158c973
+SHA1 (patch-ad) = f70a92e4eb84466e379653cbd3a9188db6d408c8
+SHA1 (patch-ah) = 81dac9571b5184d803003a0681c9cc8a0a62e389
+SHA1 (patch-ai) = 9a173c2d8dc7a9b3f6cd1a09e9a04586f6c82f93
diff --git a/x11/eterm/patches/patch-aa b/x11/eterm/patches/patch-aa
deleted file mode 100644
index 54cf593990a..00000000000
--- a/x11/eterm/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/10/28 00:31:59 jlam Exp $
-
---- configure.orig	Mon Apr 19 19:47:32 1999
-+++ configure	Mon Oct 25 16:28:54 1999
-@@ -1858,6 +1858,7 @@
- fi
- 
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -2158,6 +2159,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
- 
- 
- echo $ac_n "checking for distribution root""... $ac_c" 1>&6
diff --git a/x11/eterm/patches/patch-ab b/x11/eterm/patches/patch-ab
deleted file mode 100644
index 2ab11bb1d85..00000000000
--- a/x11/eterm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/04/28 11:07:35 zuntum Exp $
-
---- doc/Makefile.in.orig	Mon Apr 26 10:54:04 1999
-+++ doc/Makefile.in	Mon Oct 25 16:29:33 1999
-@@ -253,7 +253,7 @@
- 	$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@
- 
- Eterm.1.html: Eterm.1
--	-nroff -man $< | man2html > $@
-+	-nroff -man Eterm.1 | man2html > $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/eterm/patches/patch-ac b/x11/eterm/patches/patch-ac
deleted file mode 100644
index 8aa4a3623b6..00000000000
--- a/x11/eterm/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/04/28 11:07:35 zuntum Exp $
-
---- themes/Makefile.in.orig	Mon Apr 26 10:53:58 1999
-+++ themes/Makefile.in	Mon Oct 25 18:10:44 1999
-@@ -214,19 +214,13 @@
- 	done
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes
- 	-@for i in $(THEMES) ; do \
--	  if test ! -d $(DESTDIR)$(pkgdatadir)/themes/$$i ; then \
- 	    echo "Installing $$i theme in $(DESTDIR)$(pkgdatadir)/themes" ; \
- 	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
-	    $(CP) $(srcdir)/$$i/???* $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
- 	    $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
- 	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
- 	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/MAIN.in ; \
--	  else \
--	    echo "ALERT!  Not overwriting theme $$i in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
--	  fi ; \
- 	done
--	@if test ! -f $(HOME)/.active.tags ; then $(CP) $(srcdir)/active.tags $(HOME)/.active.tags ; \
--	   else echo "Not installing $(HOME)/.active.tags -- File exists." ; fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/eterm/patches/patch-ad b/x11/eterm/patches/patch-ad
index be263902851..ccd83d08413 100644
--- a/x11/eterm/patches/patch-ad
+++ b/x11/eterm/patches/patch-ad
@@ -1,12 +1,11 @@
-$NetBSD: patch-ad,v 1.2 2001/04/28 11:07:35 zuntum Exp $
-
---- utils/Etbg.c.orig	Thu Oct 28 02:18:26 1999
-+++ utils/Etbg.c
-@@ -24,7 +24,6 @@
-  */
+$NetBSD: patch-ad,v 1.3 2002/12/26 04:58:45 wiz Exp $
+--- utils/Etbg.c.orig	Sat Dec 14 12:42:36 2002
++++ utils/Etbg.c	Sat Dec 14 12:42:50 2002
+@@ -26,7 +26,6 @@
+ #include <config.h>
  
  #include <stdio.h>
 -#include <string.h>
  
  #ifndef FALSE
- # define FALSE (0)
+ #  define FALSE (0)
diff --git a/x11/eterm/patches/patch-ah b/x11/eterm/patches/patch-ah
index 9e55f00b586..7702d5feb06 100644
--- a/x11/eterm/patches/patch-ah
+++ b/x11/eterm/patches/patch-ah
@@ -1,76 +1,77 @@
-$NetBSD: patch-ah,v 1.2 2002/08/25 21:52:39 jlam Exp $
-
---- src/utmp.c	2002/06/17 21:59:32	1.1
-+++ src/utmp.c	2002/06/17 22:03:43
-@@ -39,6 +39,7 @@
- #  undef HAVE_UTMPX_H
- #endif
- #ifdef HAVE_UTMPX_H
-+# include <utmp.h>
- # include <utmpx.h>
- # define USE_SYSV_UTMP
- #else
-@@ -95,7 +96,11 @@
+$NetBSD: patch-ah,v 1.3 2002/12/26 04:58:45 wiz Exp $
+--- src/utmp.c.orig	Thu Jun 27 14:15:53 2002
++++ src/utmp.c	Sat Dec 14 21:44:17 2002
+@@ -47,8 +47,13 @@
+ # ifdef USE_SYSV_UTMP
  
  #  ifdef HAVE_UTMPX_H
- #    undef WTMP_FILENAME
--#    define WTMP_FILENAME WTMPX_FILE
-+#    if defined(WTMPX_FILE)
-+#      define WTMP_FILENAME WTMPX_FILE
-+#    else
-+#      define WTMP_FILENAME _PATH_WTMPX
-+#    endif
- #    define update_wtmp updwtmpx
- #  else				/* HAVE_UTMPX_H */
++#   include <utmp.h>
+ #   undef WTMP_FILENAME
+-#   define WTMP_FILENAME WTMPX_FILE
++#   if defined(WTMPX_FILE)
++#     define WTMP_FILENAME WTMPX_FILE
++#   else
++#     define WTMP_FILENAME _PATH_WTMPX
++#   endif
+ #   define update_wtmp updwtmpx
+ #  else /* HAVE_UTMPX_H */
  
-@@ -179,7 +184,7 @@
-   privileges(INVOKE);
- #ifdef HAVE_UTMPX_H
-   getutmp(&utmp, &utmp2);
--  getutid(&utmp2);		/* position to entry in utmp file */
-+  getutxid(&utmp);		/* position to entry in utmp file */
- #else
-   getutid(&utmp);		/* position to entry in utmp file */
- #endif
-@@ -203,16 +208,15 @@
-   /*
-    * write a utmp entry to the utmp file
-    */
--  utmpname(UTMP_FILENAME);
-+  utmpxname(UTMP_FILENAME);
- #ifdef HAVE_UTMPX_H
-   getutmp(&utmp, &utmp2);
--  pututline(&utmp2);
-   pututxline(&utmp);
- #else
-   pututline(&utmp);
- #endif
-   update_wtmp(WTMP_FILENAME, &utmp);
--  endutent();			/* close the file */
-+  endutxent();			/* close the file */
-   privileges(REVERT);
- }
+@@ -128,9 +133,9 @@
+     privileges(INVOKE);
+ #   ifdef HAVE_UTMPX_H
+     getutmp(&utmp, &utmp2);
+-    getutid(&utmp2);            /* position to entry in utmp file */
++    getutxid(&utmp);            /* position to entry in utmp file */
+ #   else
+-    getutid(&utmp);             /* position to entry in utmp file */
++    getutxid(&utmp);             /* position to entry in utmp file */
+ #   endif
  
-@@ -228,16 +232,16 @@
-     return;			/* entry not made */
- 
-   privileges(INVOKE);
--  utmpname(UTMP_FILENAME);
--  setutent();
--  if (getutid(&utmp) == NULL)
-+  utmpxname(UTMP_FILENAME);
-+  setutxent();
-+  if (getutxid(&utmpx) == NULL)
+     /* set up the new entry */
+@@ -152,16 +157,15 @@
+     /*
+      * write a utmp entry to the utmp file
+      */
+-    utmpname(UTMP_FILENAME);
++    utmpxname(UTMP_FILENAME);
+ #   ifdef HAVE_UTMPX_H
+     getutmp(&utmp, &utmp2);
+-    pututline(&utmp2);
+     pututxline(&utmp);
+ #   else
+     pututline(&utmp);
+ #   endif
+     update_wtmp(WTMP_FILENAME, &utmp);
+-    endutent();                 /* close the file */
++    endutxent();                 /* close the file */
+     privileges(REVERT);
      return;
--  utmp.ut_type = DEAD_PROCESS;
-+  utmpx.ut_type = DEAD_PROCESS;
-   utmp.ut_time = time(NULL);
--  pututline(&utmp);
-+  pututxline(&utmpx);
-   getutmpx(&utmp, &utmpx);
-   update_wtmp(WTMP_FILENAME, &utmpx);
--  endutent();
-+  endutxent();
-   privileges(REVERT);
+     fd = 0;
+@@ -177,19 +181,19 @@
+     if (!ut_id[0])
+         return;                 /* entry not made */
+ 
+-    utmpname(UTMP_FILENAME);
+-    setutent();
+-    strncpy(utmp.ut_id, ut_id, sizeof(utmp.ut_id));
+-    utmp.ut_type = USER_PROCESS;
+-    if (getutid(&utmp) == NULL) {
++    utmpxname(UTMP_FILENAME);
++    setutxent();
++    strncpy(utmpx.ut_id, ut_id, sizeof(utmpx.ut_id));
++    utmpx.ut_type = USER_PROCESS;
++    if (getutxid(&utmp) == NULL) {
+         return;
+     }
+-    utmp.ut_type = DEAD_PROCESS;
++    utmpx.ut_type = DEAD_PROCESS;
+     utmp.ut_time = time(NULL);
+-    pututline(&utmp);
++    pututxline(&utmpx);
+     getutmpx(&utmp, &utmpx);
+     update_wtmp(WTMP_FILENAME, &utmpx);
+-    endutent();
++    endutxent();
  
- #else /* HAVE_UTMPX_H */
+ #   else /* HAVE_UTMPX_H */
+     struct utmp *putmp;
diff --git a/x11/eterm/patches/patch-ai b/x11/eterm/patches/patch-ai
new file mode 100644
index 00000000000..b3d70486af5
--- /dev/null
+++ b/x11/eterm/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2002/12/26 04:58:45 wiz Exp $
+--- doc/Makefile.in.orig	Sun Dec 15 00:50:46 2002
++++ doc/Makefile.in	Sun Dec 15 00:51:30 2002
+@@ -267,7 +267,7 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+-all: Makefile Eterm.1.html
++all: Makefile
+ 
+ Eterm.1: $(top_srcdir)/doc/Eterm.1.in
+ 	$(SED) -e 's%@''VERSION''@%$(VERSION)%g' -e 's%@''DATE''@%$(DATE)%g' -e 's%@THEMEDIR@%$(pkgdatadir)/themes%g' $(top_srcdir)/doc/$@.in > $@