Upgrade to latest stable release 3.9.72, prodded by a buffer-overflow

induced core dump.

See <http://opencircuitdesign.com/xcircuit/changes.html> for upstream's changelog.

5 files changed, 363 insertions, 179 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 5c4aeb0e949..46b5f5a1257 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2014/12/17 06:35:13 obache Exp $
+# $NetBSD: Makefile,v 1.45 2018/02/07 11:58:31 hauke Exp $
 
-DISTNAME=	xcircuit-3.7.50
-PKGREVISION=	2
+DISTNAME=	xcircuit-3.9.72
+#PKGREVISION=	1
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/
 EXTRACT_SUFX=	.tgz
@@ -12,9 +12,11 @@ COMMENT=	Drawing program for X11 (especially for circuits)
 LICENSE=	gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_TOOLS+=	gmake gs:run
+USE_TOOLS+=	gmake pkg-config gs:run
 GNU_CONFIGURE=	yes
 
+EGDIR=		share/examples/xcircuit
+
 .include "../../lang/tcl/Makefile.version"
 .include "../../x11/tk/Makefile.version"
 
@@ -28,17 +30,18 @@ CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib
 
 BUILD_TARGET=	tcl
 INSTALL_TARGET= install-tcl
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/examples/xcircuit
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${EGDIR}
 
 post-extract:
 	${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc
 	${TOUCH} ${WRKSRC}/menudep.h
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/share/examples/xcircuit/
-	${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/share/examples/xcircuit/
+	${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../lang/tcl/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff --git a/cad/xcircuit/PLIST b/cad/xcircuit/PLIST
index 6f13c788060..94b61932757 100644
--- a/cad/xcircuit/PLIST
+++ b/cad/xcircuit/PLIST
@@ -1,122 +1,129 @@
-@comment $NetBSD: PLIST,v 1.7 2013/06/11 13:31:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/02/07 11:58:31 hauke Exp $
 bin/xcircuit
-lib/xcircuit-3.7/analog.lps
-lib/xcircuit-3.7/analoglib2.lps
-lib/xcircuit-3.7/analoglib3.lps
-lib/xcircuit-3.7/app-defaults/XCircuit
-lib/xcircuit-3.7/asg_spice.lps
-lib/xcircuit-3.7/avlsi.lps
-lib/xcircuit-3.7/boot_xcircuit.tcl
-lib/xcircuit-3.7/bparams.tcl
-lib/xcircuit-3.7/console.tcl
-lib/xcircuit-3.7/digital.lps
-lib/xcircuit-3.7/digitallib.lps
-lib/xcircuit-3.7/digitaltcl.lps
-lib/xcircuit-3.7/edif.tcl
-lib/xcircuit-3.7/files.tcl
-lib/xcircuit-3.7/fonts/courier.lps
-lib/xcircuit-3.7/fonts/courier.xfe
-lib/xcircuit-3.7/fonts/courieriso.xfe
-lib/xcircuit-3.7/fonts/courieriso2.lps
-lib/xcircuit-3.7/fonts/courieriso2.xfe
-lib/xcircuit-3.7/fonts/courieriso5.lps
-lib/xcircuit-3.7/fonts/courieriso5.xfe
-lib/xcircuit-3.7/fonts/helvetica.lps
-lib/xcircuit-3.7/fonts/helvetica.xfe
-lib/xcircuit-3.7/fonts/helveticaiso.xfe
-lib/xcircuit-3.7/fonts/helveticaiso2.lps
-lib/xcircuit-3.7/fonts/helveticaiso2.xfe
-lib/xcircuit-3.7/fonts/helveticaiso5.lps
-lib/xcircuit-3.7/fonts/helveticaiso5.xfe
-lib/xcircuit-3.7/fonts/myfont.lps
-lib/xcircuit-3.7/fonts/myfont.xfe
-lib/xcircuit-3.7/fonts/symbol.lps
-lib/xcircuit-3.7/fonts/symbol.xfe
-lib/xcircuit-3.7/fonts/times_roman.lps
-lib/xcircuit-3.7/fonts/times_roman.xfe
-lib/xcircuit-3.7/fonts/times_romaniso.xfe
-lib/xcircuit-3.7/fonts/times_romaniso2.lps
-lib/xcircuit-3.7/fonts/times_romaniso2.xfe
-lib/xcircuit-3.7/fonts/times_romaniso5.lps
-lib/xcircuit-3.7/fonts/times_romaniso5.xfe
-lib/xcircuit-3.7/generic.lps
-lib/xcircuit-3.7/ic_templates.lps
-lib/xcircuit-3.7/lgf.lps
-lib/xcircuit-3.7/library.tcl
-lib/xcircuit-3.7/man/xcircuit.1
-lib/xcircuit-3.7/matgen.tcl
-lib/xcircuit-3.7/mousehint.tcl
-lib/xcircuit-3.7/musiclib.lps
-lib/xcircuit-3.7/ngspice.tcl
-lib/xcircuit-3.7/panzoom.tcl
-lib/xcircuit-3.7/pcb.lps
-lib/xcircuit-3.7/pcb_layout.lps
-lib/xcircuit-3.7/pcbout.tcl
-lib/xcircuit-3.7/pixmaps/a.gif
-lib/xcircuit-3.7/pixmaps/b.gif
-lib/xcircuit-3.7/pixmaps/bd.gif
-lib/xcircuit-3.7/pixmaps/ccw.gif
-lib/xcircuit-3.7/pixmaps/co.gif
-lib/xcircuit-3.7/pixmaps/cp.gif
-lib/xcircuit-3.7/pixmaps/cw.gif
-lib/xcircuit-3.7/pixmaps/d2.gif
-lib/xcircuit-3.7/pixmaps/e.gif
-lib/xcircuit-3.7/pixmaps/fi.gif
-lib/xcircuit-3.7/pixmaps/fx.gif
-lib/xcircuit-3.7/pixmaps/fy.gif
-lib/xcircuit-3.7/pixmaps/i.gif
-lib/xcircuit-3.7/pixmaps/li.gif
-lib/xcircuit-3.7/pixmaps/mk.gif
-lib/xcircuit-3.7/pixmaps/mv.gif
-lib/xcircuit-3.7/pixmaps/pa.gif
-lib/xcircuit-3.7/pixmaps/pl.gif
-lib/xcircuit-3.7/pixmaps/pm.gif
-lib/xcircuit-3.7/pixmaps/pn.gif
-lib/xcircuit-3.7/pixmaps/po2.gif
-lib/xcircuit-3.7/pixmaps/pu2.gif
-lib/xcircuit-3.7/pixmaps/pz.gif
-lib/xcircuit-3.7/pixmaps/q.gif
-lib/xcircuit-3.7/pixmaps/r.gif
-lib/xcircuit-3.7/pixmaps/s.gif
-lib/xcircuit-3.7/pixmaps/solid.xbm
-lib/xcircuit-3.7/pixmaps/stip12.xbm
-lib/xcircuit-3.7/pixmaps/stip25.xbm
-lib/xcircuit-3.7/pixmaps/stip38.xbm
-lib/xcircuit-3.7/pixmaps/stip50.xbm
-lib/xcircuit-3.7/pixmaps/stip62.xbm
-lib/xcircuit-3.7/pixmaps/stip75.xbm
-lib/xcircuit-3.7/pixmaps/stip88.xbm
-lib/xcircuit-3.7/pixmaps/t.gif
-lib/xcircuit-3.7/pixmaps/tg.gif
-lib/xcircuit-3.7/pixmaps/ti.gif
-lib/xcircuit-3.7/pixmaps/tp.gif
-lib/xcircuit-3.7/pixmaps/uj.gif
-lib/xcircuit-3.7/pixmaps/w.gif
-lib/xcircuit-3.7/pixmaps/xcircuit.gif
-lib/xcircuit-3.7/pixmaps/xcircuit.ico
-lib/xcircuit-3.7/pixmaps/yp.gif
-lib/xcircuit-3.7/pixmaps/z4.gif
-lib/xcircuit-3.7/pixmaps/z5.gif
-lib/xcircuit-3.7/pkgIndex.tcl
-lib/xcircuit-3.7/quadparts.lps
-lib/xcircuit-3.7/resource.tcl
-lib/xcircuit-3.7/selection.tcl
-lib/xcircuit-3.7/series74xx.lps
-lib/xcircuit-3.7/signal.lps
-lib/xcircuit-3.7/sinusoid.tcl
-lib/xcircuit-3.7/standard_cells.cir
-lib/xcircuit-3.7/standard_cells_3V.cir
-lib/xcircuit-3.7/sue_xc.tcl
-lib/xcircuit-3.7/symbol.tcl
-lib/xcircuit-3.7/text.tcl
-lib/xcircuit-3.7/tkcon.tcl
-lib/xcircuit-3.7/wrapper.tcl
-lib/xcircuit-3.7/xchelp.tcl
-lib/xcircuit-3.7/xcircexec
-lib/xcircuit-3.7/xcircps2.pro
-lib/xcircuit-3.7/xcircuit.so
-lib/xcircuit-3.7/xcircuit.tcl
-lib/xcircuit-3.7/xcstartup.tcl
+lib/xcircuit-3.9/analog.lps
+lib/xcircuit-3.9/analoglib2.lps
+lib/xcircuit-3.9/analoglib3.lps
+lib/xcircuit-3.9/app-defaults/XCircuit
+lib/xcircuit-3.9/asg_spice.lps
+lib/xcircuit-3.9/avlsi.lps
+lib/xcircuit-3.9/boot_xcircuit.tcl
+lib/xcircuit-3.9/bparams.tcl
+lib/xcircuit-3.9/console.tcl
+lib/xcircuit-3.9/cyrillic.enc
+lib/xcircuit-3.9/digital.lps
+lib/xcircuit-3.9/digitallib.lps
+lib/xcircuit-3.9/digitaltcl.lps
+lib/xcircuit-3.9/edif.tcl
+lib/xcircuit-3.9/files.tcl
+lib/xcircuit-3.9/fonts/courier.lps
+lib/xcircuit-3.9/fonts/courier.xfe
+lib/xcircuit-3.9/fonts/courier_cyrillic.xfe
+lib/xcircuit-3.9/fonts/courieriso.xfe
+lib/xcircuit-3.9/fonts/courieriso2.lps
+lib/xcircuit-3.9/fonts/courieriso2.xfe
+lib/xcircuit-3.9/fonts/courieriso5.lps
+lib/xcircuit-3.9/fonts/courieriso5.xfe
+lib/xcircuit-3.9/fonts/helvetica.lps
+lib/xcircuit-3.9/fonts/helvetica.xfe
+lib/xcircuit-3.9/fonts/helvetica_cyrillic.xfe
+lib/xcircuit-3.9/fonts/helveticaiso.xfe
+lib/xcircuit-3.9/fonts/helveticaiso2.lps
+lib/xcircuit-3.9/fonts/helveticaiso2.xfe
+lib/xcircuit-3.9/fonts/helveticaiso5.lps
+lib/xcircuit-3.9/fonts/helveticaiso5.xfe
+lib/xcircuit-3.9/fonts/myfont.lps
+lib/xcircuit-3.9/fonts/myfont.xfe
+lib/xcircuit-3.9/fonts/symbol.lps
+lib/xcircuit-3.9/fonts/symbol.xfe
+lib/xcircuit-3.9/fonts/times_roman.lps
+lib/xcircuit-3.9/fonts/times_roman.xfe
+lib/xcircuit-3.9/fonts/times_roman_cyrillic.xfe
+lib/xcircuit-3.9/fonts/times_romaniso.xfe
+lib/xcircuit-3.9/fonts/times_romaniso2.lps
+lib/xcircuit-3.9/fonts/times_romaniso2.xfe
+lib/xcircuit-3.9/fonts/times_romaniso5.lps
+lib/xcircuit-3.9/fonts/times_romaniso5.xfe
+lib/xcircuit-3.9/generic.lps
+lib/xcircuit-3.9/ic_templates.lps
+lib/xcircuit-3.9/isolatin2.enc
+lib/xcircuit-3.9/isolatin5.enc
+lib/xcircuit-3.9/lgf.lps
+lib/xcircuit-3.9/library.tcl
+lib/xcircuit-3.9/man/xcircuit.1
+lib/xcircuit-3.9/matgen.tcl
+lib/xcircuit-3.9/mousehint.tcl
+lib/xcircuit-3.9/musiclib.lps
+lib/xcircuit-3.9/ngspice.tcl
+lib/xcircuit-3.9/panzoom.tcl
+lib/xcircuit-3.9/pcb.lps
+lib/xcircuit-3.9/pcb_layout.lps
+lib/xcircuit-3.9/pcbout.tcl
+lib/xcircuit-3.9/pixmaps/a.gif
+lib/xcircuit-3.9/pixmaps/b.gif
+lib/xcircuit-3.9/pixmaps/bd.gif
+lib/xcircuit-3.9/pixmaps/ccw.gif
+lib/xcircuit-3.9/pixmaps/co.gif
+lib/xcircuit-3.9/pixmaps/cp.gif
+lib/xcircuit-3.9/pixmaps/cw.gif
+lib/xcircuit-3.9/pixmaps/d2.gif
+lib/xcircuit-3.9/pixmaps/e.gif
+lib/xcircuit-3.9/pixmaps/fi.gif
+lib/xcircuit-3.9/pixmaps/fx.gif
+lib/xcircuit-3.9/pixmaps/fy.gif
+lib/xcircuit-3.9/pixmaps/i.gif
+lib/xcircuit-3.9/pixmaps/li.gif
+lib/xcircuit-3.9/pixmaps/mk.gif
+lib/xcircuit-3.9/pixmaps/mv.gif
+lib/xcircuit-3.9/pixmaps/pa.gif
+lib/xcircuit-3.9/pixmaps/pl.gif
+lib/xcircuit-3.9/pixmaps/pm.gif
+lib/xcircuit-3.9/pixmaps/pn.gif
+lib/xcircuit-3.9/pixmaps/po2.gif
+lib/xcircuit-3.9/pixmaps/pu2.gif
+lib/xcircuit-3.9/pixmaps/pz.gif
+lib/xcircuit-3.9/pixmaps/q.gif
+lib/xcircuit-3.9/pixmaps/r.gif
+lib/xcircuit-3.9/pixmaps/s.gif
+lib/xcircuit-3.9/pixmaps/solid.xbm
+lib/xcircuit-3.9/pixmaps/stip12.xbm
+lib/xcircuit-3.9/pixmaps/stip25.xbm
+lib/xcircuit-3.9/pixmaps/stip38.xbm
+lib/xcircuit-3.9/pixmaps/stip50.xbm
+lib/xcircuit-3.9/pixmaps/stip62.xbm
+lib/xcircuit-3.9/pixmaps/stip75.xbm
+lib/xcircuit-3.9/pixmaps/stip88.xbm
+lib/xcircuit-3.9/pixmaps/t.gif
+lib/xcircuit-3.9/pixmaps/tg.gif
+lib/xcircuit-3.9/pixmaps/ti.gif
+lib/xcircuit-3.9/pixmaps/tp.gif
+lib/xcircuit-3.9/pixmaps/uj.gif
+lib/xcircuit-3.9/pixmaps/w.gif
+lib/xcircuit-3.9/pixmaps/xcircuit.gif
+lib/xcircuit-3.9/pixmaps/xcircuit.ico
+lib/xcircuit-3.9/pixmaps/yp.gif
+lib/xcircuit-3.9/pixmaps/z4.gif
+lib/xcircuit-3.9/pixmaps/z5.gif
+lib/xcircuit-3.9/pkgIndex.tcl
+lib/xcircuit-3.9/quadparts.lps
+lib/xcircuit-3.9/resource.tcl
+lib/xcircuit-3.9/selection.tcl
+lib/xcircuit-3.9/series74xx.lps
+lib/xcircuit-3.9/signal.lps
+lib/xcircuit-3.9/sinusoid.tcl
+lib/xcircuit-3.9/standard_cells.cir
+lib/xcircuit-3.9/standard_cells_3V.cir
+lib/xcircuit-3.9/sue_xc.tcl
+lib/xcircuit-3.9/symbol.tcl
+lib/xcircuit-3.9/text.tcl
+lib/xcircuit-3.9/tkcon.tcl
+lib/xcircuit-3.9/wrapper.tcl
+lib/xcircuit-3.9/xchelp.tcl
+lib/xcircuit-3.9/xcircexec
+lib/xcircuit-3.9/xcircps2.pro
+lib/xcircuit-3.9/xcircuit.so
+lib/xcircuit-3.9/xcircuit.tcl
+lib/xcircuit-3.9/xcstartup.tcl
+lib/xcircuit-3.9/xspice.lps
 share/examples/xcircuit/FlareLED.ps
 share/examples/xcircuit/USAflag.ps
 share/examples/xcircuit/analog1.ps
@@ -140,3 +147,4 @@ share/examples/xcircuit/vcoblock.ps
 share/examples/xcircuit/xc_remote.sh
 share/examples/xcircuit/xcclock.ps
 share/examples/xcircuit/xcircuitrc
+@pkgdir man/man1
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index a3420dbc64a..a90317a0369 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 00:21:20 agc Exp $
+$NetBSD: distinfo,v 1.19 2018/02/07 11:58:31 hauke Exp $
 
-SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5
-RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e
-SHA512 (xcircuit-3.7.50.tgz) = 2407b8d5f71d4fd28aabcbddeba7f2e31451c0516f2aec1c0b956dc8dbb27331fbc266ae0875020bbb73c76c49f4a47dc3ed98f3d5d7949854527f5390598c0a
-Size (xcircuit-3.7.50.tgz) = 1649046 bytes
-SHA1 (patch-aa) = 27b15c9105873f5ebe4b2ae7c04ed041a480d0f4
-SHA1 (patch-ab) = cc339aaa2ceda954c43efc8e76c96cbe253ee032
+SHA1 (xcircuit-3.9.72.tgz) = d08137afb8f990e1b06aa842f1e80c0e00d8c0d7
+RMD160 (xcircuit-3.9.72.tgz) = abb7eb3ffb1bfcd2c515537d43f4ba240c6f1508
+SHA512 (xcircuit-3.9.72.tgz) = daaca69bdd29f5ffb345498ca15dc5a46c478a4e9cea50724c2f5e667588466c9f7fc3a8a6d6b7a24091ded643b1a26488c76eac19e88bb2764b621b39db1d17
+Size (xcircuit-3.9.72.tgz) = 1620798 bytes
+SHA1 (patch-aa) = 40e5caea7f6e6294eebff214f47aa9dc01498133
+SHA1 (patch-ab) = 8c4d87dbd67b302f530b4f09201c82fcbec22dd5
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index c84fa59519f..7f131096937 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,20 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $
+$NetBSD: patch-aa,v 1.12 2018/02/07 11:58:31 hauke Exp $
 
-* portability fix
-* match to pkgsrc shlib name
+Hunt down, stomp out and eradicate bashisms.
 
---- configure.in.orig	2012-08-15 11:45:19.000000000 +0000
+--- configure.in.orig	2016-07-21 15:18:45.000000000 +0000
 +++ configure.in
-@@ -164,7 +164,7 @@ AC_ARG_WITH(opengl,
- dnl Graphics double-buffering? Enabled by default unless OpenGL used.
- AC_ARG_ENABLE(double-buffer,
- [  --disable-double-buffer disable graphics double-buffering], , [
--  if test "x$xc_with_GL" == "x" ; then
-+  if test "x$xc_with_GL" = "x" ; then
-     AC_DEFINE(DOUBLEBUFFER)
-   else
-     AC_MSG_WARN(Double-buffering option not applicable to OpenGL version.)
-@@ -303,7 +303,7 @@ xc_with_tk_libraries=""
+@@ -286,7 +286,7 @@ AC_ARG_WITH([cairo],
+     [Use cairo graphics library @<:@default=yes@:>@])],
+   [
+     xc_with_cairo=$withval
+-    if test "$withval" == "no" -o "$withval" == "NO"; then
++    if test "$withval" = "no" -o "$withval" = "NO"; then
+         xc_with_cairo=""
+     fi
+   ], ) 
+@@ -314,7 +314,7 @@ dnl ------------------------------------
  AC_ARG_WITH(tcl,
  [  --with-tcl=DIR          Find tclConfig.sh in DIR], [
    xc_with_tcl=$withval
@@ -23,7 +22,7 @@ $NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $
        xc_with_tcl=""
    fi
  ], ) 
-@@ -585,12 +585,12 @@ if test "x$xc_with_tcl" != "x" ; then
+@@ -558,12 +558,12 @@ if test "x$xc_with_tcl" != "x" ; then
    if test "x${xc_with_tcl_includes}" != "x" ; then
      if test -r "${xc_with_tcl_includes}/tcl.h" ; then
        TCL_INC_DIR=${xc_with_tcl_includes}
@@ -38,14 +37,100 @@ $NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
-@@ -649,8 +649,8 @@ if test "x$xc_with_tcl" != "x" ; then
-       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-     *)
--      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
--      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
-+      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-+      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-   esac
+@@ -595,12 +595,12 @@ if test "x$xc_with_tcl" != "x" ; then
+   if test "x${xc_with_tk_includes}" != "x" ; then
+     if test -r "${xc_with_tk_includes}/tk.h" ; then
+       TK_INC_DIR=${xc_with_tk_includes}
+-    elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
++    elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
+       echo "Can't find tk.h in \"${xc_with_tk_includes}\""
+       echo "Reverting to non-Tcl compilation"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
++  elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
+     for dir in \
+      ${TK_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
+      ${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} \
+@@ -640,12 +640,12 @@ if test "x$xc_with_tcl" != "x" ; then
+         break
+       fi
+     done
+-    if test "x${TCL_LIB_DIR}" == "x" ; then
++    if test "x${TCL_LIB_DIR}" = "x" ; then
+       echo "Can't find tcl library in \"${xc_with_tcl_libraries}\""
+       echo "Reverting to non-Tcl compile"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TCL_LIB_SPEC}" == "x" ; then
++  elif test "x${TCL_LIB_SPEC}" = "x" ; then
+     for libpfix in "lib64" "lib"
+     do
+       libname="${TCL_EXEC_PREFIX}/${libpfix}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
+@@ -680,12 +680,12 @@ if test "x$xc_with_tcl" != "x" ; then
+         break
+       fi
+     done
+-    if test "x${TK_LIB_DIR}" == "x" ; then
++    if test "x${TK_LIB_DIR}" = "x" ; then
+       echo "Can't find tk library in \"${xc_with_tk_libraries}\""
+       echo "Reverting to non-Tcl compile"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TK_LIB_SPEC}" == "x" ; then
++  elif test "x${TK_LIB_SPEC}" = "x" ; then
+     for libpfix in "lib64" "lib"
+     do
+       libname="${TK_EXEC_PREFIX}/${libpfix}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
+@@ -709,7 +709,7 @@ fi
+ #--------------------------------------------------------------------
+ 
+ if test "x$xc_with_tcl" != "x" ; then
+-  if test "x${TCL_LIB_SPEC}" == "x" ; then
++  if test "x${TCL_LIB_SPEC}" = "x" ; then
+     case $target in
+       *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+         TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+@@ -721,7 +721,7 @@ if test "x$xc_with_tcl" != "x" ; then
+     TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_LIB_NAME}"
+   fi
+ 
+-  if test "x${TK_LIB_SPEC}" == "x" ; then
++  if test "x${TK_LIB_SPEC}" = "x" ; then
+     case $target in
+       *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+         TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+@@ -814,13 +814,13 @@ if test "x$xc_with_tcl" != "x" ; then
+ 
+   # Initialize shared library build variables
+ 
+-  if test "x${TCL_SHLIB_SUFFIX}" == "x" ; then
++  if test "x${TCL_SHLIB_SUFFIX}" = "x" ; then
+     SHDLIB_EXT=".so"
+   else
+     SHDLIB_EXT="${TCL_SHLIB_SUFFIX}"
+   fi
+ 
+-  if test "x${TCL_SHLIB_LD}" == "x" ; then
++  if test "x${TCL_SHLIB_LD}" = "x" ; then
+ 
+     # Construct shared library build arguments the painful way
+     # This is not expected to be necessary, so the number of
+@@ -1141,7 +1141,7 @@ echo "Configuration results:"
+ echo "----------------------------------------------------"
+ echo ""
+ 
+-if test "x$xc_with_tcl" == "x" ; then
++if test "x$xc_with_tcl" = "x" ; then
+    if test "x$PYTHON" != x; then
+       echo "Using Python interface (not recommended)"
+    else
+@@ -1154,7 +1154,7 @@ else
+ fi
+ echo ""
  
+-if test "x$xc_with_cairo" == "x" ; then
++if test "x$xc_with_cairo" = "x" ; then
+    echo "No Cairo graphics."
+    echo "If that is not what you wanted, then make sure"
+    echo "you have libcairo and fontconfig installed."
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index 4d544e6d442..961f8985377 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,17 +1,19 @@
-$NetBSD: patch-ab,v 1.13 2014/12/15 09:00:32 obache Exp $
+$NetBSD: patch-ab,v 1.14 2018/02/07 11:58:31 hauke Exp $
 
---- configure.orig	2012-08-15 11:45:19.000000000 +0000
+Hunt down, stomp out and eradicate bashisms.
+
+--- configure.orig	2016-07-21 15:18:45.000000000 +0000
 +++ configure
-@@ -6006,7 +6006,7 @@ if test "${enable_double_buffer+set}" = 
-   enableval=$enable_double_buffer;
- else
- 
--  if test "x$xc_with_GL" == "x" ; then
-+  if test "x$xc_with_GL" = "x" ; then
-     $as_echo "#define DOUBLEBUFFER 1" >>confdefs.h
+@@ -6371,7 +6371,7 @@ xc_with_cairo="yes"
+ if test "${with_cairo+set}" = set; then :
+   withval=$with_cairo;
+     xc_with_cairo=$withval
+-    if test "$withval" == "no" -o "$withval" == "NO"; then
++    if test "$withval" = "no" -o "$withval" = "NO"; then
+         xc_with_cairo=""
+     fi
  
-   else
-@@ -6223,7 +6223,7 @@ xc_with_tk_libraries=""
+@@ -6715,7 +6715,7 @@ fi
  if test "${with_tcl+set}" = set; then :
    withval=$with_tcl;
    xc_with_tcl=$withval
@@ -20,7 +22,7 @@ $NetBSD: patch-ab,v 1.13 2014/12/15 09:00:32 obache Exp $
        xc_with_tcl=""
    fi
  
-@@ -6625,12 +6625,12 @@ if test "x$xc_with_tcl" != "x" ; then
+@@ -6982,12 +6982,12 @@ if test "x$xc_with_tcl" != "x" ; then
    if test "x${xc_with_tcl_includes}" != "x" ; then
      if test -r "${xc_with_tcl_includes}/tcl.h" ; then
        TCL_INC_DIR=${xc_with_tcl_includes}
@@ -35,14 +37,100 @@ $NetBSD: patch-ab,v 1.13 2014/12/15 09:00:32 obache Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
-@@ -6689,8 +6689,8 @@ if test "x$xc_with_tcl" != "x" ; then
-       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-     *)
--      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
--      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
-+      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-+      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-   esac
+@@ -7019,12 +7019,12 @@ if test "x$xc_with_tcl" != "x" ; then
+   if test "x${xc_with_tk_includes}" != "x" ; then
+     if test -r "${xc_with_tk_includes}/tk.h" ; then
+       TK_INC_DIR=${xc_with_tk_includes}
+-    elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
++    elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
+       echo "Can't find tk.h in \"${xc_with_tk_includes}\""
+       echo "Reverting to non-Tcl compilation"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
++  elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
+     for dir in \
+      ${TK_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
+      ${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} \
+@@ -7064,12 +7064,12 @@ if test "x$xc_with_tcl" != "x" ; then
+         break
+       fi
+     done
+-    if test "x${TCL_LIB_DIR}" == "x" ; then
++    if test "x${TCL_LIB_DIR}" = "x" ; then
+       echo "Can't find tcl library in \"${xc_with_tcl_libraries}\""
+       echo "Reverting to non-Tcl compile"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TCL_LIB_SPEC}" == "x" ; then
++  elif test "x${TCL_LIB_SPEC}" = "x" ; then
+     for libpfix in "lib64" "lib"
+     do
+       libname="${TCL_EXEC_PREFIX}/${libpfix}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
+@@ -7104,12 +7104,12 @@ if test "x$xc_with_tcl" != "x" ; then
+         break
+       fi
+     done
+-    if test "x${TK_LIB_DIR}" == "x" ; then
++    if test "x${TK_LIB_DIR}" = "x" ; then
+       echo "Can't find tk library in \"${xc_with_tk_libraries}\""
+       echo "Reverting to non-Tcl compile"
+       xc_with_tcl=""
+     fi
+-  elif test "x${TK_LIB_SPEC}" == "x" ; then
++  elif test "x${TK_LIB_SPEC}" = "x" ; then
+     for libpfix in "lib64" "lib"
+     do
+       libname="${TK_EXEC_PREFIX}/${libpfix}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
+@@ -7133,7 +7133,7 @@ fi
+ #--------------------------------------------------------------------
+ 
+ if test "x$xc_with_tcl" != "x" ; then
+-  if test "x${TCL_LIB_SPEC}" == "x" ; then
++  if test "x${TCL_LIB_SPEC}" = "x" ; then
+     case $target in
+       *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+         TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+@@ -7145,7 +7145,7 @@ if test "x$xc_with_tcl" != "x" ; then
+     TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_LIB_NAME}"
+   fi
+ 
+-  if test "x${TK_LIB_SPEC}" == "x" ; then
++  if test "x${TK_LIB_SPEC}" = "x" ; then
+     case $target in
+       *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
+         TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
+@@ -7239,13 +7239,13 @@ if test "x$xc_with_tcl" != "x" ; then
+ 
+   # Initialize shared library build variables
+ 
+-  if test "x${TCL_SHLIB_SUFFIX}" == "x" ; then
++  if test "x${TCL_SHLIB_SUFFIX}" = "x" ; then
+     SHDLIB_EXT=".so"
+   else
+     SHDLIB_EXT="${TCL_SHLIB_SUFFIX}"
+   fi
+ 
+-  if test "x${TCL_SHLIB_LD}" == "x" ; then
++  if test "x${TCL_SHLIB_LD}" = "x" ; then
+ 
+     # Construct shared library build arguments the painful way
+     # This is not expected to be necessary, so the number of
+@@ -9046,7 +9048,7 @@ echo "Configuration results:"
+ echo "----------------------------------------------------"
+ echo ""
+ 
+-if test "x$xc_with_tcl" == "x" ; then
++if test "x$xc_with_tcl" = "x" ; then
+    if test "x$PYTHON" != x; then
+       echo "Using Python interface (not recommended)"
+    else
+@@ -9059,7 +9061,7 @@ else
+ fi
+ echo ""
  
+-if test "x$xc_with_cairo" == "x" ; then
++if test "x$xc_with_cairo" = "x" ; then
+    echo "No Cairo graphics."
+    echo "If that is not what you wanted, then make sure"
+    echo "you have libcairo and fontconfig installed."