Update tkgate to 1.8.7. Patch provided by Edgar Fuss in PR pkg/49482,

though the patch description says 1.8.3.

7 files changed, 270 insertions, 124 deletions

diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 28849de81e8..4d2f077a28f 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2014/01/11 14:42:01 adam Exp $
+# $NetBSD: Makefile,v 1.32 2015/01/17 14:48:56 bsiegert Exp $
 #
 
-DISTNAME=	tkgate-1.6i
-PKGREVISION=	9
+DISTNAME=	tkgate-1.8.7
 CATEGORIES=	cad
-MASTER_SITES=	ftp://gadoid.ices.cmu.edu/pub/tkgate/
+MASTER_SITES=	http://www.tkgate.org/downloads/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tkgate.org/
+LICENSE=	gnu-gpl-v2
 COMMENT=	Tcl/Tk based digital circuit editor and simulator
 
 BUILD_DEPENDS+=		libiconv-[0-9]*:../../converters/libiconv
diff --git a/cad/tkgate/PLIST b/cad/tkgate/PLIST
index 9eb324676e2..49875b61edb 100644
--- a/cad/tkgate/PLIST
+++ b/cad/tkgate/PLIST
@@ -1,20 +1,42 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:35:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/01/17 14:48:56 bsiegert Exp $
 bin/gmac
 bin/tkgate
-man/man1/gmac.${IMAKE_MANNEWSUFFIX}
-man/man1/tkgate.${IMAKE_MANNEWSUFFIX}
+man/man1/gmac.1
+man/man1/tkgate.1
 share/${PKGNAME}/COPYING
 share/${PKGNAME}/README
+share/${PKGNAME}/bitmaps/Makefile
+share/${PKGNAME}/bitmaps/Udemuxord1.gif
+share/${PKGNAME}/bitmaps/Udemuxord2.gif
+share/${PKGNAME}/bitmaps/Udemuxsel1.gif
+share/${PKGNAME}/bitmaps/Udemuxsel2.gif
+share/${PKGNAME}/bitmaps/Uff.gif
+share/${PKGNAME}/bitmaps/Uled_bar.gif
+share/${PKGNAME}/bitmaps/Uled_bit.gif
+share/${PKGNAME}/bitmaps/Uled_dec.gif
+share/${PKGNAME}/bitmaps/Uled_direct.gif
+share/${PKGNAME}/bitmaps/Uled_hex.gif
+share/${PKGNAME}/bitmaps/Umuxord1.gif
+share/${PKGNAME}/bitmaps/Umuxord2.gif
+share/${PKGNAME}/bitmaps/Umuxsel1.gif
+share/${PKGNAME}/bitmaps/Umuxsel2.gif
+share/${PKGNAME}/bitmaps/Urff.gif
 share/${PKGNAME}/bitmaps/add.b
 share/${PKGNAME}/bitmaps/anallogo.xbm
-share/${PKGNAME}/bitmaps/analyze.b
+share/${PKGNAME}/bitmaps/analyze.gif
+share/${PKGNAME}/bitmaps/analyze.xpm
 share/${PKGNAME}/bitmaps/and.b
 share/${PKGNAME}/bitmaps/arshift.b
+share/${PKGNAME}/bitmaps/back.gif
+share/${PKGNAME}/bitmaps/back.xpm
 share/${PKGNAME}/bitmaps/bat.b
 share/${PKGNAME}/bitmaps/bigcurs.b
+share/${PKGNAME}/bitmaps/biggatelogo.gif
 share/${PKGNAME}/bitmaps/biggatelogo.xbm
-share/${PKGNAME}/bitmaps/blk_close.b
-share/${PKGNAME}/bitmaps/blk_open.b
+share/${PKGNAME}/bitmaps/blk_close.gif
+share/${PKGNAME}/bitmaps/blk_close.xpm
+share/${PKGNAME}/bitmaps/blk_open.gif
+share/${PKGNAME}/bitmaps/blk_open.xpm
 share/${PKGNAME}/bitmaps/buf.b
 share/${PKGNAME}/bitmaps/bus.b
 share/${PKGNAME}/bitmaps/clock.b
@@ -22,23 +44,47 @@ share/${PKGNAME}/bitmaps/concat.b
 share/${PKGNAME}/bitmaps/cut_curs.b
 share/${PKGNAME}/bitmaps/dash.b
 share/${PKGNAME}/bitmaps/del_curs.b
+share/${PKGNAME}/bitmaps/demuxord1.gif
+share/${PKGNAME}/bitmaps/demuxord2.gif
+share/${PKGNAME}/bitmaps/demuxsel1.gif
+share/${PKGNAME}/bitmaps/demuxsel2.gif
 share/${PKGNAME}/bitmaps/dip.b
 share/${PKGNAME}/bitmaps/divide.b
 share/${PKGNAME}/bitmaps/dot.b
-share/${PKGNAME}/bitmaps/file_new.b
-share/${PKGNAME}/bitmaps/file_open.b
-share/${PKGNAME}/bitmaps/file_print.b
-share/${PKGNAME}/bitmaps/file_save.b
+share/${PKGNAME}/bitmaps/edit_brotate.gif
+share/${PKGNAME}/bitmaps/edit_brotate.xpm
+share/${PKGNAME}/bitmaps/edit_rotate.gif
+share/${PKGNAME}/bitmaps/edit_rotate.xpm
+share/${PKGNAME}/bitmaps/ff.gif
+share/${PKGNAME}/bitmaps/ff.xpm
+share/${PKGNAME}/bitmaps/file_new.gif
+share/${PKGNAME}/bitmaps/file_new.xpm
+share/${PKGNAME}/bitmaps/file_open.gif
+share/${PKGNAME}/bitmaps/file_open.xpm
+share/${PKGNAME}/bitmaps/file_print.gif
+share/${PKGNAME}/bitmaps/file_print.xpm
+share/${PKGNAME}/bitmaps/file_save.gif
+share/${PKGNAME}/bitmaps/file_save.xpm
 share/${PKGNAME}/bitmaps/flipflop.b
+share/${PKGNAME}/bitmaps/forward.gif
+share/${PKGNAME}/bitmaps/forward.xpm
 share/${PKGNAME}/bitmaps/gatelogo.xbm
 share/${PKGNAME}/bitmaps/ground.b
+share/${PKGNAME}/bitmaps/ichip.gif
+share/${PKGNAME}/bitmaps/ichipdir.gif
 share/${PKGNAME}/bitmaps/inout.b
 share/${PKGNAME}/bitmaps/inv_curs.b
 share/${PKGNAME}/bitmaps/iodarrow.b
 share/${PKGNAME}/bitmaps/joint.b
 share/${PKGNAME}/bitmaps/lab_curs.b
+share/${PKGNAME}/bitmaps/large-trek.b
 share/${PKGNAME}/bitmaps/led.b
 share/${PKGNAME}/bitmaps/led7seg.b
+share/${PKGNAME}/bitmaps/led_bar.gif
+share/${PKGNAME}/bitmaps/led_bit.gif
+share/${PKGNAME}/bitmaps/led_dec.gif
+share/${PKGNAME}/bitmaps/led_direct.gif
+share/${PKGNAME}/bitmaps/led_hex.gif
 share/${PKGNAME}/bitmaps/ledinside.b
 share/${PKGNAME}/bitmaps/ledseg1.b
 share/${PKGNAME}/bitmaps/ledseg2.b
@@ -49,10 +95,16 @@ share/${PKGNAME}/bitmaps/ledseg6.b
 share/${PKGNAME}/bitmaps/ledseg7.b
 share/${PKGNAME}/bitmaps/lprobe.b
 share/${PKGNAME}/bitmaps/misc.b
+share/${PKGNAME}/bitmaps/module.gif
 share/${PKGNAME}/bitmaps/mov_curs.b
 share/${PKGNAME}/bitmaps/mult.b
 share/${PKGNAME}/bitmaps/mux.b
+share/${PKGNAME}/bitmaps/muxord1.gif
+share/${PKGNAME}/bitmaps/muxord2.gif
+share/${PKGNAME}/bitmaps/muxsel1.gif
+share/${PKGNAME}/bitmaps/muxsel2.gif
 share/${PKGNAME}/bitmaps/nmos.b
+share/${PKGNAME}/bitmaps/oldzoom_in.gif
 share/${PKGNAME}/bitmaps/or.b
 share/${PKGNAME}/bitmaps/plus.b
 share/${PKGNAME}/bitmaps/pmos.b
@@ -61,8 +113,19 @@ share/${PKGNAME}/bitmaps/ram.b
 share/${PKGNAME}/bitmaps/reg.b
 share/${PKGNAME}/bitmaps/regLR.b
 share/${PKGNAME}/bitmaps/regTB.b
+share/${PKGNAME}/bitmaps/rff.gif
+share/${PKGNAME}/bitmaps/rff.xpm
+share/${PKGNAME}/bitmaps/rflipflop.b
 share/${PKGNAME}/bitmaps/roll.b
 share/${PKGNAME}/bitmaps/rom.b
+share/${PKGNAME}/bitmaps/rotation0_S.gif
+share/${PKGNAME}/bitmaps/rotation0_S.xpm
+share/${PKGNAME}/bitmaps/rotation180_S.gif
+share/${PKGNAME}/bitmaps/rotation180_S.xpm
+share/${PKGNAME}/bitmaps/rotation270_S.gif
+share/${PKGNAME}/bitmaps/rotation270_S.xpm
+share/${PKGNAME}/bitmaps/rotation90_S.gif
+share/${PKGNAME}/bitmaps/rotation90_S.xpm
 share/${PKGNAME}/bitmaps/rungate1.xbm
 share/${PKGNAME}/bitmaps/rungate10.xbm
 share/${PKGNAME}/bitmaps/rungate11.xbm
@@ -83,16 +146,29 @@ share/${PKGNAME}/bitmaps/rungateC.xbm
 share/${PKGNAME}/bitmaps/scroll.b
 share/${PKGNAME}/bitmaps/seg7.b
 share/${PKGNAME}/bitmaps/shift.b
-share/${PKGNAME}/bitmaps/sim_break.b
+share/${PKGNAME}/bitmaps/show_xhair.gif
+share/${PKGNAME}/bitmaps/show_xhair.xpm
+share/${PKGNAME}/bitmaps/sim_break.gif
+share/${PKGNAME}/bitmaps/sim_break.xpm
 share/${PKGNAME}/bitmaps/sim_break2.b
-share/${PKGNAME}/bitmaps/sim_clock.b
-share/${PKGNAME}/bitmaps/sim_dump.b
+share/${PKGNAME}/bitmaps/sim_clock.gif
+share/${PKGNAME}/bitmaps/sim_clock.xpm
+share/${PKGNAME}/bitmaps/sim_dump.gif
+share/${PKGNAME}/bitmaps/sim_dump.xpm
 share/${PKGNAME}/bitmaps/sim_go.b
-share/${PKGNAME}/bitmaps/sim_load.b
+share/${PKGNAME}/bitmaps/sim_go.gif
+share/${PKGNAME}/bitmaps/sim_load.gif
+share/${PKGNAME}/bitmaps/sim_load.xpm
 share/${PKGNAME}/bitmaps/sim_pause.b
-share/${PKGNAME}/bitmaps/sim_script.b
+share/${PKGNAME}/bitmaps/sim_pause.gif
+share/${PKGNAME}/bitmaps/sim_script.gif
+share/${PKGNAME}/bitmaps/sim_script.xpm
 share/${PKGNAME}/bitmaps/sim_step.b
+share/${PKGNAME}/bitmaps/sim_step.gif
 share/${PKGNAME}/bitmaps/sim_stop.b
+share/${PKGNAME}/bitmaps/sim_stop.gif
+share/${PKGNAME}/bitmaps/simstart.gif
+share/${PKGNAME}/bitmaps/simstart.xpm
 share/${PKGNAME}/bitmaps/size_curs.b
 share/${PKGNAME}/bitmaps/smallcurs.b
 share/${PKGNAME}/bitmaps/smalldot.b
@@ -105,16 +181,21 @@ share/${PKGNAME}/bitmaps/tty.b
 share/${PKGNAME}/bitmaps/txtcurs.b
 share/${PKGNAME}/bitmaps/vdd.b
 share/${PKGNAME}/bitmaps/xor.b
-share/${PKGNAME}/bitmaps/zoom_in.b
-share/${PKGNAME}/bitmaps/zoom_out.b
+share/${PKGNAME}/bitmaps/zoom_in.gif
+share/${PKGNAME}/bitmaps/zoom_in.xpm
+share/${PKGNAME}/bitmaps/zoom_out.gif
+share/${PKGNAME}/bitmaps/zoom_out.xpm
 share/${PKGNAME}/doc/adding_gate_types.txt
-share/${PKGNAME}/doc/fig/anallogo.xbm
+share/${PKGNAME}/doc/fig/anallogo.gif
 share/${PKGNAME}/doc/fig/analopts.gif
+share/${PKGNAME}/doc/fig/analyze.gif
 share/${PKGNAME}/doc/fig/arrow.gif
 share/${PKGNAME}/doc/fig/arrow4.gif
+share/${PKGNAME}/doc/fig/back.gif
 share/${PKGNAME}/doc/fig/balloon.gif
-share/${PKGNAME}/doc/fig/bigcurs.b
-share/${PKGNAME}/doc/fig/biggatelogo.xbm
+share/${PKGNAME}/doc/fig/biggatelogo.gif
+share/${PKGNAME}/doc/fig/blk_close.gif
+share/${PKGNAME}/doc/fig/blk_open.gif
 share/${PKGNAME}/doc/fig/break.gif
 share/${PKGNAME}/doc/fig/chdir.gif
 share/${PKGNAME}/doc/fig/circprop.gif
@@ -124,20 +205,21 @@ share/${PKGNAME}/doc/fig/connect1b.gif
 share/${PKGNAME}/doc/fig/connect1c.gif
 share/${PKGNAME}/doc/fig/connect1d.gif
 share/${PKGNAME}/doc/fig/connect2a.gif
-share/${PKGNAME}/doc/fig/connect2a.xpm
 share/${PKGNAME}/doc/fig/connect2b.gif
 share/${PKGNAME}/doc/fig/connect2c.gif
 share/${PKGNAME}/doc/fig/connect2d.gif
 share/${PKGNAME}/doc/fig/cpathcirc.gif
 share/${PKGNAME}/doc/fig/cpathdlg.gif
-share/${PKGNAME}/doc/fig/cretgat1.gif
-share/${PKGNAME}/doc/fig/cretgat2.gif
-share/${PKGNAME}/doc/fig/cretgat3.gif
-share/${PKGNAME}/doc/fig/cretgat4.gif
+share/${PKGNAME}/doc/fig/create1.gif
+share/${PKGNAME}/doc/fig/create2.gif
+share/${PKGNAME}/doc/fig/create3.gif
+share/${PKGNAME}/doc/fig/create4.gif
 share/${PKGNAME}/doc/fig/cretin.gif
 share/${PKGNAME}/doc/fig/cretinout.gif
 share/${PKGNAME}/doc/fig/cretout.gif
+share/${PKGNAME}/doc/fig/cut_curs.gif
 share/${PKGNAME}/doc/fig/cutters.gif
+share/${PKGNAME}/doc/fig/del_curs.gif
 share/${PKGNAME}/doc/fig/dipval.gif
 share/${PKGNAME}/doc/fig/edbreak.gif
 share/${PKGNAME}/doc/fig/edclock.gif
@@ -147,8 +229,13 @@ share/${PKGNAME}/doc/fig/edgat.gif
 share/${PKGNAME}/doc/fig/ednet.gif
 share/${PKGNAME}/doc/fig/edpnet.gif
 share/${PKGNAME}/doc/fig/edport.gif
+share/${PKGNAME}/doc/fig/file_new.gif
+share/${PKGNAME}/doc/fig/file_open.gif
+share/${PKGNAME}/doc/fig/file_print.gif
+share/${PKGNAME}/doc/fig/file_save.gif
 share/${PKGNAME}/doc/fig/filemenu.gif
 share/${PKGNAME}/doc/fig/fileopen.gif
+share/${PKGNAME}/doc/fig/forward.gif
 share/${PKGNAME}/doc/fig/g_add.gif
 share/${PKGNAME}/doc/fig/g_and.gif
 share/${PKGNAME}/doc/fig/g_arshift.gif
@@ -182,13 +269,15 @@ share/${PKGNAME}/doc/fig/g_switch.gif
 share/${PKGNAME}/doc/fig/g_tap.gif
 share/${PKGNAME}/doc/fig/g_tty.gif
 share/${PKGNAME}/doc/fig/g_xor.gif
-share/${PKGNAME}/doc/fig/gatelogo.xbm
+share/${PKGNAME}/doc/fig/gatelogo.gif
 share/${PKGNAME}/doc/fig/gateport.gif
 share/${PKGNAME}/doc/fig/gatewin.gif
 share/${PKGNAME}/doc/fig/gatewin_11.gif
+share/${PKGNAME}/doc/fig/gatwin.gif
 share/${PKGNAME}/doc/fig/genopts.gif
 share/${PKGNAME}/doc/fig/icextract.gif
 share/${PKGNAME}/doc/fig/inout.gif
+share/${PKGNAME}/doc/fig/inv_curs.gif
 share/${PKGNAME}/doc/fig/invaddel.gif
 share/${PKGNAME}/doc/fig/label.gif
 share/${PKGNAME}/doc/fig/logic.gif
@@ -200,8 +289,8 @@ share/${PKGNAME}/doc/fig/logicx.gif
 share/${PKGNAME}/doc/fig/logicz.gif
 share/${PKGNAME}/doc/fig/makeand.gif
 share/${PKGNAME}/doc/fig/manual.gif
-share/${PKGNAME}/doc/fig/misc.b
 share/${PKGNAME}/doc/fig/modcreate.gif
+share/${PKGNAME}/doc/fig/mov_curs.gif
 share/${PKGNAME}/doc/fig/movgat1.gif
 share/${PKGNAME}/doc/fig/movgat2.gif
 share/${PKGNAME}/doc/fig/movgrp1.gif
@@ -210,35 +299,40 @@ share/${PKGNAME}/doc/fig/movgrp3.gif
 share/${PKGNAME}/doc/fig/movgrp4.gif
 share/${PKGNAME}/doc/fig/nihongo.gif
 share/${PKGNAME}/doc/fig/options.gif
+share/${PKGNAME}/doc/fig/popcreate.gif
 share/${PKGNAME}/doc/fig/powerbsd.gif
 share/${PKGNAME}/doc/fig/printdlg.gif
 share/${PKGNAME}/doc/fig/printopts.gif
 share/${PKGNAME}/doc/fig/ptr.gif
-share/${PKGNAME}/doc/fig/rungate1.xbm
-share/${PKGNAME}/doc/fig/rungate2.xbm
+share/${PKGNAME}/doc/fig/rungate1.gif
+share/${PKGNAME}/doc/fig/rungate2.gif
 share/${PKGNAME}/doc/fig/scope.gif
 share/${PKGNAME}/doc/fig/search.gif
 share/${PKGNAME}/doc/fig/showval.gif
-share/${PKGNAME}/doc/fig/sim_break.b
-share/${PKGNAME}/doc/fig/sim_break2.b
-share/${PKGNAME}/doc/fig/sim_clock.b
-share/${PKGNAME}/doc/fig/sim_dump.b
-share/${PKGNAME}/doc/fig/sim_go.b
-share/${PKGNAME}/doc/fig/sim_load.b
-share/${PKGNAME}/doc/fig/sim_pause.b
-share/${PKGNAME}/doc/fig/sim_script.b
-share/${PKGNAME}/doc/fig/sim_step.b
-share/${PKGNAME}/doc/fig/sim_stop.b
+share/${PKGNAME}/doc/fig/sim_break.gif
+share/${PKGNAME}/doc/fig/sim_clock.gif
+share/${PKGNAME}/doc/fig/sim_dump.gif
+share/${PKGNAME}/doc/fig/sim_go.gif
+share/${PKGNAME}/doc/fig/sim_load.gif
+share/${PKGNAME}/doc/fig/sim_pause.gif
+share/${PKGNAME}/doc/fig/sim_script.gif
+share/${PKGNAME}/doc/fig/sim_step.gif
+share/${PKGNAME}/doc/fig/sim_stop.gif
 share/${PKGNAME}/doc/fig/simerr.gif
 share/${PKGNAME}/doc/fig/simopts.gif
 share/${PKGNAME}/doc/fig/simprint.gif
+share/${PKGNAME}/doc/fig/simstart.gif
+share/${PKGNAME}/doc/fig/size_curs.gif
 share/${PKGNAME}/doc/fig/small_tkgate.gif
-share/${PKGNAME}/doc/fig/smallcurs.b
+share/${PKGNAME}/doc/fig/smallgatwin.gif
+share/${PKGNAME}/doc/fig/smallgenopts.gif
 share/${PKGNAME}/doc/fig/solder.gif
 share/${PKGNAME}/doc/fig/text.gif
 share/${PKGNAME}/doc/fig/tkgate.gif
 share/${PKGNAME}/doc/fig/wsize.gif
 share/${PKGNAME}/doc/fig/xmark.gif
+share/${PKGNAME}/doc/fig/zoom_in.gif
+share/${PKGNAME}/doc/fig/zoom_out.gif
 share/${PKGNAME}/doc/gateEdit.html
 share/${PKGNAME}/doc/gateGmac.html
 share/${PKGNAME}/doc/gateIntro.html
@@ -246,52 +340,119 @@ share/${PKGNAME}/doc/gateSim.html
 share/${PKGNAME}/doc/index.html
 share/${PKGNAME}/doc/license.txt
 share/${PKGNAME}/doc/menagerie.gm
-share/${PKGNAME}/examples/ex1/combinational.v
-share/${PKGNAME}/examples/ex2/flipflop.v
-share/${PKGNAME}/examples/ex3/counter.v
-share/${PKGNAME}/examples/ex4/trff.v
-share/${PKGNAME}/examples/ex5/menagerie.gm
-share/${PKGNAME}/examples/ex5/menagerie.gss
-share/${PKGNAME}/examples/ex5/menagerie.map
-share/${PKGNAME}/examples/ex5/menagerie.mem
-share/${PKGNAME}/examples/ex5/menagerie.v
-share/${PKGNAME}/examples/ex5/x-menagerie.mem
-share/${PKGNAME}/examples/ja-tutorials/create_tut.v
-share/${PKGNAME}/examples/ja-tutorials/create_tut.v.orig
-share/${PKGNAME}/examples/ja-tutorials/edit1_tut.v
-share/${PKGNAME}/examples/ja-tutorials/edit1_tut.v.orig
-share/${PKGNAME}/examples/ja-tutorials/edit2_tut.v
-share/${PKGNAME}/examples/ja-tutorials/edit2_tut.v.orig
-share/${PKGNAME}/examples/ja-tutorials/edwire_tut.v
-share/${PKGNAME}/examples/ja-tutorials/module_tut.v
-share/${PKGNAME}/examples/ja-tutorials/seqsim_tut.v
-share/${PKGNAME}/examples/ja-tutorials/sim_tut.v
-share/${PKGNAME}/examples/ja-tutorials/welcome_tut.v
-share/${PKGNAME}/examples/ja-tutorials/welcome_tut.v.orig
-share/${PKGNAME}/examples/tutorials/create_tut.v
-share/${PKGNAME}/examples/tutorials/create_tut.v.orig
-share/${PKGNAME}/examples/tutorials/edit1_tut.v
-share/${PKGNAME}/examples/tutorials/edit2_tut.v
-share/${PKGNAME}/examples/tutorials/edwire_tut.v
-share/${PKGNAME}/examples/tutorials/module_tut.v
-share/${PKGNAME}/examples/tutorials/seqsim_tut.v
-share/${PKGNAME}/examples/tutorials/sim_tut.v
-share/${PKGNAME}/examples/tutorials/welcome_tut.v
+share/${PKGNAME}/doc/symbols.txt
 share/${PKGNAME}/gdf/default.gdf
 share/${PKGNAME}/libexec/gsim
-share/${PKGNAME}/messages.en
-share/${PKGNAME}/messages.es
-share/${PKGNAME}/messages.fr
-share/${PKGNAME}/messages.ja
-share/${PKGNAME}/messages.ja.euc
-share/${PKGNAME}/messages.ja.utf8
+share/${PKGNAME}/libexec/tkgate
+share/${PKGNAME}/locale/ca/messages
+share/${PKGNAME}/locale/cs/examples/ex1/combinational.v
+share/${PKGNAME}/locale/cs/examples/ex2/flipflop.v
+share/${PKGNAME}/locale/cs/examples/ex3/counter.v
+share/${PKGNAME}/locale/cs/examples/ex4/trff.v
+share/${PKGNAME}/locale/cs/examples/ex5/menagerie.gm
+share/${PKGNAME}/locale/cs/examples/ex5/menagerie.gss
+share/${PKGNAME}/locale/cs/examples/ex5/menagerie.map
+share/${PKGNAME}/locale/cs/examples/ex5/menagerie.mem
+share/${PKGNAME}/locale/cs/examples/ex5/menagerie.v
+share/${PKGNAME}/locale/cs/examples/ex5/x-menagerie.mem
+share/${PKGNAME}/locale/cs/messages
+share/${PKGNAME}/locale/cs/tutorials/create_tut.v
+share/${PKGNAME}/locale/cs/tutorials/edit1_tut.v
+share/${PKGNAME}/locale/cs/tutorials/edit2_tut.v
+share/${PKGNAME}/locale/cs/tutorials/edwire_tut.v
+share/${PKGNAME}/locale/cs/tutorials/module_tut.v
+share/${PKGNAME}/locale/cs/tutorials/seqsim_tut.v
+share/${PKGNAME}/locale/cs/tutorials/sim_tut.v
+share/${PKGNAME}/locale/cs/tutorials/welcome_tut.v
+share/${PKGNAME}/locale/cy/messages
+share/${PKGNAME}/locale/de/examples/ex1/combinational.v
+share/${PKGNAME}/locale/de/examples/ex2/flipflop.v
+share/${PKGNAME}/locale/de/examples/ex3/counter.v
+share/${PKGNAME}/locale/de/examples/ex4/trff.v
+share/${PKGNAME}/locale/de/examples/ex5/menagerie.gm
+share/${PKGNAME}/locale/de/examples/ex5/menagerie.gss
+share/${PKGNAME}/locale/de/examples/ex5/menagerie.map
+share/${PKGNAME}/locale/de/examples/ex5/menagerie.mem
+share/${PKGNAME}/locale/de/examples/ex5/menagerie.v
+share/${PKGNAME}/locale/de/examples/ex5/x-menagerie.mem
+share/${PKGNAME}/locale/de/messages
+share/${PKGNAME}/locale/de/tutorials/create_tut.v
+share/${PKGNAME}/locale/de/tutorials/edit1_tut.v
+share/${PKGNAME}/locale/de/tutorials/edit2_tut.v
+share/${PKGNAME}/locale/de/tutorials/edwire_tut.v
+share/${PKGNAME}/locale/de/tutorials/module_tut.v
+share/${PKGNAME}/locale/de/tutorials/seqsim_tut.v
+share/${PKGNAME}/locale/de/tutorials/sim_tut.v
+share/${PKGNAME}/locale/de/tutorials/welcome_tut.v
+share/${PKGNAME}/locale/en/examples/ex1/combinational.v
+share/${PKGNAME}/locale/en/examples/ex2/flipflop.v
+share/${PKGNAME}/locale/en/examples/ex3/counter.v
+share/${PKGNAME}/locale/en/examples/ex4/trff.v
+share/${PKGNAME}/locale/en/examples/ex5/menagerie.gm
+share/${PKGNAME}/locale/en/examples/ex5/menagerie.gss
+share/${PKGNAME}/locale/en/examples/ex5/menagerie.map
+share/${PKGNAME}/locale/en/examples/ex5/menagerie.mem
+share/${PKGNAME}/locale/en/examples/ex5/menagerie.v
+share/${PKGNAME}/locale/en/examples/ex5/x-menagerie.mem
+share/${PKGNAME}/locale/en/messages
+share/${PKGNAME}/locale/en/tutorials/create_tut.v
+share/${PKGNAME}/locale/en/tutorials/create_tut.v.orig
+share/${PKGNAME}/locale/en/tutorials/edit1_tut.v
+share/${PKGNAME}/locale/en/tutorials/edit2_tut.v
+share/${PKGNAME}/locale/en/tutorials/edwire_tut.v
+share/${PKGNAME}/locale/en/tutorials/module_tut.v
+share/${PKGNAME}/locale/en/tutorials/seqsim_tut.v
+share/${PKGNAME}/locale/en/tutorials/sim_tut.v
+share/${PKGNAME}/locale/en/tutorials/welcome_tut.v
+share/${PKGNAME}/locale/es/messages
+share/${PKGNAME}/locale/fr/messages
+share/${PKGNAME}/locale/it/examples/ex1/combinational.v
+share/${PKGNAME}/locale/it/examples/ex2/flipflop.v
+share/${PKGNAME}/locale/it/examples/ex3/counter.v
+share/${PKGNAME}/locale/it/examples/ex4/trff.v
+share/${PKGNAME}/locale/it/examples/ex5/menagerie.gm
+share/${PKGNAME}/locale/it/examples/ex5/menagerie.gss
+share/${PKGNAME}/locale/it/examples/ex5/menagerie.map
+share/${PKGNAME}/locale/it/examples/ex5/menagerie.mem
+share/${PKGNAME}/locale/it/examples/ex5/menagerie.v
+share/${PKGNAME}/locale/it/examples/ex5/x-menagerie.mem
+share/${PKGNAME}/locale/it/messages
+share/${PKGNAME}/locale/it/tutorials/create_tut.v
+share/${PKGNAME}/locale/it/tutorials/edit1_tut.v
+share/${PKGNAME}/locale/it/tutorials/edit2_tut.v
+share/${PKGNAME}/locale/it/tutorials/edwire_tut.v
+share/${PKGNAME}/locale/it/tutorials/module_tut.v
+share/${PKGNAME}/locale/it/tutorials/seqsim_tut.v
+share/${PKGNAME}/locale/it/tutorials/sim_tut.v
+share/${PKGNAME}/locale/it/tutorials/welcome_tut.v
+share/${PKGNAME}/locale/ja/messages
+share/${PKGNAME}/locale/ja/messages.euc
+share/${PKGNAME}/locale/ja/messages.utf8
+share/${PKGNAME}/locale/ja/tutorials/create_tut.v
+share/${PKGNAME}/locale/ja/tutorials/create_tut.v.orig
+share/${PKGNAME}/locale/ja/tutorials/edit1_tut.v
+share/${PKGNAME}/locale/ja/tutorials/edit1_tut.v.orig
+share/${PKGNAME}/locale/ja/tutorials/edit2_tut.v
+share/${PKGNAME}/locale/ja/tutorials/edit2_tut.v.orig
+share/${PKGNAME}/locale/ja/tutorials/edwire_tut.v
+share/${PKGNAME}/locale/ja/tutorials/module_tut.v
+share/${PKGNAME}/locale/ja/tutorials/seqsim_tut.v
+share/${PKGNAME}/locale/ja/tutorials/sim_tut.v
+share/${PKGNAME}/locale/ja/tutorials/welcome_tut.v
+share/${PKGNAME}/locale/ja/tutorials/welcome_tut.v.orig
+share/${PKGNAME}/locale/pl/messages
+share/${PKGNAME}/scripts/action.tcl
+share/${PKGNAME}/scripts/bitedit.tcl
 share/${PKGNAME}/scripts/blocklist.tcl
 share/${PKGNAME}/scripts/circuit.tcl
 share/${PKGNAME}/scripts/commands.tcl
 share/${PKGNAME}/scripts/cpath.tcl
 share/${PKGNAME}/scripts/dip.tcl
+share/${PKGNAME}/scripts/dragger.tcl
+share/${PKGNAME}/scripts/dropbox.tcl
 share/${PKGNAME}/scripts/editgate.tcl
 share/${PKGNAME}/scripts/editnets.tcl
+share/${PKGNAME}/scripts/elistbox.tcl
 share/${PKGNAME}/scripts/errbox.tcl
 share/${PKGNAME}/scripts/frame.tcl
 share/${PKGNAME}/scripts/gcanvas.tcl
@@ -300,7 +461,7 @@ share/${PKGNAME}/scripts/license.tcl
 share/${PKGNAME}/scripts/menu.tcl
 share/${PKGNAME}/scripts/message.tcl
 share/${PKGNAME}/scripts/misc.tcl
-share/${PKGNAME}/scripts/obsolete.tcl
+share/${PKGNAME}/scripts/nameframe.tcl
 share/${PKGNAME}/scripts/options.tcl
 share/${PKGNAME}/scripts/parms.tcl
 share/${PKGNAME}/scripts/portlist.tcl
@@ -312,4 +473,5 @@ share/${PKGNAME}/scripts/simulator.tcl
 share/${PKGNAME}/scripts/status.tcl
 share/${PKGNAME}/scripts/tkgate.tcl
 share/${PKGNAME}/scripts/toolbar.tcl
+share/${PKGNAME}/scripts/tree.tcl
 share/${PKGNAME}/sitename.txt
diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo
index e532d8de319..7fd257e36bb 100644
--- a/cad/tkgate/distinfo
+++ b/cad/tkgate/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2014/02/04 00:11:43 joerg Exp $
+$NetBSD: distinfo,v 1.9 2015/01/17 14:48:56 bsiegert Exp $
 
-SHA1 (tkgate-1.6i.tgz) = 6eece2eb4aaa2f45c2b1c68b9c5b79a76b3bb084
-RMD160 (tkgate-1.6i.tgz) = 651ac3194c7b2b8dc8fc8fb28d409672586d4f98
-Size (tkgate-1.6i.tgz) = 1459011 bytes
-SHA1 (patch-aa) = 035171eb490ea74fcd0fc0788585aa87703fe171
+SHA1 (tkgate-1.8.7.tgz) = cf670ee0088c7bbd1f757d8647ec9b3a5ab58257
+RMD160 (tkgate-1.8.7.tgz) = 87d7528f765adcd1b38fff4d019458fce1e855de
+Size (tkgate-1.8.7.tgz) = 1541823 bytes
+SHA1 (patch-Imakefile) = 6b10f8aa4e7fe40d5b804809e10ea4be8a256c72
+SHA1 (patch-aa) = 69e17b0b38b18837efd886988c3891b5538482ab
 SHA1 (patch-ab) = 1b80671b8ad504970f35d6413151439138269a1b
-SHA1 (patch-src_tkgate_edit.c) = d955226ff73d232310dc3f4f9b7e2381432b81de
-SHA1 (patch-src_tkgate_tclfuncs.c) = e7d9f0fef83c8c1b66eb6b510493908360997608
diff --git a/cad/tkgate/patches/patch-Imakefile b/cad/tkgate/patches/patch-Imakefile
new file mode 100644
index 00000000000..b30d826fdea
--- /dev/null
+++ b/cad/tkgate/patches/patch-Imakefile
@@ -0,0 +1,11 @@
+$NetBSD: patch-Imakefile,v 1.1 2015/01/17 14:48:56 bsiegert Exp $
+Add DESTDIR support
+--- Imakefile.orig	2004-06-09 19:16:06.000000000 +0200
++++ Imakefile	2014-12-13 18:35:32.000000000 +0100
+@@ -99,4 +99,4 @@
+	@echo "All files from ${HOMEDIR}"
+ 
+ install::
+-	cp -r locale ${HOMEDIR}
++	cp -r locale ${DESTDIR}${HOMEDIR}
+
diff --git a/cad/tkgate/patches/patch-aa b/cad/tkgate/patches/patch-aa
index 6e93bd6c50f..4bfdc760bca 100644
--- a/cad/tkgate/patches/patch-aa
+++ b/cad/tkgate/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2014/02/04 00:11:43 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2015/01/17 14:48:56 bsiegert Exp $
 
---- config.h.orig	2002-02-11 19:31:49.000000000 +0000
-+++ config.h
-@@ -41,7 +41,7 @@
+--- config.h.orig	2007-01-30 04:45:09.000000000 +0100
++++ config.h	2014-12-13 18:30:51.000000000 +0100
+@@ -39,7 +39,7 @@
  /*
    Tcl/Tk Version numbers to use.
  */
@@ -11,23 +11,23 @@ $NetBSD: patch-aa,v 1.4 2014/02/04 00:11:43 joerg Exp $
  
  /*
    Japanese Tcl/Tk Version numbers to use.
-@@ -54,13 +54,13 @@
+@@ -52,13 +52,13 @@
    double quotes and should be all one one line.  This list is used to
    find X11, tcl and tk.
  */
--#define TKGATE_INCDIRS		"/usr/X11R6/include /usr/X11/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include"
+-#define TKGATE_INCDIRS		"/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include"
 +#define TKGATE_INCDIRS		"@X11BASE@/include @LOCALBASE@/include"
  
  /*
    List of directories to search for tcl library.  The list must be in 
    double quotes and should be all one one line.
  */
--#define TKGATE_LIBDIRS		"/usr/X11R6/lib /usr/X11/lib /usr/local/lib /usr/lib"
+-#define TKGATE_LIBDIRS		"/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib"
 +#define TKGATE_LIBDIRS		"@X11BASE@/lib @LOCALBASE@/lib"
  
  /*
    Required libraries.  TkGate will not compile unless these libraries are found.
-@@ -80,19 +80,19 @@
+@@ -79,19 +79,19 @@
    version number to this path.  You can override the default by
    uncommenting the defintion of TKGATE_HOMEDIR below.
   */
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.4 2014/02/04 00:11:43 joerg Exp $
  
  /*
    Digital circuit editor and simulator.
-@@ -102,7 +102,7 @@
+@@ -101,7 +101,7 @@
  /*
    URL for local documentation
   */
diff --git a/cad/tkgate/patches/patch-src_tkgate_edit.c b/cad/tkgate/patches/patch-src_tkgate_edit.c
deleted file mode 100644
index 7e21a69c651..00000000000
--- a/cad/tkgate/patches/patch-src_tkgate_edit.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_tkgate_edit.c,v 1.1 2013/03/02 18:29:03 joerg Exp $
-
---- src/tkgate/edit.c.orig	2013-03-01 14:52:29.000000000 +0000
-+++ src/tkgate/edit.c
-@@ -747,7 +747,7 @@ char *PrintNet(char *p,GNet *net)
- 
-   if (!net) {
-     p += sprintf(p,"NetID:    *null*\n");
--    return;
-+    return NULL;
-   }
- 
-   name = net->signame ? net->signame : "*none*";
diff --git a/cad/tkgate/patches/patch-src_tkgate_tclfuncs.c b/cad/tkgate/patches/patch-src_tkgate_tclfuncs.c
deleted file mode 100644
index 7ea9e2a143f..00000000000
--- a/cad/tkgate/patches/patch-src_tkgate_tclfuncs.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_tkgate_tclfuncs.c,v 1.1 2013/03/02 18:29:03 joerg Exp $
-
---- src/tkgate/tclfuncs.c.orig	2013-03-01 14:52:58.000000000 +0000
-+++ src/tkgate/tclfuncs.c
-@@ -1525,7 +1525,7 @@ int gat_gotoCPathNet(ClientData _d,Tcl_I
-     p = argv[1];
- 
-   n = GModuleDef_findNet(XGate.es->env,p);
--  if (!n) return;
-+  if (!n) return TCL_ERROR;
- 
-   wn1 = n->driver->nodes;
-   wn2 = wn1->out ? wn1->out : wn1->in;