3 files changed, 16 insertions, 25 deletions
diff --git a/cad/xcircuit/patches/patch-aa b/cad/xcircuit/patches/patch-aa
index 5c70dd20259..2f27f0565a1 100644
--- a/cad/xcircuit/patches/patch-aa
+++ b/cad/xcircuit/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2003/08/04 07:17:37 jmc Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/19 13:24:11 adam Exp $
 
---- configure.in.orig	Fri Jun 27 20:12:07 2003
-+++ configure.in	Mon Aug  4 01:44:58 2003
-@@ -395,7 +395,7 @@
-   fi
+--- configure.in.orig	2004-10-01 04:24:09.000000000 +0000
++++ configure.in
+@@ -544,7 +544,7 @@ fi
  
+ if test "x$xc_with_tcl" != "x" ; then
    case $target in
 -    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
 +    *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*)
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;
-@@ -718,9 +718,9 @@
+@@ -890,9 +890,9 @@ if test "x$xc_with_tcl" != "x" ; then
        # 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
diff --git a/cad/xcircuit/patches/patch-ab b/cad/xcircuit/patches/patch-ab
index 629fe44e05d..9d0b6d01d69 100644
--- a/cad/xcircuit/patches/patch-ab
+++ b/cad/xcircuit/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.4 2003/08/04 07:17:37 jmc Exp $
+$NetBSD: patch-ab,v 1.5 2004/11/19 13:24:11 adam Exp $
 
---- configure.orig	Wed May 21 21:27:56 2003
-+++ configure	Mon Aug  4 01:45:35 2003
-@@ -7466,7 +7466,7 @@
-   fi
+--- configure.orig	2004-10-01 04:25:07.000000000 +0000
++++ configure
+@@ -7704,7 +7704,7 @@ fi
  
+ if test "x$xc_with_tcl" != "x" ; then
    case $target in
 -    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
 +    *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*)
        TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
        TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
        ;;
-@@ -7989,9 +7989,9 @@
+@@ -8244,9 +8244,9 @@ fi
  
  
        if test "$test_ok" = yes; then
diff --git a/cad/xcircuit/patches/patch-ac b/cad/xcircuit/patches/patch-ac
index 9590a6339f9..957b0686f97 100644
--- a/cad/xcircuit/patches/patch-ac
+++ b/cad/xcircuit/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/19 13:24:11 adam Exp $
 
---- Makefile.in.orig
+--- Makefile.in.orig	2004-10-01 04:25:06.000000000 +0000
 +++ Makefile.in
-@@ -48,7 +48,7 @@
+@@ -51,7 +51,7 @@ AUTOMAKE = @AUTOMAKE@
  AWK = @AWK@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CYGPATH_W = @CYGPATH_W@
-@@ -77,6 +77,7 @@
+@@ -82,6 +82,7 @@ LIBS = @LIBS@
  LIB_SPECS = @LIB_SPECS@
  LTLIBOBJS = @LTLIBOBJS@
  M4 = @M4@
@@ -19,12 +19,3 @@ $NetBSD: patch-ac,v 1.1 2003/07/10 08:03:58 jtb Exp $
  
  # Man page
  M4_DEFS = @M4_DEFS@ @DEFS@
-@@ -748,7 +749,7 @@
- 
- lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS}
- 	$(RM) lib/xcircuit${SHDLIB_EXT}
--	$(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o ${xcircuit_OBJECTS} \
-+	$(CC) ${CFLAGS} -o $@ ${LDDL_FLAGS} ${LDFLAGS} xcwrap.o ${xcircuit_OBJECTS} \
- 		${X_LIBS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS}
- 
- tcl:	lib/tcl/xcircuit${SHDLIB_EXT}