diff options
| author | dmcmahill <dmcmahill> | 2005-02-12 00:46:58 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2005-02-12 00:46:58 +0000 |
| commit | 3f86b2238db228c16a52b037f62cb2123e0bf692 (patch) | |
| tree | eb0067e3167f2b8452d08c96499ad76c31a24c5b | |
| parent | eda1deb80854f250c1f246799a4391722a17f2bc (diff) | |
| download | pkgsrc-3f86b2238db228c16a52b037f62cb2123e0bf692.tar.gz | |
update to gnetman-20041222
The release incorporates many of the pkgsrc patches needed for the
previous release. Other bug fixes, but no release notes.
29 files changed, 49 insertions, 2237 deletions
diff --git a/cad/gnetman/Makefile b/cad/gnetman/Makefile index 7fa33228380..c385f54daa7 100644 --- a/cad/gnetman/Makefile +++ b/cad/gnetman/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:12 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/02/12 00:46:58 dmcmahill Exp $ # -DISTNAME= gnetman-07May04 -PKGNAME= gnetman-20040507 -PKGREVISION= 1 +DISTNAME= gnetman-22Dec04 +PKGNAME= gnetman-20041222 CATEGORIES= cad MASTER_SITES= http://www.viasic.com/opensource/ @@ -15,5 +14,10 @@ USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +post-extract: + ${RM} ${WRKSRC}/src/include/tcl.h + ${RM} ${WRKSRC}/src/include/tk.h + .include "../../lang/tcl/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gnetman/distinfo b/cad/gnetman/distinfo index b3c35387ff3..76679af2218 100644 --- a/cad/gnetman/distinfo +++ b/cad/gnetman/distinfo @@ -1,31 +1,8 @@ -$NetBSD: distinfo,v 1.2 2004/07/18 02:46:41 dmcmahill Exp $ +$NetBSD: distinfo,v 1.3 2005/02/12 00:46:58 dmcmahill Exp $ -SHA1 (gnetman-07May04.tar.gz) = c11628e0294e4441da7926832d67e4fc10807991 -Size (gnetman-07May04.tar.gz) = 914828 bytes -SHA1 (patch-aa) = 6d9548ccba3f525f9833a01350e3bcc02602b414 -SHA1 (patch-ab) = 7ba43867cb3cd688ad1e94ab60b3430b764afed4 -SHA1 (patch-ac) = a25fa1ff4c18acec57b65b9f0e0483dc0990481f -SHA1 (patch-ad) = 4c024d2cd4d2b983eabe55e5facd8ac7cc26b863 -SHA1 (patch-ae) = 292f1616fb46752a290394d125112a000073b716 -SHA1 (patch-af) = 29386398660e7faa8e15a1ab92965ed99093d5ff -SHA1 (patch-ag) = bf928baa1485c30c86b6c86adb1f6a1b1f7733c0 -SHA1 (patch-ah) = 0f04d4056e1880deea051a2c383d7c2129ef7fc2 -SHA1 (patch-ai) = d8750fce08003bc26deec03f063f0ffd5f1b7b06 -SHA1 (patch-aj) = 54fcfbcffc19949135a36165a43786d0b85aa191 -SHA1 (patch-ak) = db9783c61a91a23c194cf10742343b2aa7abf4e1 -SHA1 (patch-al) = 75c877b36d1c72a23c31ddc85c749e74de30b5bd -SHA1 (patch-am) = 3259688e9c9d6476bc504e08adee1b989cdac7ea -SHA1 (patch-an) = 953b97a4cfa0abc26d550aa71479df875e7085fd -SHA1 (patch-ao) = 520f02290157412dde8a5a365210998a5e3d7996 -SHA1 (patch-ap) = d27ad7b1e1549d55c6d04d4b2da2f3d46bdeff33 -SHA1 (patch-aq) = ba4045a991d79cf7ceba8ef1dcad502721420809 -SHA1 (patch-ar) = 168c847ae66e2786949be5abdc6a76fcdd2ae48b -SHA1 (patch-as) = b04df7a7e53e25b22ce93e3e7fafd030643a0182 -SHA1 (patch-at) = 9ee123df85fd217ee8d9826351d1bcb3f58f369f -SHA1 (patch-au) = 1f82dad3704008872fbfbcd3c1988141d76ad3ba -SHA1 (patch-av) = 7e6887f4da0d2da3584dcc74dbe54624c4566e08 -SHA1 (patch-aw) = 20d4fe5fe5ac6ed7d4b635f30d10f7eb609eeec6 -SHA1 (patch-ax) = fda84874ad9dc01f7b74848ea39e2d6581c96526 -SHA1 (patch-ay) = bf421f636462ac24ddda8008707ba992cd60a6a1 -SHA1 (patch-az) = 2cb311b765f5f9cd0fc7fec28d606a4732d8104e -SHA1 (patch-ba) = 24d8e1c6b9a4dc1ea3901d7574e97e8e36dc747d +SHA1 (gnetman-22Dec04.tar.gz) = bd3187ff1381feccee804c5f1df0a10c081989d6 +Size (gnetman-22Dec04.tar.gz) = 725945 bytes +SHA1 (patch-aa) = 256335cd9600d5d95c37f7ec7421980191966b10 +SHA1 (patch-ab) = ccdecc7f59291f1925aa100679406ae72de2a7f1 +SHA1 (patch-ac) = a5ea82aaf95e5847b1c84c34f88aa19b2093a224 +SHA1 (patch-ad) = e57c00c364b213e2989cb4f7e1462ea0de5f595f diff --git a/cad/gnetman/patches/patch-aa b/cad/gnetman/patches/patch-aa index a218eda36d1..d4faa37658e 100644 --- a/cad/gnetman/patches/patch-aa +++ b/cad/gnetman/patches/patch-aa @@ -1,10 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.2 2005/02/12 00:46:58 dmcmahill Exp $ ---- Makefile.am.orig Fri May 7 12:46:47 2004 -+++ Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS=-DDDR_DEBUG +--- src/hash/Makefile.am.orig Thu Jul 22 18:46:36 2004 ++++ src/hash/Makefile.am +@@ -2,5 +2,5 @@ + ## - SUBDIRS=src doc sym sch test +-AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG ++AM_CFLAGS= -DDDR_DEBUG + INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-ab b/cad/gnetman/patches/patch-ab index 55dc482321c..b92fd356384 100644 --- a/cad/gnetman/patches/patch-ab +++ b/cad/gnetman/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2005/02/12 00:46:58 dmcmahill Exp $ ---- Makefile.in.orig Fri May 7 12:47:03 2004 -+++ Makefile.in -@@ -79,7 +79,7 @@ YACC = @YACC@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ +--- src/hash/Makefile.in.orig Fri Jul 30 14:39:06 2004 ++++ src/hash/Makefile.in +@@ -141,7 +141,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG +AM_CFLAGS = -DDDR_DEBUG - - SUBDIRS = src doc sym sch test - + INCLUDES = -I$(srcdir)/../include + noinst_LIBRARIES = libhtbl.a + libhtbl_a_SOURCES = \ diff --git a/cad/gnetman/patches/patch-ac b/cad/gnetman/patches/patch-ac index d138e7bbd63..b679d5add85 100644 --- a/cad/gnetman/patches/patch-ac +++ b/cad/gnetman/patches/patch-ac @@ -1,10 +1,11 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2005/02/12 00:46:58 dmcmahill Exp $ ---- src/batch/Makefile.am.orig Sun Jan 4 18:18:52 2004 -+++ src/batch/Makefile.am -@@ -1,4 +1,4 @@ +--- src/verilog/Makefile.am.orig Fri Jul 30 14:12:45 2004 ++++ src/verilog/Makefile.am +@@ -2,5 +2,5 @@ + ## + -AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG +AM_CFLAGS= -DDDR_DEBUG - INCLUDES=-I$(srcdir)/../include - noinst_LIBRARIES=libbatch.a + INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-ad b/cad/gnetman/patches/patch-ad index a734d391f6e..1fbf40fc55d 100644 --- a/cad/gnetman/patches/patch-ad +++ b/cad/gnetman/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.2 2005/02/12 00:46:58 dmcmahill Exp $ ---- src/batch/Makefile.in.orig Tue Apr 27 12:46:11 2004 -+++ src/batch/Makefile.in -@@ -79,7 +79,7 @@ YACC = @YACC@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ +--- src/verilog/Makefile.in.orig Fri Jul 30 14:39:43 2004 ++++ src/verilog/Makefile.in +@@ -147,7 +147,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG +AM_CFLAGS = -DDDR_DEBUG - INCLUDES = -I$(srcdir)/../include - noinst_LIBRARIES = libbatch.a + noinst_LIBRARIES = libverilog.a + libverilog_a_SOURCES = \ diff --git a/cad/gnetman/patches/patch-ae b/cad/gnetman/patches/patch-ae deleted file mode 100644 index d09c53ab129..00000000000 --- a/cad/gnetman/patches/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/cir/Makefile.am.orig Mon Jan 5 13:46:10 2004 -+++ src/cir/Makefile.am -@@ -2,5 +2,5 @@ - ## - --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS=-DDDR_DEBUG - - INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-af b/cad/gnetman/patches/patch-af deleted file mode 100644 index 0266a65d9f0..00000000000 --- a/cad/gnetman/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/cir/Makefile.in.orig Tue Apr 27 12:46:12 2004 -+++ src/cir/Makefile.in -@@ -80,7 +80,7 @@ am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS = -DDDR_DEBUG - - INCLUDES = -I$(srcdir)/../include - noinst_LIBRARIES = libcir.a diff --git a/cad/gnetman/patches/patch-ag b/cad/gnetman/patches/patch-ag deleted file mode 100644 index 992ee5a6a8d..00000000000 --- a/cad/gnetman/patches/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/database/Makefile.am.orig Mon Jan 5 13:46:10 2004 -+++ src/database/Makefile.am -@@ -2,5 +2,5 @@ - ## - --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS=-DDDR_DEBUG - - INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-ah b/cad/gnetman/patches/patch-ah deleted file mode 100644 index 831a16a6ce6..00000000000 --- a/cad/gnetman/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/database/Makefile.in.orig Tue Apr 27 12:46:12 2004 -+++ src/database/Makefile.in -@@ -80,7 +80,7 @@ am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS = -DDDR_DEBUG - - INCLUDES = -I$(srcdir)/../include - noinst_LIBRARIES = libdatabase.a diff --git a/cad/gnetman/patches/patch-ai b/cad/gnetman/patches/patch-ai deleted file mode 100644 index 228ba0ac992..00000000000 --- a/cad/gnetman/patches/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/sch/Makefile.am.orig Mon Jan 5 13:46:10 2004 -+++ src/sch/Makefile.am -@@ -2,5 +2,5 @@ - ## - --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS= -DDDR_DEBUG - - INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-aj b/cad/gnetman/patches/patch-aj deleted file mode 100644 index fbe461186ab..00000000000 --- a/cad/gnetman/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/sch/Makefile.in.orig Tue Apr 27 12:46:12 2004 -+++ src/sch/Makefile.in -@@ -80,7 +80,7 @@ am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS = -DDDR_DEBUG - - INCLUDES = -I$(srcdir)/../include - noinst_LIBRARIES = libsch.a diff --git a/cad/gnetman/patches/patch-ak b/cad/gnetman/patches/patch-ak deleted file mode 100644 index f9a271dbe86..00000000000 --- a/cad/gnetman/patches/patch-ak +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2004/07/18 02:46:42 dmcmahill Exp $ - ---- src/tcl/Makefile.am.orig Wed Jan 21 15:34:14 2004 -+++ src/tcl/Makefile.am -@@ -2,5 +2,5 @@ - ## - --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS= -DDDR_DEBUG - - noinst_LIBRARIES=libtcl.a -@@ -12,4 +12,4 @@ tclwrap.c \ - tc.h - --INCLUDES=-I$(srcdir)/../include -+INCLUDES=@TCL_CFLAGS@ -I$(srcdir)/../include - diff --git a/cad/gnetman/patches/patch-al b/cad/gnetman/patches/patch-al deleted file mode 100644 index d5c01746226..00000000000 --- a/cad/gnetman/patches/patch-al +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-al,v 1.2 2004/07/18 02:46:42 dmcmahill Exp $ - ---- src/tcl/Makefile.in.orig Tue Apr 27 12:46:12 2004 -+++ src/tcl/Makefile.in -@@ -80,7 +80,7 @@ am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS = -DDDR_DEBUG - - noinst_LIBRARIES = libtcl.a - -@@ -91,7 +91,7 @@ tclwrap.c \ - tc.h - - --INCLUDES = -I$(srcdir)/../include -+INCLUDES = @TCL_CFLAGS@ -I$(srcdir)/../include - subdir = src/tcl - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h diff --git a/cad/gnetman/patches/patch-am b/cad/gnetman/patches/patch-am deleted file mode 100644 index 6cd695eeef1..00000000000 --- a/cad/gnetman/patches/patch-am +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/util/Makefile.am.orig Mon Jan 5 13:46:10 2004 -+++ src/util/Makefile.am -@@ -2,5 +2,5 @@ - ## - --AM_CFLAGS=-Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS=-DDDR_DEBUG - - INCLUDES= -I$(srcdir)/../include diff --git a/cad/gnetman/patches/patch-an b/cad/gnetman/patches/patch-an deleted file mode 100644 index c1a7d023c0b..00000000000 --- a/cad/gnetman/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2004/07/17 23:49:25 dmcmahill Exp $ - ---- src/util/Makefile.in.orig Tue Apr 27 12:46:12 2004 -+++ src/util/Makefile.in -@@ -80,7 +80,7 @@ am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ - --AM_CFLAGS = -Wall -W -Wno-unused-parameter -Wno-unused-function -DDDR_DEBUG -+AM_CFLAGS = -DDDR_DEBUG - - INCLUDES = -I$(srcdir)/../include - noinst_LIBRARIES = libutil.a diff --git a/cad/gnetman/patches/patch-ao b/cad/gnetman/patches/patch-ao deleted file mode 100644 index be00774cab8..00000000000 --- a/cad/gnetman/patches/patch-ao +++ /dev/null @@ -1,283 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - -s/_X/ddrX/g -s/_Y/ddrY/g - -to avoid clashes with, for example, the _X defined in -<ctype.h> - ---- src/sch/schddr.h.orig Mon Dec 29 16:45:59 2003 -+++ src/sch/schddr.h -@@ -133,10 +133,10 @@ extern void schCompDestroy(schComp Comp) - #define schCompSetAngle(Comp, __Angle) ((Comp)->_Angle = (__Angle)) - #define schCompIsSelectable(Comp) ((Comp)->_Selectable) - #define schCompSetSelectable(Comp, __Selectable) ((Comp)->_Selectable = (__Selectable)) --#define schCompGetY(Comp) ((Comp)->_Y) --#define schCompSetY(Comp, __Y) ((Comp)->_Y = (__Y)) --#define schCompGetX(Comp) ((Comp)->_X) --#define schCompSetX(Comp, __X) ((Comp)->_X = (__X)) -+#define schCompGetY(Comp) ((Comp)->ddrY) -+#define schCompSetY(Comp, _ddrY) ((Comp)->ddrY = (_ddrY)) -+#define schCompGetX(Comp) ((Comp)->ddrX) -+#define schCompSetX(Comp, _ddrX) ((Comp)->ddrX = (_ddrX)) - #define schCompGetfirstPin(Comp) ((Comp)->firstPin) - #define schCompSetfirstPin(Comp, _Pin) ((Comp)->firstPin = (_Pin)) - extern void schCompInsertPin(schComp Comp, schPin _Pin); -@@ -187,16 +187,16 @@ extern void schMpinDestroy(schMpin Mpin) - #define schMpinSetLeft(Mpin, __Left) ((Mpin)->_Left = (__Left)) - #define schMpinIsBus(Mpin) ((Mpin)->_Bus) - #define schMpinSetBus(Mpin, __Bus) ((Mpin)->_Bus = (__Bus)) --#define schMpinGetY2(Mpin) ((Mpin)->_Y2) --#define schMpinSetY2(Mpin, __Y2) ((Mpin)->_Y2 = (__Y2)) --#define schMpinGetX2(Mpin) ((Mpin)->_X2) --#define schMpinSetX2(Mpin, __X2) ((Mpin)->_X2 = (__X2)) -+#define schMpinGetY2(Mpin) ((Mpin)->ddrY2) -+#define schMpinSetY2(Mpin, _ddrY2) ((Mpin)->ddrY2 = (_ddrY2)) -+#define schMpinGetX2(Mpin) ((Mpin)->ddrX2) -+#define schMpinSetX2(Mpin, _ddrX2) ((Mpin)->ddrX2 = (_ddrX2)) - #define schMpinGetSequence(Mpin) ((Mpin)->_Sequence) - #define schMpinSetSequence(Mpin, __Sequence) ((Mpin)->_Sequence = (__Sequence)) --#define schMpinGetY(Mpin) ((Mpin)->_Y) --#define schMpinSetY(Mpin, __Y) ((Mpin)->_Y = (__Y)) --#define schMpinGetX(Mpin) ((Mpin)->_X) --#define schMpinSetX(Mpin, __X) ((Mpin)->_X = (__X)) -+#define schMpinGetY(Mpin) ((Mpin)->ddrY) -+#define schMpinSetY(Mpin, _ddrY) ((Mpin)->ddrY = (_ddrY)) -+#define schMpinGetX(Mpin) ((Mpin)->ddrX) -+#define schMpinSetX(Mpin, _ddrX) ((Mpin)->ddrX = (_ddrX)) - #define schMpinGetType(Mpin) ((Mpin)->_Type) - #define schMpinSetType(Mpin, __Type) ((Mpin)->_Type = (__Type)) - #define schMpinGetFlagComp(Mpin) ((Mpin)->_FlagComp) -@@ -404,10 +404,10 @@ extern void schSymbolAppendComp(schSymbo - extern void schPinDestroy(schPin Pin); - #define schPinGetPort(Pin) ((Pin)->_Port) - #define schPinSetPort(Pin, __Port) ((Pin)->_Port = (__Port)) --#define schPinGetY(Pin) ((Pin)->_Y) --#define schPinSetY(Pin, __Y) ((Pin)->_Y = (__Y)) --#define schPinGetX(Pin) ((Pin)->_X) --#define schPinSetX(Pin, __X) ((Pin)->_X = (__X)) -+#define schPinGetY(Pin) ((Pin)->ddrY) -+#define schPinSetY(Pin, _ddrY) ((Pin)->ddrY = (_ddrY)) -+#define schPinGetX(Pin) ((Pin)->ddrX) -+#define schPinSetX(Pin, _ddrX) ((Pin)->ddrX = (_ddrX)) - #define schPinGetComp(Pin) ((Pin)->_Comp) - #define schPinSetComp(Pin, __Comp) ((Pin)->_Comp = (__Comp)) - #define schPinGetnextCompPin(Pin) ((Pin)->nextCompPin) -@@ -428,14 +428,14 @@ extern void schPinDestroy(schPin Pin); - extern void schWireDestroy(schWire Wire); - #define schWireIsBus(Wire) ((Wire)->_Bus) - #define schWireSetBus(Wire, __Bus) ((Wire)->_Bus = (__Bus)) --#define schWireGetY2(Wire) ((Wire)->_Y2) --#define schWireSetY2(Wire, __Y2) ((Wire)->_Y2 = (__Y2)) --#define schWireGetX2(Wire) ((Wire)->_X2) --#define schWireSetX2(Wire, __X2) ((Wire)->_X2 = (__X2)) --#define schWireGetY1(Wire) ((Wire)->_Y1) --#define schWireSetY1(Wire, __Y1) ((Wire)->_Y1 = (__Y1)) --#define schWireGetX1(Wire) ((Wire)->_X1) --#define schWireSetX1(Wire, __X1) ((Wire)->_X1 = (__X1)) -+#define schWireGetY2(Wire) ((Wire)->ddrY2) -+#define schWireSetY2(Wire, _ddrY2) ((Wire)->ddrY2 = (_ddrY2)) -+#define schWireGetX2(Wire) ((Wire)->ddrX2) -+#define schWireSetX2(Wire, _ddrX2) ((Wire)->ddrX2 = (_ddrX2)) -+#define schWireGetY1(Wire) ((Wire)->ddrY1) -+#define schWireSetY1(Wire, _ddrY1) ((Wire)->ddrY1 = (_ddrY1)) -+#define schWireGetX1(Wire) ((Wire)->ddrX1) -+#define schWireSetX1(Wire, _ddrX1) ((Wire)->ddrX1 = (_ddrX1)) - #define schWireGetfirstRConn(Wire) ((Wire)->firstRConn) - #define schWireSetfirstRConn(Wire, _RConn) ((Wire)->firstRConn = (_RConn)) - extern void schWireInsertRConn(schWire Wire, schConn _Conn); -@@ -500,10 +500,10 @@ extern void schAttrDestroy(schAttr Attr) - #define schAttrSetVisible(Attr, __Visible) ((Attr)->_Visible = (__Visible)) - #define schAttrGetValue(Attr) ((Attr)->_Value) - #define schAttrSetValue(Attr, __Value) ((Attr)->_Value = (__Value)) --#define schAttrGetY(Attr) ((Attr)->_Y) --#define schAttrSetY(Attr, __Y) ((Attr)->_Y = (__Y)) --#define schAttrGetX(Attr) ((Attr)->_X) --#define schAttrSetX(Attr, __X) ((Attr)->_X = (__X)) -+#define schAttrGetY(Attr) ((Attr)->ddrY) -+#define schAttrSetY(Attr, _ddrY) ((Attr)->ddrY = (_ddrY)) -+#define schAttrGetX(Attr) ((Attr)->ddrX) -+#define schAttrSetX(Attr, _ddrX) ((Attr)->ddrX = (_ddrX)) - #define schAttrGetName(Attr) ((Attr)->_Name) - #define schAttrSetName(Attr, __Name) ((Attr)->_Name = (__Name)) - #define schAttrGetNextAttr(Attr) ((Attr)->_NextAttr) -@@ -516,10 +516,10 @@ extern void schAttrDestroy(schAttr Attr) - #define schConnAlloc() utNew(struct _schConn) - #define schConnFree(Conn) utDelete(Conn) - extern void schConnDestroy(schConn Conn); --#define schConnGetY(Conn) ((Conn)->_Y) --#define schConnSetY(Conn, __Y) ((Conn)->_Y = (__Y)) --#define schConnGetX(Conn) ((Conn)->_X) --#define schConnSetX(Conn, __X) ((Conn)->_X = (__X)) -+#define schConnGetY(Conn) ((Conn)->ddrY) -+#define schConnSetY(Conn, _ddrY) ((Conn)->ddrY = (_ddrY)) -+#define schConnGetX(Conn) ((Conn)->ddrX) -+#define schConnSetX(Conn, _ddrX) ((Conn)->ddrX = (_ddrX)) - #define schConnGetRWire(Conn) ((Conn)->_RWire) - #define schConnSetRWire(Conn, __Wire) ((Conn)->_RWire = (__Wire)) - #define schConnGetnextWireRConn(Conn) ((Conn)->nextWireRConn) -@@ -602,14 +602,14 @@ extern void schGraphicRemoveArc(schGraph - extern void schLineDestroy(schLine Line); - #define schLineGetColor(Line) ((Line)->_Color) - #define schLineSetColor(Line, __Color) ((Line)->_Color = (__Color)) --#define schLineGetY2(Line) ((Line)->_Y2) --#define schLineSetY2(Line, __Y2) ((Line)->_Y2 = (__Y2)) --#define schLineGetX2(Line) ((Line)->_X2) --#define schLineSetX2(Line, __X2) ((Line)->_X2 = (__X2)) --#define schLineGetY1(Line) ((Line)->_Y1) --#define schLineSetY1(Line, __Y1) ((Line)->_Y1 = (__Y1)) --#define schLineGetX1(Line) ((Line)->_X1) --#define schLineSetX1(Line, __X1) ((Line)->_X1 = (__X1)) -+#define schLineGetY2(Line) ((Line)->ddrY2) -+#define schLineSetY2(Line, _ddrY2) ((Line)->ddrY2 = (_ddrY2)) -+#define schLineGetX2(Line) ((Line)->ddrX2) -+#define schLineSetX2(Line, _ddrX2) ((Line)->ddrX2 = (_ddrX2)) -+#define schLineGetY1(Line) ((Line)->ddrY1) -+#define schLineSetY1(Line, _ddrY1) ((Line)->ddrY1 = (_ddrY1)) -+#define schLineGetX1(Line) ((Line)->ddrX1) -+#define schLineSetX1(Line, _ddrX1) ((Line)->ddrX1 = (_ddrX1)) - #define schLineGetGraphic(Line) ((Line)->_Graphic) - #define schLineSetGraphic(Line, __Graphic) ((Line)->_Graphic = (__Graphic)) - #define schLineGetnextGraphicLine(Line) ((Line)->nextGraphicLine) -@@ -642,10 +642,10 @@ extern void schCircleDestroy(schCircle C - #define schCircleSetColor(Circle, __Color) ((Circle)->_Color = (__Color)) - #define schCircleGetRadius(Circle) ((Circle)->_Radius) - #define schCircleSetRadius(Circle, __Radius) ((Circle)->_Radius = (__Radius)) --#define schCircleGetY(Circle) ((Circle)->_Y) --#define schCircleSetY(Circle, __Y) ((Circle)->_Y = (__Y)) --#define schCircleGetX(Circle) ((Circle)->_X) --#define schCircleSetX(Circle, __X) ((Circle)->_X = (__X)) -+#define schCircleGetY(Circle) ((Circle)->ddrY) -+#define schCircleSetY(Circle, _ddrY) ((Circle)->ddrY = (_ddrY)) -+#define schCircleGetX(Circle) ((Circle)->ddrX) -+#define schCircleSetX(Circle, _ddrX) ((Circle)->ddrX = (_ddrX)) - #define schCircleGetGraphic(Circle) ((Circle)->_Graphic) - #define schCircleSetGraphic(Circle, __Graphic) ((Circle)->_Graphic = (__Graphic)) - #define schCircleGetnextGraphicCircle(Circle) ((Circle)->nextGraphicCircle) -@@ -666,10 +666,10 @@ extern void schArcDestroy(schArc Arc); - #define schArcSetStartAngle(Arc, __StartAngle) ((Arc)->_StartAngle = (__StartAngle)) - #define schArcGetRadius(Arc) ((Arc)->_Radius) - #define schArcSetRadius(Arc, __Radius) ((Arc)->_Radius = (__Radius)) --#define schArcGetY(Arc) ((Arc)->_Y) --#define schArcSetY(Arc, __Y) ((Arc)->_Y = (__Y)) --#define schArcGetX(Arc) ((Arc)->_X) --#define schArcSetX(Arc, __X) ((Arc)->_X = (__X)) -+#define schArcGetY(Arc) ((Arc)->ddrY) -+#define schArcSetY(Arc, _ddrY) ((Arc)->ddrY = (_ddrY)) -+#define schArcGetX(Arc) ((Arc)->ddrX) -+#define schArcSetX(Arc, _ddrX) ((Arc)->ddrX = (_ddrX)) - #define schArcGetGraphic(Arc) ((Arc)->_Graphic) - #define schArcSetGraphic(Arc, __Graphic) ((Arc)->_Graphic = (__Graphic)) - #define schArcGetnextGraphicArc(Arc) ((Arc)->nextGraphicArc) -@@ -739,8 +739,8 @@ struct _schComp { - dbInst _Inst; - utSym _SymbolName; - U16 _Angle; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - schPin firstPin; - schPin lastPin; - schAttr _Attr; -@@ -760,11 +760,11 @@ struct _schMpin { - dbMport _Mport; - U32 _Right; - U32 _Left; -- S32 _Y2; -- S32 _X2; -+ S32 ddrY2; -+ S32 ddrX2; - U32 _Sequence; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - dbMportType _Type; - schComp _FlagComp; - schAttr _Attr; -@@ -808,8 +808,8 @@ struct _schSymbol { - - struct _schPin { - dbPort _Port; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - schComp _Comp; - schPin nextCompPin; - schMpin _Mpin; -@@ -818,10 +818,10 @@ struct _schPin { - }; - - struct _schWire { -- S32 _Y2; -- S32 _X2; -- S32 _Y1; -- S32 _X1; -+ S32 ddrY2; -+ S32 ddrX2; -+ S32 ddrY1; -+ S32 ddrX1; - schConn firstRConn; - schConn firstLConn; - schAttr _Attr; -@@ -839,8 +839,8 @@ struct _schAttr { - U8 _Size; - U8 _Color; - utSym _Value; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - utSym _Name; - schAttr _NextAttr; - bool _ShowValue:2; -@@ -849,8 +849,8 @@ struct _schAttr { - }; - - struct _schConn { -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - schWire _RWire; - schConn nextWireRConn; - schWire _LWire; -@@ -866,10 +866,10 @@ struct _schGraphic { - - struct _schLine { - U8 _Color; -- S32 _Y2; -- S32 _X2; -- S32 _Y1; -- S32 _X1; -+ S32 ddrY2; -+ S32 ddrX2; -+ S32 ddrY1; -+ S32 ddrX1; - schGraphic _Graphic; - schLine nextGraphicLine; - }; -@@ -884,8 +884,8 @@ struct _schRect { - struct _schCircle { - U8 _Color; - U32 _Radius; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - schGraphic _Graphic; - schCircle nextGraphicCircle; - }; -@@ -895,8 +895,8 @@ struct _schArc { - U8 _EndAngle; - U8 _StartAngle; - U32 _Radius; -- S32 _Y; -- S32 _X; -+ S32 ddrY; -+ S32 ddrX; - schGraphic _Graphic; - schArc nextGraphicArc; - }; diff --git a/cad/gnetman/patches/patch-ap b/cad/gnetman/patches/patch-ap deleted file mode 100644 index 6e8823da764..00000000000 --- a/cad/gnetman/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- src/util/utunix.c.orig Tue Jan 27 11:09:18 2004 -+++ src/util/utunix.c -@@ -38,7 +38,6 @@ - #include <errno.h> - #include "util.h" - #include <sys/ioctl.h> --#include <net/if.h> - #include <time.h> - - jmp_buf utJmpBuf[UT_MAX_SETJMP_DEPTH]; diff --git a/cad/gnetman/patches/patch-aq b/cad/gnetman/patches/patch-aq deleted file mode 100644 index 9e2ed463525..00000000000 --- a/cad/gnetman/patches/patch-aq +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- configure.ac.orig Wed Jan 21 15:56:34 2004 -+++ configure.ac -@@ -15,6 +15,19 @@ AC_PROG_INSTALL - AC_PROG_RANLIB - AC_PROG_YACC - -+AC_PATH_PROG( TCL_CONFIG_SH, tclConfig.sh, AC_ERROR([You must have tcl installed]), -+ /usr/lib /usr/local/lib /usr/pkg/lib /opt/tcl/lib ) -+AC_MSG_CHECKING([for tcl libraries]) -+. $TCL_CONFIG_SH -+TCL_LDFLAGS="$TCL_LIB_SPEC $TCL_LIBS" -+AC_MSG_RESULT([$TCL_LDFLAGS]) -+AC_SUBST(TCL_LDFLAGS) -+ -+AC_MSG_CHECKING([for tcl include flags]) -+TCL_CFLAGS="$TCL_INCLUDE_SPEC" -+AC_SUBST(TCL_CFLAGS) -+AC_MSG_RESULT([$TCL_CFLAGS]) -+ - dnl Checks for libraries. - - dnl Checks for header files. diff --git a/cad/gnetman/patches/patch-ar b/cad/gnetman/patches/patch-ar deleted file mode 100644 index a2d07c7aedf..00000000000 --- a/cad/gnetman/patches/patch-ar +++ /dev/null @@ -1,1489 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2004/07/17 23:49:28 dmcmahill Exp $ - ---- configure.orig Tue Apr 27 12:46:13 2004 -+++ configure -@@ -1,9 +1,8 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.57. -+# Generated by GNU Autoconf 2.59. - # --# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --# Free Software Foundation, Inc. -+# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## -@@ -20,9 +19,10 @@ if test -n "${ZSH_VERSION+set}" && (emul - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false -@@ -41,7 +41,7 @@ for as_var in \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var -@@ -218,16 +218,17 @@ rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else -+ test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - # IFS -@@ -271,7 +272,7 @@ PACKAGE_STRING= - PACKAGE_BUGREPORT= - - ac_unique_file="src/batch/bamain.c" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT RANLIB ac_ct_RANLIB YACC LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT RANLIB ac_ct_RANLIB YACC TCL_CONFIG_SH TCL_LDFLAGS TCL_CFLAGS LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -630,7 +631,7 @@ done - - # Be sure to have absolute paths. - for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+ localstatedir libdir includedir oldincludedir infodir mandir - do - eval ac_val=$`echo $ac_var` - case $ac_val in -@@ -670,10 +671,10 @@ if test -z "$srcdir"; then - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -761,9 +762,9 @@ _ACEOF - cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -850,12 +851,45 @@ case $srcdir in - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. -@@ -866,7 +900,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -+ test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else -@@ -880,8 +914,7 @@ test -n "$ac_init_help" && exit 0 - if $ac_init_version; then - cat <<\_ACEOF - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 --Free Software Foundation, Inc. -+Copyright (C) 2003 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -@@ -893,7 +926,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -+generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -@@ -970,19 +1003,19 @@ do - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then -- ac_must_keep_next=false # Got value, back to normal. -+ ac_must_keep_next=false # Got value, back to normal. - else -- case $ac_arg in -- *=* | --config-cache | -C | -disable-* | --disable-* \ -- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -- | -with-* | --with-* | -without-* | --without-* | --x) -- case "$ac_configure_args0 " in -- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -- esac -- ;; -- -* ) ac_must_keep_next=true ;; -- esac -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. -@@ -1016,12 +1049,12 @@ _ASBOX - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; - } -@@ -1050,7 +1083,7 @@ _ASBOX - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi -@@ -1069,7 +1102,7 @@ _ASBOX - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core core.* *.core && -+ rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -@@ -1149,7 +1182,7 @@ fi - # value. - ac_cache_corrupted=false - for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" -@@ -1166,13 +1199,13 @@ echo "$as_me: error: \`$ac_var' was not - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. -@@ -1257,6 +1290,7 @@ ac_configure="$SHELL $ac_aux_dir/configu - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 - echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -@@ -1273,6 +1307,7 @@ do - case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -1280,20 +1315,20 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi - done - done - ;; -@@ -1437,7 +1472,7 @@ done - - echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 - echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` - if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1945,7 +1980,6 @@ ac_compiler=`set X $ac_compile; echo $2` - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -1965,8 +1999,8 @@ ac_clean_files="$ac_clean_files a.out a. - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output" >&5 --echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 -@@ -1986,23 +2020,23 @@ do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -+ ;; - conftest.$ac_ext ) -- # This is the source file. -- ;; -+ # This is the source file. -+ ;; - [ab].out ) -- # We found the default executable, but exeext='' is most -- # certainly right. -- break;; -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -- break;; -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ # FIXME: I believe we export ac_cv_exeext for Libtool, -+ # but it would be cool to find out if it's true. Does anybody -+ # maintain Libtool? --akim. -+ export ac_cv_exeext -+ break;; - * ) -- break;; -+ break;; - esac - done - else -@@ -2076,8 +2110,8 @@ for ac_file in conftest.exe conftest con - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext -- break;; -+ export ac_cv_exeext -+ break;; - * ) break;; - esac - done -@@ -2102,7 +2136,6 @@ if test "${ac_cv_objext+set}" = set; the - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2153,7 +2186,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2173,11 +2205,21 @@ main () - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2190,7 +2232,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi -@@ -2206,7 +2248,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2223,11 +2264,21 @@ main () - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2240,7 +2291,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_prog_cc_g=no - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -@@ -2267,7 +2318,6 @@ else - ac_cv_prog_cc_stdc=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2295,6 +2345,16 @@ static char *f (char * (*g) (char **, in - va_end (v); - return s; - } -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std1 is added to get -+ 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 -std1. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2321,11 +2381,21 @@ do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2338,7 +2408,7 @@ else - sed 's/^/| /' conftest.$ac_ext >&5 - - fi --rm -f conftest.$ac_objext -+rm -f conftest.err conftest.$ac_objext - done - rm -f conftest.$ac_ext conftest.$ac_objext - CC=$ac_save_CC -@@ -2366,19 +2436,28 @@ cat >conftest.$ac_ext <<_ACEOF - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ -- ''\ -- '#include <stdlib.h>' \ -+ '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ -@@ -2386,14 +2465,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c - 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include <stdlib.h> - $ac_declaration -+#include <stdlib.h> - int - main () - { -@@ -2404,11 +2482,21 @@ exit (42); - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2421,9 +2509,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - continue - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2440,11 +2527,21 @@ exit (42); - _ACEOF - rm -f conftest.$ac_objext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+ (eval $ac_compile) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2456,7 +2553,7 @@ else - sed 's/^/| /' conftest.$ac_ext >&5 - - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - done - rm -f conftest* - if test -n "$ac_declaration"; then -@@ -2470,7 +2567,7 @@ else - sed 's/^/| /' conftest.$ac_ext >&5 - - fi --rm -f conftest.$ac_objext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2672,7 +2769,6 @@ else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lfl $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2696,11 +2792,21 @@ yywrap (); - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2713,7 +2819,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_fl_yywrap=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5 -@@ -2729,7 +2836,6 @@ else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ll $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -2753,11 +2859,21 @@ yywrap (); - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2770,7 +2886,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_l_yywrap=no - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi - echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5 -@@ -2832,11 +2949,21 @@ cat >conftest.$ac_ext <<_ACEOF - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+ (eval $ac_link) 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest$ac_exeext' -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2848,7 +2975,8 @@ else - sed 's/^/| /' conftest.$ac_ext >&5 - - fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_save_LIBS - rm -f "${LEX_OUTPUT_ROOT}.c" - -@@ -2878,6 +3006,7 @@ fi - # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. - echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 - echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -@@ -2894,6 +3023,7 @@ do - case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2901,20 +3031,20 @@ case $as_dir/ in - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi - done - done - ;; -@@ -3066,6 +3196,63 @@ done - test -n "$YACC" || YACC="yacc" - - -+# Extract the first word of "tclConfig.sh", so it can be a program name with args. -+set dummy tclConfig.sh; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_TCL_CONFIG_SH+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $TCL_CONFIG_SH in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_TCL_CONFIG_SH="$TCL_CONFIG_SH" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /usr/lib /usr/local/lib /usr/pkg/lib /opt/tcl/lib -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_TCL_CONFIG_SH="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_TCL_CONFIG_SH" && ac_cv_path_TCL_CONFIG_SH="{ { echo "$as_me:$LINENO: error: You must have tcl installed" >&5 -+echo "$as_me: error: You must have tcl installed" >&2;} -+ { (exit 1); exit 1; }; }" -+ ;; -+esac -+fi -+TCL_CONFIG_SH=$ac_cv_path_TCL_CONFIG_SH -+ -+if test -n "$TCL_CONFIG_SH"; then -+ echo "$as_me:$LINENO: result: $TCL_CONFIG_SH" >&5 -+echo "${ECHO_T}$TCL_CONFIG_SH" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking for tcl libraries" >&5 -+echo $ECHO_N "checking for tcl libraries... $ECHO_C" >&6 -+. $TCL_CONFIG_SH -+TCL_LDFLAGS="$TCL_LIB_SPEC $TCL_LIBS" -+echo "$as_me:$LINENO: result: $TCL_LDFLAGS" >&5 -+echo "${ECHO_T}$TCL_LDFLAGS" >&6 -+ -+ -+echo "$as_me:$LINENO: checking for tcl include flags" >&5 -+echo $ECHO_N "checking for tcl include flags... $ECHO_C" >&6 -+TCL_CFLAGS="$TCL_INCLUDE_SPEC" -+ -+echo "$as_me:$LINENO: result: $TCL_CFLAGS" >&5 -+echo "${ECHO_T}$TCL_CFLAGS" >&6 -+ - - - ac_config_files="$ac_config_files Makefile sch/Makefile src/Makefile src/batch/Makefile src/cir/Makefile src/database/Makefile src/tcl/Makefile src/include/Makefile src/sch/Makefile src/util/Makefile src/lib/Makefile sym/Makefile test/Makefile doc/Makefile" -@@ -3097,13 +3284,13 @@ _ACEOF - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ -- "s/'/'\\\\''/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; - } | -@@ -3133,13 +3320,13 @@ test "x$exec_prefix" = xNONE && exec_pre - # trailing colons and then remove the whole line if VPATH becomes empty - # (actually we leave an empty line to preserve line numbers). - if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ - s/:*\$(srcdir):*/:/; - s/:*\${srcdir}:*/:/; - s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; -+s/^\([^=]*=[ ]*\):*/\1/; - s/:*$//; --s/^[^=]*=[ ]*$//; -+s/^[^=]*=[ ]*$//; - }' - fi - -@@ -3150,7 +3337,7 @@ ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -@@ -3201,9 +3388,10 @@ if test -n "${ZSH_VERSION+set}" && (emul - elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix - fi -+DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. --if (FOO=FOO; unset FOO) >/dev/null 2>&1; then -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset - else - as_unset=false -@@ -3222,7 +3410,7 @@ for as_var in \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME - do -- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var -@@ -3401,16 +3589,17 @@ rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else -+ test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - - as_executable_p="test -f" - - # Sed expression to map a string onto a valid CPP name. --as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - - # Sed expression to map a string onto a valid variable name. --as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - # IFS -@@ -3437,7 +3626,7 @@ _ASBOX - cat >&5 <<_CSEOF - - This file was extended by $as_me, which was --generated by GNU Autoconf 2.57. Invocation command line was -+generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -3481,9 +3670,9 @@ Usage: $0 [OPTIONS] [FILE]... - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ instantiate the configuration file FILE - --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -3500,11 +3689,10 @@ _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.57, -+configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - --Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 2003 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." - srcdir=$srcdir -@@ -3748,6 +3936,9 @@ s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t - s,@RANLIB@,$RANLIB,;t t - s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t - s,@YACC@,$YACC,;t t -+s,@TCL_CONFIG_SH@,$TCL_CONFIG_SH,;t t -+s,@TCL_LDFLAGS@,$TCL_LDFLAGS,;t t -+s,@TCL_CFLAGS@,$TCL_CFLAGS,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF -@@ -3779,9 +3970,9 @@ _ACEOF - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end -@@ -3799,21 +3990,21 @@ for ac_file in : $CONFIG_FILES; do test - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -3829,10 +4020,10 @@ echo X"$ac_file" | - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -3870,12 +4061,45 @@ case $srcdir in - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - - case $INSTALL in -@@ -3897,7 +4121,7 @@ echo "$as_me: creating $ac_file" >&6;} - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+ sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. -@@ -3906,24 +4130,24 @@ echo "$as_me: creating $ac_file" >&6;} - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- echo $f;; -+ echo "$f";; - *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- fi;; -+ fi;; - esac - done` || { (exit 1); exit 1; } - _ACEOF -@@ -3965,12 +4189,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF - # NAME is the cpp macro being defined and VALUE is the value it is being given. - # - # ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' -+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -+ac_dB='[ ].*$,\1#\2' - ac_dC=' ' - ac_dD=',;t' - # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' - ac_uB='$,\1#\2define\3' - ac_uC=' ' - ac_uD=',;t' -@@ -3979,11 +4203,11 @@ for ac_file in : $CONFIG_HEADERS; do tes - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - -@@ -3997,28 +4221,29 @@ echo "$as_me: creating $ac_file" >&6;} - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- echo $f;; -+ # Do quote $f, to prevent DOS paths from being IFS'd. -+ echo "$f";; - *) # Relative -- if test -f "$f"; then -- # Build tree -- echo $f -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo $srcdir/$f -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } -- fi;; -+ fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - - _ACEOF - -@@ -4041,9 +4266,9 @@ s/[\\&,]/\\&/g - s,[\\$`],\\&,g - t clear - : clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp - t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp - : end - _ACEOF - # If some macros were called several times there might be several times -@@ -4057,13 +4282,13 @@ rm -f confdef2sed.sed - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. - cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, - _ACEOF - - # Break up conftest.defines because some shells have a limit on the size - # of here documents, and old seds have small limits too (100 cmds). - echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS - echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS - echo ' :' >>$CONFIG_STATUS - rm -f conftest.tail -@@ -4072,7 +4297,7 @@ do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS -@@ -4099,7 +4324,7 @@ do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS -@@ -4133,10 +4358,10 @@ echo "$as_me: $ac_file is unchanged" >&6 - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -4152,10 +4377,10 @@ echo X"$ac_file" | - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -4193,16 +4418,41 @@ for ac_file in : $CONFIG_COMMANDS; do te - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || - $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_dest" : 'X\(//\)[^/]' \| \ -+ X"$ac_dest" : 'X\(//\)$' \| \ -+ X"$ac_dest" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ - ac_builddir=. - - if test "$ac_dir" != .; then -@@ -4228,12 +4478,45 @@ case $srcdir in - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; - esac --# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be --# absolute. --ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` --ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` --ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` --ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -@@ -4251,10 +4534,10 @@ echo "$as_me: executing $ac_dest command - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$mf" : 'X\(//\)[^/]' \| \ -- X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$mf" : 'X\(//\)[^/]' \| \ -+ X"$mf" : 'X\(//\)$' \| \ -+ X"$mf" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -4290,10 +4573,10 @@ echo X"$mf" | - test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$file" : 'X\(//\)[^/]' \| \ -- X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$file" : 'X\(//\)[^/]' \| \ -+ X"$file" : 'X\(//\)$' \| \ -+ X"$file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } -@@ -4309,10 +4592,10 @@ echo X"$file" | - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } diff --git a/cad/gnetman/patches/patch-as b/cad/gnetman/patches/patch-as deleted file mode 100644 index 608d1e138f0..00000000000 --- a/cad/gnetman/patches/patch-as +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- src/Makefile.am.orig Mon Jan 5 13:46:10 2004 -+++ src/Makefile.am -@@ -14,6 +14,6 @@ gnetman_LDADD= \ - tcl/libtcl.a \ - sch/libsch.a \ - util/libutil.a \ -- $(srcdir)/lib/libtcl8.3.so \ -+ @TCL_LDFLAGS@ \ - @LEXLIB@ - diff --git a/cad/gnetman/patches/patch-at b/cad/gnetman/patches/patch-at deleted file mode 100644 index 23e4ebf116c..00000000000 --- a/cad/gnetman/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- src/Makefile.in.orig Tue Apr 27 12:46:11 2004 -+++ src/Makefile.in -@@ -93,7 +93,7 @@ gnetman_LDADD = \ - tcl/libtcl.a \ - sch/libsch.a \ - util/libutil.a \ -- $(srcdir)/lib/libtcl8.3.so \ -+ @TCL_LDFLAGS@ \ - @LEXLIB@ - - subdir = src diff --git a/cad/gnetman/patches/patch-au b/cad/gnetman/patches/patch-au deleted file mode 100644 index b614202f0dd..00000000000 --- a/cad/gnetman/patches/patch-au +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- src/include/uttypes.h.orig Mon Dec 29 16:45:59 2003 -+++ src/include/uttypes.h -@@ -146,13 +146,7 @@ typedef struct {char val;} *utU32ArrayRe - // todo Prefetch: put in create functions where initialization are done. - --------------------------------------------------------------------------------------------------*/ - --#if (defined(_WINDOWS) || defined(_WIN32)) --#define utLikely(x) (x) /* unknown if ms c compiler supports this */ --#define utUnlikely(x) (x) --#define utExpected(x,y) (x) --#define utPrefetchRead(x) (x) --#define utPrefetchWrite(x) (x) --#else -+#if defined(__GNUC__) && __GNUC__ > 3 - #define utLikely(x) __builtin_expect((x),1) /* assumes gcc version >= 3.0 */ - #define utUnlikely(x) __builtin_expect((x),0) - #define utExpected(x,y) __builtin_expect((x),(y)) -@@ -160,6 +154,12 @@ typedef struct {char val;} *utU32ArrayRe - #define utPrefetchRead(x) __builtin_prefetch((x), 0) - #define utPrefetchWrite(x) __builtin_prefetch((x), 1) - /* also add markers for functions that never return (exit, error) using __attribute__ */ -+#else -+#define utLikely(x) (x) /* unknown if ms c compiler supports this */ -+#define utUnlikely(x) (x) -+#define utExpected(x,y) (x) -+#define utPrefetchRead(x) (x) -+#define utPrefetchWrite(x) (x) - #endif - #define utPrefetch(x) utPrefetchRead(x) - diff --git a/cad/gnetman/patches/patch-av b/cad/gnetman/patches/patch-av deleted file mode 100644 index d28e284775a..00000000000 --- a/cad/gnetman/patches/patch-av +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- sym/Makefile.am.orig Wed Jan 21 15:25:59 2004 -+++ sym/Makefile.am -@@ -1,5 +1,34 @@ - symdir = $(datadir)/gEDA/sym/gnetman - --sym_DATA=$(srcdir)/*.sym -+sym_DATA= \ -+ capacitor-1.sym \ -+ ccvs-1.sym \ -+ clkinv.sym \ -+ cvstitle.sym \ -+ dffr.sym \ -+ idc-1.sym \ -+ in.sym \ -+ inductor-1.sym \ -+ inv.sym \ -+ io.sym \ -+ lat.sym \ -+ latr.sym \ -+ nand2.sym \ -+ nand3.sym \ -+ nmos.sym \ -+ nmos4.sym \ -+ nor2.sym \ -+ out.sym \ -+ passtrans.sym \ -+ pmos.sym \ -+ pmos4.sym \ -+ resistor-1.sym \ -+ vccs-1.sym \ -+ vcvs-1.sym \ -+ vdc-1.sym \ -+ vdd.sym \ -+ vpulse-1.sym \ -+ vpwl-1.sym \ -+ vss.sym - - EXTRA_DIST = $(sym_DATA) diff --git a/cad/gnetman/patches/patch-aw b/cad/gnetman/patches/patch-aw deleted file mode 100644 index c85a4f50af0..00000000000 --- a/cad/gnetman/patches/patch-aw +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- sym/Makefile.in.orig Sat Jul 17 02:22:07 2004 -+++ sym/Makefile.in -@@ -81,7 +81,36 @@ am__quote = @am__quote@ - install_sh = @install_sh@ - symdir = $(datadir)/gEDA/sym/gnetman - --sym_DATA = $(srcdir)/*.sym -+sym_DATA = \ -+ capacitor-1.sym \ -+ ccvs-1.sym \ -+ clkinv.sym \ -+ cvstitle.sym \ -+ dffr.sym \ -+ idc-1.sym \ -+ in.sym \ -+ inductor-1.sym \ -+ inv.sym \ -+ io.sym \ -+ lat.sym \ -+ latr.sym \ -+ nand2.sym \ -+ nand3.sym \ -+ nmos.sym \ -+ nmos4.sym \ -+ nor2.sym \ -+ out.sym \ -+ passtrans.sym \ -+ pmos.sym \ -+ pmos4.sym \ -+ resistor-1.sym \ -+ vccs-1.sym \ -+ vcvs-1.sym \ -+ vdc-1.sym \ -+ vdd.sym \ -+ vpulse-1.sym \ -+ vpwl-1.sym \ -+ vss.sym - - EXTRA_DIST = $(sym_DATA) - subdir = sym diff --git a/cad/gnetman/patches/patch-ax b/cad/gnetman/patches/patch-ax deleted file mode 100644 index 6cce8f8897b..00000000000 --- a/cad/gnetman/patches/patch-ax +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- sch/Makefile.am.orig Wed Jan 21 15:25:50 2004 -+++ sch/Makefile.am -@@ -1,5 +1,12 @@ - schdir = $(datadir)/gEDA/sch/gnetman - --sch_DATA=$(srcdir)/*.sch -+sch_DATA= \ -+ clkinv.sch \ -+ dffr.sch \ -+ inv.sch \ -+ nand2.sch \ -+ nand3.sch \ -+ nor2.sch \ -+ passtrans.sch - - EXTRA_DIST = $(sch_DATA) diff --git a/cad/gnetman/patches/patch-ay b/cad/gnetman/patches/patch-ay deleted file mode 100644 index 86a4af663fa..00000000000 --- a/cad/gnetman/patches/patch-ay +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- sch/Makefile.in.orig Tue Apr 27 12:46:11 2004 -+++ sch/Makefile.in -@@ -1,3 +1,4 @@ -+ - # Makefile.in generated by automake 1.6.3 from Makefile.am. - # @configure_input@ - -@@ -81,7 +82,14 @@ am__quote = @am__quote@ - install_sh = @install_sh@ - schdir = $(datadir)/gEDA/sch/gnetman - --sch_DATA = $(srcdir)/*.sch -+sch_DATA = \ -+ clkinv.sch \ -+ dffr.sch \ -+ inv.sch \ -+ nand2.sch \ -+ nand3.sch \ -+ nor2.sch \ -+ passtrans.sch - - EXTRA_DIST = $(sch_DATA) - subdir = sch diff --git a/cad/gnetman/patches/patch-az b/cad/gnetman/patches/patch-az deleted file mode 100644 index 7fcce03bb2a..00000000000 --- a/cad/gnetman/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- test/Makefile.am.orig Mon Jan 5 03:33:48 2004 -+++ test/Makefile.am -@@ -1,5 +1,16 @@ - testdir = $(datadir)/gEDA/examples/gnetman - --test_DATA=$(srcdir)/*.sch $(srcdir)/*.sym -+test_DATA= \ -+ bustest.sch \ -+ bustest.sym \ -+ bustop.sch \ -+ commatest.sch \ -+ reg32.sch \ -+ reg32.sym \ -+ shifter.sch \ -+ shifter.sym \ -+ sim_test.sch \ -+ spicecomp.sch \ -+ spicetest.sch - - EXTRA_DIST = $(test_DATA) diff --git a/cad/gnetman/patches/patch-ba b/cad/gnetman/patches/patch-ba deleted file mode 100644 index 437a5ba065a..00000000000 --- a/cad/gnetman/patches/patch-ba +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2004/07/17 23:49:26 dmcmahill Exp $ - ---- test/Makefile.in.orig Sat Jul 17 18:39:19 2004 -+++ test/Makefile.in -@@ -81,7 +81,18 @@ am__quote = @am__quote@ - install_sh = @install_sh@ - testdir = $(datadir)/gEDA/examples/gnetman - --test_DATA = $(srcdir)/*.sch $(srcdir)/*.sym -+test_DATA = \ -+ bustest.sch \ -+ bustest.sym \ -+ bustop.sch \ -+ commatest.sch \ -+ reg32.sch \ -+ reg32.sym \ -+ shifter.sch \ -+ shifter.sym \ -+ sim_test.sch \ -+ spicecomp.sch \ -+ spicetest.sch - - EXTRA_DIST = $(test_DATA) - subdir = test |