Update to 3.7.50

* Use gmake.

Changelog:
* Bugfixes.
* Some new features.

5 files changed, 160 insertions, 219 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index d05db3508f7..c5273fd7d9e 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2013/06/06 12:54:08 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/06/11 13:31:58 ryoon Exp $
 
-DISTNAME=	xcircuit-3.4.26
-PKGREVISION=	5
+DISTNAME=	xcircuit-3.7.50
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://opencircuitdesign.com/xcircuit/archive/
 EXTRACT_SUFX=	.tgz
@@ -11,7 +10,7 @@ HOMEPAGE=	http://opencircuitdesign.com/xcircuit/
 COMMENT=	Drawing program for X11 (especially for circuits)
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_TOOLS+=	gs:run
+USE_TOOLS+=	gmake gs:run
 GNU_CONFIGURE=	yes
 
 .include "../../lang/tcl/Makefile.version"
diff --git a/cad/xcircuit/PLIST b/cad/xcircuit/PLIST
index 02761f7ac35..6f13c788060 100644
--- a/cad/xcircuit/PLIST
+++ b/cad/xcircuit/PLIST
@@ -1,141 +1,122 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:35:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/06/11 13:31:58 ryoon Exp $
 bin/xcircuit
-lib/xcircuit-3.4/analog.lps
-lib/xcircuit-3.4/analoglib2.lps
-lib/xcircuit-3.4/app-defaults/XCircuit
-lib/xcircuit-3.4/asg_spice.lps
-lib/xcircuit-3.4/avlsi.lps
-lib/xcircuit-3.4/bparams.tcl
-lib/xcircuit-3.4/console.tcl
-lib/xcircuit-3.4/digital.lps
-lib/xcircuit-3.4/fonts/courier.lps
-lib/xcircuit-3.4/fonts/courier.xfe
-lib/xcircuit-3.4/fonts/courieriso.xfe
-lib/xcircuit-3.4/fonts/courieriso2.lps
-lib/xcircuit-3.4/fonts/courieriso2.xfe
-lib/xcircuit-3.4/fonts/courieriso5.lps
-lib/xcircuit-3.4/fonts/courieriso5.xfe
-lib/xcircuit-3.4/fonts/helvetica.lps
-lib/xcircuit-3.4/fonts/helvetica.xfe
-lib/xcircuit-3.4/fonts/helveticaiso.xfe
-lib/xcircuit-3.4/fonts/helveticaiso2.lps
-lib/xcircuit-3.4/fonts/helveticaiso2.xfe
-lib/xcircuit-3.4/fonts/helveticaiso5.lps
-lib/xcircuit-3.4/fonts/helveticaiso5.xfe
-lib/xcircuit-3.4/fonts/myfont.lps
-lib/xcircuit-3.4/fonts/myfont.xfe
-lib/xcircuit-3.4/fonts/symbol.lps
-lib/xcircuit-3.4/fonts/symbol.xfe
-lib/xcircuit-3.4/fonts/times_roman.lps
-lib/xcircuit-3.4/fonts/times_roman.xfe
-lib/xcircuit-3.4/fonts/times_romaniso.xfe
-lib/xcircuit-3.4/fonts/times_romaniso2.lps
-lib/xcircuit-3.4/fonts/times_romaniso2.xfe
-lib/xcircuit-3.4/fonts/times_romaniso5.lps
-lib/xcircuit-3.4/fonts/times_romaniso5.xfe
-lib/xcircuit-3.4/generic.lps
-lib/xcircuit-3.4/ic_templates.lps
-lib/xcircuit-3.4/lgf.lps
-lib/xcircuit-3.4/library.tcl
-lib/xcircuit-3.4/musiclib.lps
-lib/xcircuit-3.4/ngspice.tcl
-lib/xcircuit-3.4/panzoom.tcl
-lib/xcircuit-3.4/pcb.lps
-lib/xcircuit-3.4/pcb_layout.lps
-lib/xcircuit-3.4/pcbout.tcl
-lib/xcircuit-3.4/pixmaps/a.gif
-lib/xcircuit-3.4/pixmaps/a.xpm
-lib/xcircuit-3.4/pixmaps/b.gif
-lib/xcircuit-3.4/pixmaps/b.xpm
-lib/xcircuit-3.4/pixmaps/bd.gif
-lib/xcircuit-3.4/pixmaps/bd.xpm
-lib/xcircuit-3.4/pixmaps/ccw.gif
-lib/xcircuit-3.4/pixmaps/ccw.xpm
-lib/xcircuit-3.4/pixmaps/co.gif
-lib/xcircuit-3.4/pixmaps/co.xpm
-lib/xcircuit-3.4/pixmaps/cp.gif
-lib/xcircuit-3.4/pixmaps/cp.xpm
-lib/xcircuit-3.4/pixmaps/cw.gif
-lib/xcircuit-3.4/pixmaps/cw.xpm
-lib/xcircuit-3.4/pixmaps/d2.gif
-lib/xcircuit-3.4/pixmaps/d2.xpm
-lib/xcircuit-3.4/pixmaps/e.gif
-lib/xcircuit-3.4/pixmaps/e.xpm
-lib/xcircuit-3.4/pixmaps/fi.gif
-lib/xcircuit-3.4/pixmaps/fi.xpm
-lib/xcircuit-3.4/pixmaps/fx.gif
-lib/xcircuit-3.4/pixmaps/fx.xpm
-lib/xcircuit-3.4/pixmaps/fy.gif
-lib/xcircuit-3.4/pixmaps/fy.xpm
-lib/xcircuit-3.4/pixmaps/i.gif
-lib/xcircuit-3.4/pixmaps/i.xpm
-lib/xcircuit-3.4/pixmaps/li.gif
-lib/xcircuit-3.4/pixmaps/li.xpm
-lib/xcircuit-3.4/pixmaps/mk.gif
-lib/xcircuit-3.4/pixmaps/mk.xpm
-lib/xcircuit-3.4/pixmaps/mv.gif
-lib/xcircuit-3.4/pixmaps/mv.xpm
-lib/xcircuit-3.4/pixmaps/pa.gif
-lib/xcircuit-3.4/pixmaps/pa.xpm
-lib/xcircuit-3.4/pixmaps/pl.gif
-lib/xcircuit-3.4/pixmaps/pl.xpm
-lib/xcircuit-3.4/pixmaps/pm.gif
-lib/xcircuit-3.4/pixmaps/pm.xpm
-lib/xcircuit-3.4/pixmaps/pn.gif
-lib/xcircuit-3.4/pixmaps/pn.xpm
-lib/xcircuit-3.4/pixmaps/po2.gif
-lib/xcircuit-3.4/pixmaps/po2.xpm
-lib/xcircuit-3.4/pixmaps/pu2.gif
-lib/xcircuit-3.4/pixmaps/pu2.xpm
-lib/xcircuit-3.4/pixmaps/pz.gif
-lib/xcircuit-3.4/pixmaps/pz.xpm
-lib/xcircuit-3.4/pixmaps/q.gif
-lib/xcircuit-3.4/pixmaps/q.xpm
-lib/xcircuit-3.4/pixmaps/s.gif
-lib/xcircuit-3.4/pixmaps/s.xpm
-lib/xcircuit-3.4/pixmaps/solid.xbm
-lib/xcircuit-3.4/pixmaps/stip12.xbm
-lib/xcircuit-3.4/pixmaps/stip25.xbm
-lib/xcircuit-3.4/pixmaps/stip38.xbm
-lib/xcircuit-3.4/pixmaps/stip50.xbm
-lib/xcircuit-3.4/pixmaps/stip62.xbm
-lib/xcircuit-3.4/pixmaps/stip75.xbm
-lib/xcircuit-3.4/pixmaps/stip88.xbm
-lib/xcircuit-3.4/pixmaps/t.gif
-lib/xcircuit-3.4/pixmaps/t.xpm
-lib/xcircuit-3.4/pixmaps/tg.gif
-lib/xcircuit-3.4/pixmaps/tg.xpm
-lib/xcircuit-3.4/pixmaps/ti.gif
-lib/xcircuit-3.4/pixmaps/ti.xpm
-lib/xcircuit-3.4/pixmaps/tp.gif
-lib/xcircuit-3.4/pixmaps/tp.xpm
-lib/xcircuit-3.4/pixmaps/uj.gif
-lib/xcircuit-3.4/pixmaps/uj.xpm
-lib/xcircuit-3.4/pixmaps/w.gif
-lib/xcircuit-3.4/pixmaps/w.xpm
-lib/xcircuit-3.4/pixmaps/xcircuit.gif
-lib/xcircuit-3.4/pixmaps/xcircuit.ico
-lib/xcircuit-3.4/pixmaps/xcircuit.xpm
-lib/xcircuit-3.4/pixmaps/yp.gif
-lib/xcircuit-3.4/pixmaps/yp.xpm
-lib/xcircuit-3.4/pixmaps/z4.gif
-lib/xcircuit-3.4/pixmaps/z4.xpm
-lib/xcircuit-3.4/pixmaps/z5.gif
-lib/xcircuit-3.4/pixmaps/z5.xpm
-lib/xcircuit-3.4/quadparts.lps
-lib/xcircuit-3.4/resource.tcl
-lib/xcircuit-3.4/series74xx.lps
-lib/xcircuit-3.4/signal.lps
-lib/xcircuit-3.4/startup.script
-lib/xcircuit-3.4/sue_xc.tcl
-lib/xcircuit-3.4/tkcon.tcl
-lib/xcircuit-3.4/wrapper.tcl
-lib/xcircuit-3.4/xcircexec
-lib/xcircuit-3.4/xcircps2.pro
-lib/xcircuit-3.4/xcircuit.so
-lib/xcircuit-3.4/xcircuit.tcl
-lib/xcircuit-3.4/xcstartup.tcl
-man/man1/xcircuit.1
+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
 share/examples/xcircuit/FlareLED.ps
 share/examples/xcircuit/USAflag.ps
 share/examples/xcircuit/analog1.ps
@@ -150,9 +131,12 @@ share/examples/xcircuit/envelope.ps
 share/examples/xcircuit/fourttest.ps
 share/examples/xcircuit/logic.sim
 share/examples/xcircuit/logic8.ps
+share/examples/xcircuit/panzoom.py
 share/examples/xcircuit/prelude.ps
 share/examples/xcircuit/systemd1.lgf
+share/examples/xcircuit/test.py
 share/examples/xcircuit/threestage.ps
 share/examples/xcircuit/vcoblock.ps
+share/examples/xcircuit/xc_remote.sh
 share/examples/xcircuit/xcclock.ps
 share/examples/xcircuit/xcircuitrc
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 2f4e5c0c809..88459ee084f 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.14 2013/03/02 18:21:39 joerg Exp $
+$NetBSD: distinfo,v 1.15 2013/06/11 13:31:58 ryoon Exp $
 
-SHA1 (xcircuit-3.4.26.tgz) = cf3eda5c788376a09cca6a35ee120a3f12a08c33
-RMD160 (xcircuit-3.4.26.tgz) = fd9beb37f16670505ee9aadc394d6e722947d645
-Size (xcircuit-3.4.26.tgz) = 1054942 bytes
-SHA1 (patch-aa) = 8ac2a3398cbd74ca0248737c753816dee4367f97
-SHA1 (patch-ab) = 32c3f7d2d798a5c6772eaff60c894e183eb5bca6
-SHA1 (patch-ac) = 5921bc94c2288f6d1811fe5a72f136a0ef0f25e6
-SHA1 (patch-libraries.c) = 821927852dd11834a024cb1f972874b26fe9788c
-SHA1 (patch-undo.c) = 125cabb16656a6af09f8eb37be0eff6cfc3f29ca
+SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5
+RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e
+Size (xcircuit-3.7.50.tgz) = 1649046 bytes
+SHA1 (patch-aa) = 914d486e9f7c8ed421fbc747d3a49b4cc210d845
+SHA1 (patch-ab) = fe940fa499e8a4a7b717a7c8dfe6aca21500bd5e
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index 5f5ea83a9f2..bba09bd50d8 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2006/11/12 14:25:50 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.10 2013/06/11 13:31:58 ryoon Exp $
 
---- configure.in.orig	2006-04-10 21:51:35.000000000 +0000
+--- configure.in.orig	2012-08-15 11:45:19.000000000 +0000
 +++ configure.in
-@@ -165,7 +165,7 @@ AC_ARG_WITH(opengl,
+@@ -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], , [
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.9 2006/11/12 14:25:50 dmcmahill Exp $
      AC_DEFINE(DOUBLEBUFFER)
    else
      AC_MSG_WARN(Double-buffering option not applicable to OpenGL version.)
-@@ -298,7 +298,7 @@ xc_with_tk_libraries=""
+@@ -303,7 +303,7 @@ xc_with_tk_libraries=""
  AC_ARG_WITH(tcl,
  [  --with-tcl=DIR          Find tclConfig.sh in DIR], [
    xc_with_tcl=$withval
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.9 2006/11/12 14:25:50 dmcmahill Exp $
        xc_with_tcl=""
    fi
  ], ) 
-@@ -574,12 +574,12 @@ if test "x$xc_with_tcl" != "x" ; then
+@@ -585,12 +585,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,28 +35,3 @@ $NetBSD: patch-aa,v 1.9 2006/11/12 14:25:50 dmcmahill Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
-@@ -633,7 +633,7 @@ fi
- 
- if test "x$xc_with_tcl" != "x" ; then
-   case $target in
--    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
-+    *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-dragonfly*)
-       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-@@ -1013,12 +1013,12 @@ if test "x$xc_with_tcl" != "x" ; then
-       EXTRA_LIB_SPECS="-ldl"
-       ;;
- 
--    *-netbsd*|*-freebsd*|*-openbsd*)
-+    *-netbsd*|*-freebsd*|*-openbsd*|*-*-dragonfly*)
-       # Not available on all versions:  check for include file.
-       AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
-       if test "$test_ok" = yes; then
--        SHLIB_CFLAGS="-fpic"
--        SHLIB_LD="ld"
-+        SHLIB_CFLAGS="-fPIC"
-+        SHLIB_LD=$CC
-         LDDL_FLAGS="-shared"
-       fi
-       ;;
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index a0499c9f655..aeba5c6201d 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,26 +1,41 @@
-$NetBSD: patch-ab,v 1.10 2008/01/05 20:59:00 rillig Exp $
+$NetBSD: patch-ab,v 1.11 2013/06/11 13:31:58 ryoon Exp $
 
---- configure.orig	2006-06-09 17:54:33.000000000 +0000
+--- configure.orig	2012-08-15 11:45:19.000000000 +0000
 +++ configure
-@@ -7765,7 +7765,7 @@ if test "${enable_double_buffer+set}" = 
- 
+@@ -3794,12 +3794,12 @@ static char *f (char * (*g) (char **, in
+    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+    array size at least.  It's necessary to write '\x00'==0 to get something
+    that's true only with -std.  */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++int osf4_cc_array ['\x00' = 0 ? 1 : -1];
+ 
+ /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+    inside strings and character constants.  */
+ #define FOO(x) 'x'
+-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++int xlc6_cc_array[FOO(a) = 'x' ? 1 : -1];
+ 
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+@@ -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
-     cat >>confdefs.h <<\_ACEOF
- #define DOUBLEBUFFER 1
- _ACEOF
-@@ -8144,7 +8144,7 @@ if test "${with_tcl+set}" = set; then
-   withval="$with_tcl"
+     $as_echo "#define DOUBLEBUFFER 1" >>confdefs.h
  
+   else
+@@ -6223,7 +6223,7 @@ xc_with_tk_libraries=""
+ if test "${with_tcl+set}" = set; then :
+   withval=$with_tcl;
    xc_with_tcl=$withval
 -  if test "$withval" == "no" -o "$withval" == "NO"; then
 +  if test "$withval" = "no" -o "$withval" = "NO"; then
        xc_with_tcl=""
    fi
  
-@@ -8735,12 +8735,12 @@ if test "x$xc_with_tcl" != "x" ; then
+@@ -6625,12 +6625,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,32 +50,3 @@ $NetBSD: patch-ab,v 1.10 2008/01/05 20:59:00 rillig Exp $
      for dir in \
       ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
       ${TCL_PREFIX}/include \
-@@ -8794,7 +8794,7 @@ fi
- 
- if test "x$xc_with_tcl" != "x" ; then
-   case $target in
--    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
-+    *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-dragonfly*)
-       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
-       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
-       ;;
-@@ -9246,7 +9246,7 @@ fi
-       EXTRA_LIB_SPECS="-ldl"
-       ;;
- 
--    *-netbsd*|*-freebsd*|*-openbsd*)
-+    *-netbsd*|*-freebsd*|*-openbsd*|*-*-dragonfly*)
-       # Not available on all versions:  check for include file.
-       if test "${ac_cv_header_dlfcn_h+set}" = set; then
-   echo "$as_me:$LINENO: checking for dlfcn.h" >&5
-@@ -9393,8 +9393,8 @@ fi
- 
- 
-       if test "$test_ok" = yes; then
--        SHLIB_CFLAGS="-fpic"
--        SHLIB_LD="ld"
-+        SHLIB_CFLAGS="-fPIC"
-+        SHLIB_LD=$CC
-         LDDL_FLAGS="-shared"
-       fi
-       ;;