update to boolean-6.4

Changes since last packaged version:

   Version 6.4

   Graphical interface
    1. Filedialog now has filters for Linux also.

   Boolean algorithm (also effects booleanonly)
    1.  Error corrected in correction settings.

   Version 6.3

   Graphical interface
    1. Based on wxWindows 2.3.4
    2. cmake now used to create projects and makefiles

   Boolean algorithm (also effects booleanonly)
    1.  Using the kbool library with the Boolean engine.

   Version 6.21

   Graphical interface
    1. and it did not even save gdsii or key files properly,
       i just wonder why no one did let me know ;-)

4 files changed, 654 insertions, 338 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 485e0863a3f..8ef8fef81dd 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/05/02 11:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/05/15 23:02:05 dmcmahill Exp $
 #
 
 DISTNAME=	boolean
 PKGNAME=	boolean-${REL}
-PKGREVISION=	2
-WRKSRC=		${WRKDIR}/boolean/${REL}/linux
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://www.xs4all.nl/~kholwerd/download/boolzip/
 EXTRACT_SUFX=	.zip
@@ -13,37 +11,36 @@ MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.xs4all.nl/~kholwerd/bool.html
 COMMENT=	GDSII viewer/editor + (boolean) operations on sets of 2d polygons
 
-DEPENDS+=	wxGTK>=2.4.0nb1:../../x11/wxGTK
-
 DIST_SUBDIR=	${PKGNAME_NOREV}
-REL=		6.2
-
-# This package cannot be built with g++ 2.95.3.
-ONLY_FOR_PLATFORM=	NetBSD-1.[45]*-*
+REL=		6.4
 
-MAKEFILE=	makefile.gui
-PLIST_SUBST=	REL=${REL}
+USE_BUILDLINK2=	YES
+USE_GMAKE=	YES
 
+# the zip archive messes up the case of these files which breaks
+# cmake.
 post-patch:
-	${MV} ${WRKSRC}/../../toolmanager ${WRKSRC}/../../toolmanager.in
-	${SED} "s;@prefix@;${PREFIX};g" < ${WRKSRC}/../../toolmanager.in \
-	  > ${WRKSRC}/../../toolmanager
+	for f in `${FIND} ${WRKSRC} -name cmakelists.txt -print`; do \
+		d=`${DIRNAME} $$f` ; \
+		n="$$d/CMakeLists.txt" ; \
+		${ECHO} "$$f -> $$n" ; \
+		${MV} $$f $$n ; done
+	${MV} -f ${WRKSRC}/bin/boolean ${WRKSRC}/bin/boolean.bak
+	${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/bin/boolean.bak > \
+		${WRKSRC}/bin/boolean
+
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake
 
 do-install:
-	${INSTALL_DATA_DIR}  ${PREFIX}/libexec/boolean/${REL}/${LOWER_OPSYS}/bin
-	${INSTALL_DATA_DIR}  ${PREFIX}/libexec/boolean/${REL}/all_arch.all_os/bin/
-	cd ${WRKSRC}/.. && \
-		tar cf - default gdsuser | tar -xvf - -C ${PREFIX}/libexec/boolean/${REL}
-	${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/libexec/boolean/${REL}
-	${INSTALL_SCRIPT} ${WRKSRC}/../../toolmanager ${PREFIX}/libexec/boolean/toolmanager
-	${INSTALL_SCRIPT} ${WRKSRC}/../release_settings.sh ${PREFIX}/libexec/boolean/${REL}/release_settings.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/../all_arch.all_os/bin/*  ${PREFIX}/libexec/boolean/${REL}/all_arch.all_os/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/boolean_exe  ${PREFIX}/libexec/boolean/${REL}/${LOWER_OPSYS}/bin/
-	cd ${PREFIX}/bin ; \
-	for f in  boolean booleanc booleanterm booleantest boolean_man ; \
-	do \
-		${LN} -f -s ../libexec/boolean/toolmanager $$f ;\
-	done
-	cd ${PREFIX}/libexec/boolean/ && ${LN} -f -s ${REL} default
-
+	${INSTALL_DATA_DIR}  ${PREFIX}/share/boolean
+	cd ${WRKSRC}/apps/edit && \
+		tar cf - default gdsuser | tar -xvf - -C ${PREFIX}/share/boolean
+	cd ${WRKSRC}/docs && \
+		tar cf - html | tar -xvf - -C ${PREFIX}/share/boolean
+	${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/share/boolean
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/boolean  ${PREFIX}/bin/boolean
+	${INSTALL_PROGRAM} ${WRKSRC}/apps/edit/edit  ${PREFIX}/bin/edit
+
+.include "../../x11/wxGTK/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/boolean/PLIST b/cad/boolean/PLIST
index 7c2207431f8..1a90403efcd 100644
--- a/cad/boolean/PLIST
+++ b/cad/boolean/PLIST
@@ -1,218 +1,599 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:47:40 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/15 23:02:05 dmcmahill Exp $
 bin/boolean
-bin/boolean_man
-bin/booleanc
-bin/booleanterm
-bin/booleantest
-libexec/boolean/${REL}/${LOWER_OPSYS}/bin/boolean_exe
-libexec/boolean/${REL}/all_arch.all_os/bin/boolean
-libexec/boolean/${REL}/all_arch.all_os/bin/booleanterm
-libexec/boolean/${REL}/all_arch.all_os/bin/booleantest
-libexec/boolean/${REL}/default/config/boolean.ad
-libexec/boolean/${REL}/default/config/default.set
-libexec/boolean/${REL}/default/config/gdsapp.cfg
-libexec/boolean/${REL}/default/config/gdsapp.dos
-libexec/boolean/${REL}/default/config/history.set
-libexec/boolean/${REL}/default/data/33375151.cal
-libexec/boolean/${REL}/default/data/albert.cal
-libexec/boolean/${REL}/default/data/bignext.cal
-libexec/boolean/${REL}/default/data/bigtest.cal
-libexec/boolean/${REL}/default/data/bigtest2.cal
-libexec/boolean/${REL}/default/data/bigthree.cal
-libexec/boolean/${REL}/default/data/boog.key
-libexec/boolean/${REL}/default/data/boog2.key
-libexec/boolean/${REL}/default/data/boog3.key
-libexec/boolean/${REL}/default/data/charac.key
-libexec/boolean/${REL}/default/data/cir1.key
-libexec/boolean/${REL}/default/data/circ.key
-libexec/boolean/${REL}/default/data/circir.key
-libexec/boolean/${REL}/default/data/circlerr.cal
-libexec/boolean/${REL}/default/data/democal/dem_a-b.cal
-libexec/boolean/${REL}/default/data/democal/dem_b-a.cal
-libexec/boolean/${REL}/default/data/democal/dem_exor.cal
-libexec/boolean/${REL}/default/data/democal/dem_int.cal
-libexec/boolean/${REL}/default/data/democal/dem_or.cal
-libexec/boolean/${REL}/default/data/democal/demo.cal
-libexec/boolean/${REL}/default/data/democal/demo.prs
-libexec/boolean/${REL}/default/data/democal/demo.set
-libexec/boolean/${REL}/default/data/democal/demo2.cal
-libexec/boolean/${REL}/default/data/democal/demo2.prs
-libexec/boolean/${REL}/default/data/democal/demo_ncor.cal
-libexec/boolean/${REL}/default/data/drieh.key
-libexec/boolean/${REL}/default/data/example.cal
-libexec/boolean/${REL}/default/data/example4.key
-libexec/boolean/${REL}/default/data/faust.cal
-libexec/boolean/${REL}/default/data/faust1.key
-libexec/boolean/${REL}/default/data/faust2.key
-libexec/boolean/${REL}/default/data/fracdrie.key
-libexec/boolean/${REL}/default/data/fractal3.cal
-libexec/boolean/${REL}/default/data/goed.cal
-libexec/boolean/${REL}/default/data/karlong.cal
-libexec/boolean/${REL}/default/data/lev.cal
-libexec/boolean/${REL}/default/data/lev2.cal
-libexec/boolean/${REL}/default/data/lev3.cal
-libexec/boolean/${REL}/default/data/m782506.cal
-libexec/boolean/${REL}/default/data/one.cal
-libexec/boolean/${REL}/default/data/pathpol.key
-libexec/boolean/${REL}/default/data/pm110104.cal
-libexec/boolean/${REL}/default/data/spiral.key
-libexec/boolean/${REL}/default/data/test.cal
-libexec/boolean/${REL}/default/data/test0721.cal
-libexec/boolean/${REL}/default/data/trans.key
-libexec/boolean/${REL}/default/data/try.key
-libexec/boolean/${REL}/default/data/twocrrec.cal
-libexec/boolean/${REL}/default/data/tworec.cal
-libexec/boolean/${REL}/default/data/tworec2l.key
-libexec/boolean/${REL}/default/data/zeshoek.key
-libexec/boolean/${REL}/default/data/zesleeg.cal
-libexec/boolean/${REL}/default/gfx/pat01.bmp
-libexec/boolean/${REL}/default/gfx/pat02.bmp
-libexec/boolean/${REL}/default/gfx/pat03.bmp
-libexec/boolean/${REL}/default/gfx/pat04.bmp
-libexec/boolean/${REL}/default/gfx/pat05.bmp
-libexec/boolean/${REL}/default/gfx/pat06.bmp
-libexec/boolean/${REL}/default/gfx/pat07.bmp
-libexec/boolean/${REL}/default/gfx/pat08.bmp
-libexec/boolean/${REL}/default/gfx/pat09.bmp
-libexec/boolean/${REL}/default/gfx/pat10.bmp
-libexec/boolean/${REL}/default/gfx/pat11.bmp
-libexec/boolean/${REL}/default/gfx/pat12.bmp
-libexec/boolean/${REL}/default/gfx/pat13.bmp
-libexec/boolean/${REL}/default/gfx/pat14.bmp
-libexec/boolean/${REL}/default/gfx/pat15.bmp
-libexec/boolean/${REL}/default/gfx/pat16.bmp
-libexec/boolean/${REL}/default/gfx/pat17.bmp
-libexec/boolean/${REL}/default/gfx/pat18.bmp
-libexec/boolean/${REL}/default/gfx/pat19.bmp
-libexec/boolean/${REL}/default/gfx/pat20.bmp
-libexec/boolean/${REL}/default/gfx/pat21.bmp
-libexec/boolean/${REL}/default/gfx/pat22.bmp
-libexec/boolean/${REL}/default/gfx/pat23.bmp
-libexec/boolean/${REL}/default/gfx/pat24.bmp
-libexec/boolean/${REL}/default/gfx/pat25.bmp
-libexec/boolean/${REL}/default/gfx/pat26.bmp
-libexec/boolean/${REL}/default/gfx/pat27.bmp
-libexec/boolean/${REL}/default/gfx/pat28.bmp
-libexec/boolean/${REL}/default/gfx/pat29.bmp
-libexec/boolean/${REL}/default/gfx/pat30.bmp
-libexec/boolean/${REL}/default/gfx/pat31.bmp
-libexec/boolean/${REL}/default/gfx/pat32.bmp
-libexec/boolean/${REL}/default/gfx/pat33.bmp
-libexec/boolean/${REL}/default/gfx/pat34.bmp
-libexec/boolean/${REL}/default/gfx/pat35.bmp
-libexec/boolean/${REL}/default/gfx/pat36.bmp
-libexec/boolean/${REL}/default/gfx/pat37.bmp
-libexec/boolean/${REL}/default/gfx/pat38.bmp
-libexec/boolean/${REL}/default/gfx/pat39.bmp
-libexec/boolean/${REL}/default/gfx/pat40.bmp
-libexec/boolean/${REL}/default/gfx/pat41.bmp
-libexec/boolean/${REL}/default/gfx/pat42.bmp
-libexec/boolean/${REL}/default/gfx/pat43.bmp
-libexec/boolean/${REL}/default/gfx/pat44.bmp
-libexec/boolean/${REL}/default/gfx/pat45.bmp
-libexec/boolean/${REL}/default/gfx/pat46.bmp
-libexec/boolean/${REL}/default/gfx/pat47.bmp
-libexec/boolean/${REL}/default/gfx/pat48.bmp
-libexec/boolean/${REL}/default/gfx/pat49.bmp
-libexec/boolean/${REL}/default/gfx/pat50.bmp
-libexec/boolean/${REL}/default/gfx/pat51.bmp
-libexec/boolean/${REL}/default/gfx/pat52.bmp
-libexec/boolean/${REL}/default/gfx/pat53.bmp
-libexec/boolean/${REL}/default/gfx/pat54.bmp
-libexec/boolean/${REL}/default/gfx/pat55.bmp
-libexec/boolean/${REL}/default/gfx/pat56.bmp
-libexec/boolean/${REL}/default/gfx/pat57.bmp
-libexec/boolean/${REL}/default/gfx/pat58.bmp
-libexec/boolean/${REL}/default/gfx/pat59.bmp
-libexec/boolean/${REL}/default/gfx/pat60.bmp
-libexec/boolean/${REL}/default/gfx/pat61.bmp
-libexec/boolean/${REL}/default/gfx/pat62.bmp
-libexec/boolean/${REL}/default/gfx/pat63.bmp
-libexec/boolean/${REL}/default/gfx/pat64.bmp
-libexec/boolean/${REL}/default/gfx/pat65.bmp
-libexec/boolean/${REL}/default/gfx/pat66.bmp
-libexec/boolean/${REL}/default/gfx/pat67.bmp
-libexec/boolean/${REL}/default/gfx/pat68.bmp
-libexec/boolean/${REL}/default/gfx/pat69.bmp
-libexec/boolean/${REL}/default/gfx/pat70.bmp
-libexec/boolean/${REL}/default/gfx/pat71.bmp
-libexec/boolean/${REL}/default/gfx/pat72.bmp
-libexec/boolean/${REL}/default/gfx/tool0.bmp
-libexec/boolean/${REL}/default/gfx/tool1.bmp
-libexec/boolean/${REL}/default/gfx/tool10.bmp
-libexec/boolean/${REL}/default/gfx/tool11.bmp
-libexec/boolean/${REL}/default/gfx/tool12.bmp
-libexec/boolean/${REL}/default/gfx/tool13.bmp
-libexec/boolean/${REL}/default/gfx/tool14.bmp
-libexec/boolean/${REL}/default/gfx/tool15.bmp
-libexec/boolean/${REL}/default/gfx/tool16.bmp
-libexec/boolean/${REL}/default/gfx/tool17.bmp
-libexec/boolean/${REL}/default/gfx/tool18.bmp
-libexec/boolean/${REL}/default/gfx/tool19.bmp
-libexec/boolean/${REL}/default/gfx/tool2.bmp
-libexec/boolean/${REL}/default/gfx/tool20.bmp
-libexec/boolean/${REL}/default/gfx/tool21.bmp
-libexec/boolean/${REL}/default/gfx/tool22.bmp
-libexec/boolean/${REL}/default/gfx/tool23.bmp
-libexec/boolean/${REL}/default/gfx/tool24.bmp
-libexec/boolean/${REL}/default/gfx/tool25.bmp
-libexec/boolean/${REL}/default/gfx/tool26.bmp
-libexec/boolean/${REL}/default/gfx/tool3.bmp
-libexec/boolean/${REL}/default/gfx/tool4.bmp
-libexec/boolean/${REL}/default/gfx/tool5.bmp
-libexec/boolean/${REL}/default/gfx/tool6.bmp
-libexec/boolean/${REL}/default/gfx/tool7.bmp
-libexec/boolean/${REL}/default/gfx/tool8.bmp
-libexec/boolean/${REL}/default/gfx/tool9.bmp
-libexec/boolean/${REL}/default/process/aap.prs
-libexec/boolean/${REL}/default/process/aap2.prs
-libexec/boolean/${REL}/default/process/aap3.prs
-libexec/boolean/${REL}/default/process/autom.prs
-libexec/boolean/${REL}/default/process/drie.prs
-libexec/boolean/${REL}/default/process/frac.prs
-libexec/boolean/${REL}/default/process/klaas.prs
-libexec/boolean/${REL}/default/process/mrect.prs
-libexec/boolean/${REL}/default/process/onerec.prs
-libexec/boolean/${REL}/default/process/test.prs
-libexec/boolean/${REL}/default/process/tworec.prs
-libexec/boolean/${REL}/default/process/tworec2.prs
-libexec/boolean/${REL}/default/process/vijf.prs
-libexec/boolean/${REL}/gdsuser/6.1_version
-libexec/boolean/${REL}/gdsuser/config/gdsapp.cfg
-libexec/boolean/${REL}/gdsuser/config/history.set
-libexec/boolean/${REL}/gdsuser/config/user.set
-libexec/boolean/${REL}/gdsuser/data/one.cal
-libexec/boolean/${REL}/gdsuser/process/autom.prs
-libexec/boolean/${REL}/gdsuser/process/cor.prs
-libexec/boolean/${REL}/gdsuser/process/corcond.prs
-libexec/boolean/${REL}/gdsuser/process/corm.prs
-libexec/boolean/${REL}/gdsuser/process/del.prs
-libexec/boolean/${REL}/gdsuser/process/exor.prs
-libexec/boolean/${REL}/gdsuser/process/flat.prs
-libexec/boolean/${REL}/gdsuser/process/help.prs
-libexec/boolean/${REL}/gdsuser/process/martijn.prs
-libexec/boolean/${REL}/gdsuser/process/mercor.prs
-libexec/boolean/${REL}/gdsuser/process/merge.prs
-libexec/boolean/${REL}/gdsuser/process/merge2.prs
-libexec/boolean/${REL}/gdsuser/process/pause.prs
-libexec/boolean/${REL}/gdsuser/process/ring.prs
-libexec/boolean/${REL}/gdsuser/process/robert.prs
-libexec/boolean/${REL}/release_settings.sh
-libexec/boolean/default
-libexec/boolean/toolmanager
-@dirrm libexec/boolean/${REL}/${LOWER_OPSYS}/bin
-@dirrm libexec/boolean/${REL}/${LOWER_OPSYS}
-@dirrm libexec/boolean/${REL}/gdsuser/process
-@dirrm libexec/boolean/${REL}/gdsuser/data
-@dirrm libexec/boolean/${REL}/gdsuser/config
-@dirrm libexec/boolean/${REL}/gdsuser
-@dirrm libexec/boolean/${REL}/default/data/democal
-@dirrm libexec/boolean/${REL}/default/data
-@dirrm libexec/boolean/${REL}/default/config
-@dirrm libexec/boolean/${REL}/default/gfx
-@dirrm libexec/boolean/${REL}/default/process
-@dirrm libexec/boolean/${REL}/default
-@dirrm libexec/boolean/${REL}/all_arch.all_os/bin
-@dirrm libexec/boolean/${REL}/all_arch.all_os
-@dirrm libexec/boolean/${REL}
-@dirrm libexec/boolean
+bin/edit
+share/boolean/default/config/boolean.ad
+share/boolean/default/config/default.set
+share/boolean/default/config/gdsapp.cfg
+share/boolean/default/config/gdsapp.dos
+share/boolean/default/config/history.set
+share/boolean/default/data/32899002.03m
+share/boolean/default/data/33375151.cal
+share/boolean/default/data/aaaaa.key
+share/boolean/default/data/aaaaaaaabox.key
+share/boolean/default/data/aaaaaimage.key
+share/boolean/default/data/aaaaap.cal
+share/boolean/default/data/aap.cal
+share/boolean/default/data/albert.cal
+share/boolean/default/data/bignext.cal
+share/boolean/default/data/bigtest.cal
+share/boolean/default/data/bigtest2.cal
+share/boolean/default/data/bigthree.cal
+share/boolean/default/data/boog.key
+share/boolean/default/data/boog2.key
+share/boolean/default/data/boog3.key
+share/boolean/default/data/charac.key
+share/boolean/default/data/cir1.key
+share/boolean/default/data/circ.key
+share/boolean/default/data/circir.key
+share/boolean/default/data/circlerr.cal
+share/boolean/default/data/d1110118.cal
+share/boolean/default/data/d3248239.cal
+share/boolean/default/data/d3337509.cal
+share/boolean/default/data/democal/dem_a-b.cal
+share/boolean/default/data/democal/dem_b-a.cal
+share/boolean/default/data/democal/dem_exor.cal
+share/boolean/default/data/democal/dem_int.cal
+share/boolean/default/data/democal/dem_or.cal
+share/boolean/default/data/democal/demo.cal
+share/boolean/default/data/democal/demo.prs
+share/boolean/default/data/democal/demo.set
+share/boolean/default/data/democal/demo2.cal
+share/boolean/default/data/democal/demo2.prs
+share/boolean/default/data/democal/demo_ncor.cal
+share/boolean/default/data/dipool.cal
+share/boolean/default/data/drieh.key
+share/boolean/default/data/example.cal
+share/boolean/default/data/example4.key
+share/boolean/default/data/faust.cal
+share/boolean/default/data/faust1.key
+share/boolean/default/data/faust2.key
+share/boolean/default/data/fracdrie.key
+share/boolean/default/data/fractal3.cal
+share/boolean/default/data/goed.cal
+share/boolean/default/data/hoodvir.cal
+share/boolean/default/data/karlong.cal
+share/boolean/default/data/kat.key
+share/boolean/default/data/lev.cal
+share/boolean/default/data/lev2.cal
+share/boolean/default/data/lev3.cal
+share/boolean/default/data/m782506.cal
+share/boolean/default/data/one.cal
+share/boolean/default/data/one.key
+share/boolean/default/data/oops.key
+share/boolean/default/data/path.key
+share/boolean/default/data/pathpol.key
+share/boolean/default/data/pippo.cal
+share/boolean/default/data/pm110104.cal
+share/boolean/default/data/polyedit.gif
+share/boolean/default/data/spiral.key
+share/boolean/default/data/terra.cal
+share/boolean/default/data/terra.key
+share/boolean/default/data/test.cal
+share/boolean/default/data/test0721.cal
+share/boolean/default/data/test2.cal
+share/boolean/default/data/trans.key
+share/boolean/default/data/troep.cal
+share/boolean/default/data/troep.key
+share/boolean/default/data/try.key
+share/boolean/default/data/twocrrec.cal
+share/boolean/default/data/tworec.cal
+share/boolean/default/data/tworec2l.key
+share/boolean/default/data/twotop.cal
+share/boolean/default/data/zesh.gif
+share/boolean/default/data/zeshoek.key
+share/boolean/default/data/zesleeg.cal
+share/boolean/default/gfx/pat01.bmp
+share/boolean/default/gfx/pat02.bmp
+share/boolean/default/gfx/pat03.bmp
+share/boolean/default/gfx/pat04.bmp
+share/boolean/default/gfx/pat05.bmp
+share/boolean/default/gfx/pat06.bmp
+share/boolean/default/gfx/pat07.bmp
+share/boolean/default/gfx/pat08.bmp
+share/boolean/default/gfx/pat09.bmp
+share/boolean/default/gfx/pat10.bmp
+share/boolean/default/gfx/pat11.bmp
+share/boolean/default/gfx/pat12.bmp
+share/boolean/default/gfx/pat13.bmp
+share/boolean/default/gfx/pat14.bmp
+share/boolean/default/gfx/pat15.bmp
+share/boolean/default/gfx/pat16.bmp
+share/boolean/default/gfx/pat17.bmp
+share/boolean/default/gfx/pat18.bmp
+share/boolean/default/gfx/pat19.bmp
+share/boolean/default/gfx/pat20.bmp
+share/boolean/default/gfx/pat21.bmp
+share/boolean/default/gfx/pat22.bmp
+share/boolean/default/gfx/pat23.bmp
+share/boolean/default/gfx/pat24.bmp
+share/boolean/default/gfx/pat25.bmp
+share/boolean/default/gfx/pat26.bmp
+share/boolean/default/gfx/pat27.bmp
+share/boolean/default/gfx/pat28.bmp
+share/boolean/default/gfx/pat29.bmp
+share/boolean/default/gfx/pat30.bmp
+share/boolean/default/gfx/pat31.bmp
+share/boolean/default/gfx/pat32.bmp
+share/boolean/default/gfx/pat33.bmp
+share/boolean/default/gfx/pat34.bmp
+share/boolean/default/gfx/pat35.bmp
+share/boolean/default/gfx/pat36.bmp
+share/boolean/default/gfx/pat37.bmp
+share/boolean/default/gfx/pat38.bmp
+share/boolean/default/gfx/pat39.bmp
+share/boolean/default/gfx/pat40.bmp
+share/boolean/default/gfx/pat41.bmp
+share/boolean/default/gfx/pat42.bmp
+share/boolean/default/gfx/pat43.bmp
+share/boolean/default/gfx/pat44.bmp
+share/boolean/default/gfx/pat45.bmp
+share/boolean/default/gfx/pat46.bmp
+share/boolean/default/gfx/pat47.bmp
+share/boolean/default/gfx/pat48.bmp
+share/boolean/default/gfx/pat49.bmp
+share/boolean/default/gfx/pat50.bmp
+share/boolean/default/gfx/pat51.bmp
+share/boolean/default/gfx/pat52.bmp
+share/boolean/default/gfx/pat53.bmp
+share/boolean/default/gfx/pat54.bmp
+share/boolean/default/gfx/pat55.bmp
+share/boolean/default/gfx/pat56.bmp
+share/boolean/default/gfx/pat57.bmp
+share/boolean/default/gfx/pat58.bmp
+share/boolean/default/gfx/pat59.bmp
+share/boolean/default/gfx/pat60.bmp
+share/boolean/default/gfx/pat61.bmp
+share/boolean/default/gfx/pat62.bmp
+share/boolean/default/gfx/pat63.bmp
+share/boolean/default/gfx/pat64.bmp
+share/boolean/default/gfx/pat65.bmp
+share/boolean/default/gfx/pat66.bmp
+share/boolean/default/gfx/pat67.bmp
+share/boolean/default/gfx/pat68.bmp
+share/boolean/default/gfx/pat69.bmp
+share/boolean/default/gfx/pat70.bmp
+share/boolean/default/gfx/pat71.bmp
+share/boolean/default/gfx/pat72.bmp
+share/boolean/default/gfx/tool0.bmp
+share/boolean/default/gfx/tool1.bmp
+share/boolean/default/gfx/tool10.bmp
+share/boolean/default/gfx/tool11.bmp
+share/boolean/default/gfx/tool12.bmp
+share/boolean/default/gfx/tool13.bmp
+share/boolean/default/gfx/tool14.bmp
+share/boolean/default/gfx/tool15.bmp
+share/boolean/default/gfx/tool16.bmp
+share/boolean/default/gfx/tool17.bmp
+share/boolean/default/gfx/tool18.bmp
+share/boolean/default/gfx/tool19.bmp
+share/boolean/default/gfx/tool2.bmp
+share/boolean/default/gfx/tool20.bmp
+share/boolean/default/gfx/tool21.bmp
+share/boolean/default/gfx/tool22.bmp
+share/boolean/default/gfx/tool23.bmp
+share/boolean/default/gfx/tool24.bmp
+share/boolean/default/gfx/tool25.bmp
+share/boolean/default/gfx/tool26.bmp
+share/boolean/default/gfx/tool3.bmp
+share/boolean/default/gfx/tool4.bmp
+share/boolean/default/gfx/tool5.bmp
+share/boolean/default/gfx/tool6.bmp
+share/boolean/default/gfx/tool7.bmp
+share/boolean/default/gfx/tool8.bmp
+share/boolean/default/gfx/tool9.bmp
+share/boolean/default/process/aap.prs
+share/boolean/default/process/aap2.prs
+share/boolean/default/process/aap3.prs
+share/boolean/default/process/ask.prs
+share/boolean/default/process/autom.prs
+share/boolean/default/process/blabla.prs
+share/boolean/default/process/cnc.prs
+share/boolean/default/process/copy.prs
+share/boolean/default/process/corr1.prs
+share/boolean/default/process/drie.prs
+share/boolean/default/process/faut.prs
+share/boolean/default/process/frac.prs
+share/boolean/default/process/invert01c.prs
+share/boolean/default/process/klaas.prs
+share/boolean/default/process/mrect.prs
+share/boolean/default/process/onerec.prs
+share/boolean/default/process/ram.prs
+share/boolean/default/process/ring1.prs
+share/boolean/default/process/test.prs
+share/boolean/default/process/testc.gds
+share/boolean/default/process/testc.prs
+share/boolean/default/process/tworec.prs
+share/boolean/default/process/tworec2.prs
+share/boolean/default/process/vijf.prs
+share/boolean/default/process/wil1.prs
+share/boolean/gdsuser/6.1_version
+share/boolean/gdsuser/6.3_version
+share/boolean/gdsuser/config/gdsapp.cfg
+share/boolean/gdsuser/config/history.set
+share/boolean/gdsuser/config/user.set
+share/boolean/gdsuser/data/one.cal
+share/boolean/gdsuser/process/010221.cal
+share/boolean/gdsuser/process/010221.prs
+share/boolean/gdsuser/process/aap.prs
+share/boolean/gdsuser/process/aap2.prs
+share/boolean/gdsuser/process/aap3.prs
+share/boolean/gdsuser/process/autom.prs
+share/boolean/gdsuser/process/bug.prs
+share/boolean/gdsuser/process/buginvert.prs
+share/boolean/gdsuser/process/cleancircle.prs
+share/boolean/gdsuser/process/cor.prs
+share/boolean/gdsuser/process/corcond.prs
+share/boolean/gdsuser/process/corm.prs
+share/boolean/gdsuser/process/del.prs
+share/boolean/gdsuser/process/exor.prs
+share/boolean/gdsuser/process/flat.prs
+share/boolean/gdsuser/process/help.prs
+share/boolean/gdsuser/process/invert3.prs
+share/boolean/gdsuser/process/martijn.prs
+share/boolean/gdsuser/process/mercor.prs
+share/boolean/gdsuser/process/merge.prs
+share/boolean/gdsuser/process/merge2.prs
+share/boolean/gdsuser/process/mic.prs
+share/boolean/gdsuser/process/pause.prs
+share/boolean/gdsuser/process/ram.prs
+share/boolean/gdsuser/process/ring.prs
+share/boolean/gdsuser/process/robert.prs
+share/boolean/gdsuser/process/test7.prs
+share/boolean/html/about_8h-source.html
+share/boolean/html/alias_8h-source.html
+share/boolean/html/annotated.html
+share/boolean/html/arc_8h-source.html
+share/boolean/html/bbox_8h-source.html
+share/boolean/html/boundary_8h-source.html
+share/boolean/html/chandbas_8h-source.html
+share/boolean/html/circleditdlg_8h-source.html
+share/boolean/html/classarc__seg-members.html
+share/boolean/html/classarc__seg.html
+share/boolean/html/classarc__seg.png
+share/boolean/html/classarcseg-members.html
+share/boolean/html/classarcseg.html
+share/boolean/html/classarcseg.png
+share/boolean/html/classarrayreference-members.html
+share/boolean/html/classarrayreference.html
+share/boolean/html/classarrayreference.png
+share/boolean/html/classbasetool-members.html
+share/boolean/html/classbasetool.html
+share/boolean/html/classbasetool.png
+share/boolean/html/classboundary-members.html
+share/boolean/html/classboundary.html
+share/boolean/html/classboundary.png
+share/boolean/html/classbox-members.html
+share/boolean/html/classbox.html
+share/boolean/html/classbox.png
+share/boolean/html/classboxtool-members.html
+share/boolean/html/classboxtool.html
+share/boolean/html/classboxtool.png
+share/boolean/html/classcanvas-members.html
+share/boolean/html/classcanvas.html
+share/boolean/html/classcircle-members.html
+share/boolean/html/classcircle.html
+share/boolean/html/classcircle.png
+share/boolean/html/classcircleditdialog-members.html
+share/boolean/html/classcircleditdialog.html
+share/boolean/html/classcircletool-members.html
+share/boolean/html/classcircletool.html
+share/boolean/html/classcircletool.png
+share/boolean/html/classcommand-members.html
+share/boolean/html/classcommand.html
+share/boolean/html/classcommandhandler-members.html
+share/boolean/html/classcommandhandler.html
+share/boolean/html/classcommandparser-members.html
+share/boolean/html/classcommandparser.html
+share/boolean/html/classcommandparser.png
+share/boolean/html/classcopytool-members.html
+share/boolean/html/classcopytool.html
+share/boolean/html/classcopytool.png
+share/boolean/html/classcopywxlistbox-members.html
+share/boolean/html/classcopywxlistbox.html
+share/boolean/html/classcursordialog-members.html
+share/boolean/html/classcursordialog.html
+share/boolean/html/classdeletetool-members.html
+share/boolean/html/classdeletetool.html
+share/boolean/html/classdeletetool.png
+share/boolean/html/classdeselecttool-members.html
+share/boolean/html/classdeselecttool.html
+share/boolean/html/classdeselecttool.png
+share/boolean/html/classdistancedlg-members.html
+share/boolean/html/classdistancedlg.html
+share/boolean/html/classdrawdriver-members.html
+share/boolean/html/classdrawdriver.html
+share/boolean/html/classdrawdriver.png
+share/boolean/html/classdriver__out-members.html
+share/boolean/html/classdriver__out.html
+share/boolean/html/classdriver__out.png
+share/boolean/html/classeditcircletool-members.html
+share/boolean/html/classeditcircletool.html
+share/boolean/html/classeditcircletool.png
+share/boolean/html/classeditimagetool-members.html
+share/boolean/html/classeditimagetool.html
+share/boolean/html/classeditimagetool.png
+share/boolean/html/classeditlinetool-members.html
+share/boolean/html/classeditlinetool.html
+share/boolean/html/classeditlinetool.png
+share/boolean/html/classeditpolylinetool-members.html
+share/boolean/html/classeditpolylinetool.html
+share/boolean/html/classeditpolylinetool.png
+share/boolean/html/classeditpolytool-members.html
+share/boolean/html/classeditpolytool.html
+share/boolean/html/classeditpolytool.png
+share/boolean/html/classeditpropertytool-members.html
+share/boolean/html/classeditpropertytool.html
+share/boolean/html/classeditpropertytool.png
+share/boolean/html/classeditrectangletool-members.html
+share/boolean/html/classeditrectangletool.html
+share/boolean/html/classeditrectangletool.png
+share/boolean/html/classeditreferencetool-members.html
+share/boolean/html/classeditreferencetool.html
+share/boolean/html/classeditreferencetool.png
+share/boolean/html/classedittool-members.html
+share/boolean/html/classedittool.html
+share/boolean/html/classedittool.png
+share/boolean/html/classelement-members.html
+share/boolean/html/classelement.html
+share/boolean/html/classelement.png
+share/boolean/html/classemask__driver__in-members.html
+share/boolean/html/classemask__driver__in.html
+share/boolean/html/classemask__driver__out-members.html
+share/boolean/html/classemask__driver__out.html
+share/boolean/html/classemask__driver__out.png
+share/boolean/html/classevalstring-members.html
+share/boolean/html/classevalstring.html
+share/boolean/html/classevalstring.png
+share/boolean/html/classexecdlg-members.html
+share/boolean/html/classexecdlg.html
+share/boolean/html/classfactors-members.html
+share/boolean/html/classfactors.html
+share/boolean/html/classfillpatterns-members.html
+share/boolean/html/classfillpatterns.html
+share/boolean/html/classflash__driver__in-members.html
+share/boolean/html/classflash__driver__in.html
+share/boolean/html/classflash__driver__out-members.html
+share/boolean/html/classflash__driver__out.html
+share/boolean/html/classflash__driver__out.png
+share/boolean/html/classg__polygon-members.html
+share/boolean/html/classg__polygon.html
+share/boolean/html/classg__polygon.png
+share/boolean/html/classg__polyline-members.html
+share/boolean/html/classg__polyline.html
+share/boolean/html/classg__polyline.png
+share/boolean/html/classgbrdriver-members.html
+share/boolean/html/classgbrdriver.html
+share/boolean/html/classgbrdriver.png
+share/boolean/html/classgds__driver__in-members.html
+share/boolean/html/classgds__driver__in.html
+share/boolean/html/classgds__driver__out-members.html
+share/boolean/html/classgds__driver__out.html
+share/boolean/html/classgds__driver__out.png
+share/boolean/html/classgdsio-members.html
+share/boolean/html/classgdsio.html
+share/boolean/html/classglobal-members.html
+share/boolean/html/classglobal.html
+share/boolean/html/classgridsettings-members.html
+share/boolean/html/classgridsettings.html
+share/boolean/html/classgroup-members.html
+share/boolean/html/classgroup.html
+share/boolean/html/classhandler-members.html
+share/boolean/html/classhandler.html
+share/boolean/html/classhierdriver-members.html
+share/boolean/html/classhierdriver.html
+share/boolean/html/classhierdriver.png
+share/boolean/html/classidentdlg-members.html
+share/boolean/html/classidentdlg.html
+share/boolean/html/classimage-members.html
+share/boolean/html/classimage.html
+share/boolean/html/classimage.png
+share/boolean/html/classinsertreferencetool-members.html
+share/boolean/html/classinsertreferencetool.html
+share/boolean/html/classinsertreferencetool.png
+share/boolean/html/classinsertstructuretool-members.html
+share/boolean/html/classinsertstructuretool.html
+share/boolean/html/classinsertstructuretool.png
+share/boolean/html/classinslayer-members.html
+share/boolean/html/classinslayer.html
+share/boolean/html/classkey__driver__in-members.html
+share/boolean/html/classkey__driver__in.html
+share/boolean/html/classkey__driver__in.png
+share/boolean/html/classkey__driver__out-members.html
+share/boolean/html/classkey__driver__out.html
+share/boolean/html/classkey__driver__out.png
+share/boolean/html/classkey__parser-members.html
+share/boolean/html/classkey__parser.html
+share/boolean/html/classkey__parser.png
+share/boolean/html/classkey__string__in-members.html
+share/boolean/html/classkey__string__in.html
+share/boolean/html/classkey__string__in.png
+share/boolean/html/classlayerinfo-members.html
+share/boolean/html/classlayerinfo.html
+share/boolean/html/classlayerorder-members.html
+share/boolean/html/classlayerorder.html
+share/boolean/html/classlayerpropertiesdialog-members.html
+share/boolean/html/classlayerpropertiesdialog.html
+share/boolean/html/classline__parser-members.html
+share/boolean/html/classline__parser.html
+share/boolean/html/classline__parser.png
+share/boolean/html/classline__seg-members.html
+share/boolean/html/classline__seg.html
+share/boolean/html/classline__seg.png
+share/boolean/html/classmovetool-members.html
+share/boolean/html/classmovetool.html
+share/boolean/html/classmovetool.png
+share/boolean/html/classnewfiledialog-members.html
+share/boolean/html/classnewfiledialog.html
+share/boolean/html/classpath-members.html
+share/boolean/html/classpath.html
+share/boolean/html/classpath.png
+share/boolean/html/classpatterndialog-members.html
+share/boolean/html/classpatterndialog.html
+share/boolean/html/classpolyeditdialog-members.html
+share/boolean/html/classpolyeditdialog.html
+share/boolean/html/classpolylinetool-members.html
+share/boolean/html/classpolylinetool.html
+share/boolean/html/classpolylinetool.png
+share/boolean/html/classpolytool-members.html
+share/boolean/html/classpolytool.html
+share/boolean/html/classpolytool.png
+share/boolean/html/classprintdriver-members.html
+share/boolean/html/classprintdriver.html
+share/boolean/html/classprocessparser-members.html
+share/boolean/html/classprocessparser.html
+share/boolean/html/classrectangletool-members.html
+share/boolean/html/classrectangletool.html
+share/boolean/html/classrectangletool.png
+share/boolean/html/classreference-members.html
+share/boolean/html/classreference.html
+share/boolean/html/classreference.png
+share/boolean/html/classrotatetool-members.html
+share/boolean/html/classrotatetool.html
+share/boolean/html/classrotatetool.png
+share/boolean/html/classsegment-members.html
+share/boolean/html/classsegment.html
+share/boolean/html/classsegment.png
+share/boolean/html/classselecttool-members.html
+share/boolean/html/classselecttool.html
+share/boolean/html/classselecttool.png
+share/boolean/html/classsettingsdialog-members.html
+share/boolean/html/classsettingsdialog.html
+share/boolean/html/classsetup-members.html
+share/boolean/html/classsetup.html
+share/boolean/html/classshape-members.html
+share/boolean/html/classshape.html
+share/boolean/html/classshape.png
+share/boolean/html/classsline-members.html
+share/boolean/html/classsline.html
+share/boolean/html/classsline.png
+share/boolean/html/classstructurereference-members.html
+share/boolean/html/classstructurereference.html
+share/boolean/html/classstructurereference.png
+share/boolean/html/classstructuresdialog-members.html
+share/boolean/html/classstructuresdialog.html
+share/boolean/html/classstructuresdialog2-members.html
+share/boolean/html/classstructuresdialog2.html
+share/boolean/html/classtext-members.html
+share/boolean/html/classtext.html
+share/boolean/html/classtext.png
+share/boolean/html/classtextinsdialog-members.html
+share/boolean/html/classtextinsdialog.html
+share/boolean/html/classtexttool-members.html
+share/boolean/html/classtexttool.html
+share/boolean/html/classtexttool.png
+share/boolean/html/classtoolcontrol-members.html
+share/boolean/html/classtoolcontrol.html
+share/boolean/html/classtransformations-members.html
+share/boolean/html/classtransformations.html
+share/boolean/html/classunitssettings-members.html
+share/boolean/html/classunitssettings.html
+share/boolean/html/classwxdoubledcbase-members.html
+share/boolean/html/classwxdoubledcbase.html
+share/boolean/html/classwxdoubledcbase.png
+share/boolean/html/classwxtransformmatrix-members.html
+share/boolean/html/classwxtransformmatrix.html
+share/boolean/html/classwxunit-members.html
+share/boolean/html/classwxunit.html
+share/boolean/html/classzoomtool-members.html
+share/boolean/html/classzoomtool.html
+share/boolean/html/classzoomtool.png
+share/boolean/html/cnchier_8h-source.html
+share/boolean/html/command_8h-source.html
+share/boolean/html/copylist_8h-source.html
+share/boolean/html/cparser_8h-source.html
+share/boolean/html/cursordlg_8h-source.html
+share/boolean/html/dcclbuf_8h-source.html
+share/boolean/html/ddehand_8h-source.html
+share/boolean/html/debugdlg_8h-source.html
+share/boolean/html/distdlg_8h-source.html
+share/boolean/html/doubledc_8h-source.html
+share/boolean/html/doxygen.css
+share/boolean/html/doxygen.png
+share/boolean/html/drivout_8h-source.html
+share/boolean/html/element_8h-source.html
+share/boolean/html/elemlst_8h-source.html
+share/boolean/html/emaskin_8h-source.html
+share/boolean/html/emaskout_8h-source.html
+share/boolean/html/eventids_8h-source.html
+share/boolean/html/execdlg_8h-source.html
+share/boolean/html/exlout_8h-source.html
+share/boolean/html/facdlg_8h-source.html
+share/boolean/html/files.html
+share/boolean/html/flashin_8h-source.html
+share/boolean/html/flashout_8h-source.html
+share/boolean/html/functions.html
+share/boolean/html/gbrhier_8h-source.html
+share/boolean/html/gdsapp_8h-source.html
+share/boolean/html/gdsdef_8h-source.html
+share/boolean/html/gdsdrin_8h-source.html
+share/boolean/html/gdsdrout_8h-source.html
+share/boolean/html/gdserr_8h-source.html
+share/boolean/html/gdsii_8h-source.html
+share/boolean/html/gdsio_8h-source.html
+share/boolean/html/gdsmes_8h-source.html
+share/boolean/html/genhier_8h-source.html
+share/boolean/html/graph_8h-source.html
+share/boolean/html/graphlst_8h-source.html
+share/boolean/html/griddlg_8h-source.html
+share/boolean/html/group_8h-source.html
+share/boolean/html/groupdlg_8h-source.html
+share/boolean/html/hierarchy.html
+share/boolean/html/identdlg_8h-source.html
+share/boolean/html/index.html
+share/boolean/html/insdlg_8h-source.html
+share/boolean/html/keydrin_8h-source.html
+share/boolean/html/keydrout_8h-source.html
+share/boolean/html/layerinf_8h-source.html
+share/boolean/html/layprops_8h-source.html
+share/boolean/html/linepars_8h-source.html
+share/boolean/html/liner_8h-source.html
+share/boolean/html/lpdsizes_8h-source.html
+share/boolean/html/lsetup_8h-source.html
+share/boolean/html/mainwin_8h-source.html
+share/boolean/html/misc_8h-source.html
+share/boolean/html/newfiledlg_8h-source.html
+share/boolean/html/orderdlg_8h-source.html
+share/boolean/html/patdlg_8h-source.html
+share/boolean/html/path_8h-source.html
+share/boolean/html/point_8h-source.html
+share/boolean/html/polyeditdlg_8h-source.html
+share/boolean/html/polyline_8h-source.html
+share/boolean/html/prcspars_8h-source.html
+share/boolean/html/printer_8h-source.html
+share/boolean/html/propedit_8h-source.html
+share/boolean/html/proper_8h-source.html
+share/boolean/html/referenc_8h-source.html
+share/boolean/html/scrndrv_8h-source.html
+share/boolean/html/segment_8h-source.html
+share/boolean/html/settingsdlg_8h-source.html
+share/boolean/html/shape_8h-source.html
+share/boolean/html/statusb_8h-source.html
+share/boolean/html/strucdlg_8h-source.html
+share/boolean/html/structur_8h-source.html
+share/boolean/html/text_8h-source.html
+share/boolean/html/textinsdlg_8h-source.html
+share/boolean/html/tool_8h-source.html
+share/boolean/html/toolcont_8h-source.html
+share/boolean/html/trans_8h-source.html
+share/boolean/html/transdlg_8h-source.html
+share/boolean/html/units_8h-source.html
+share/boolean/html/unitsdlg_8h-source.html
+share/boolean/html/valuesvc_8h-source.html
+share/boolean/html/wait_8h-source.html
+share/boolean/html/windrv_8h-source.html
+share/boolean/html/winmess_8h-source.html
+share/boolean/html/winstatb_8h-source.html
+share/boolean/html/wxmatrix_8h-source.html
+share/boolean/html/wxsvg_8h-source.html
+share/boolean/html/wxwin_8h-source.html
+@dirrm share/boolean/html
+@dirrm share/boolean/gdsuser/process
+@dirrm share/boolean/gdsuser/data
+@dirrm share/boolean/gdsuser/config
+@dirrm share/boolean/gdsuser
+@dirrm share/boolean/default/process
+@dirrm share/boolean/default/gfx
+@dirrm share/boolean/default/data/democal
+@dirrm share/boolean/default/data
+@dirrm share/boolean/default/config
+@dirrm share/boolean
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index 5bf018e0115..7c3b4ea9dff 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 16:26:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/05/15 23:02:05 dmcmahill Exp $
 
-SHA1 (boolean-6.2/boolean.zip) = 8b036bc2bc589b44429c7f8c1e185d9ad16f81ce
-Size (boolean-6.2/boolean.zip) = 3596513 bytes
-SHA1 (patch-aa) = db33cde650c0474e51b628264fae3d7adf511d1b
-SHA1 (patch-ab) = 47766ff336674283c01ff070add461459e3f7947
-SHA1 (patch-ac) = 0ff4a9dbe89560b8cb7db2d293e070ccb296011a
-SHA1 (patch-ad) = 5f667861d17930271856855fc9a8e5b56d97aafc
-SHA1 (patch-ae) = 2ce9dd94a4b7a9f93ba516780d922f4059929063
-SHA1 (patch-af) = be660cd65fc3fe7433dc0b14a1422169ff059b66
-SHA1 (patch-ag) = 0bc3df9c2181e8e01fa154469610660f43b6525d
+SHA1 (boolean-6.4/boolean.zip) = 809e4126c3139a10b5c5905e17766a62fcb01f89
+Size (boolean-6.4/boolean.zip) = 2716249 bytes
+SHA1 (patch-aa) = 220f54da8e5fe76c498c03e6ba19fdfa299ca18e
diff --git a/cad/boolean/patches/patch-aa b/cad/boolean/patches/patch-aa
index 5aa0d85d99c..e36533cac7e 100644
--- a/cad/boolean/patches/patch-aa
+++ b/cad/boolean/patches/patch-aa
@@ -1,82 +1,26 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/18 17:57:27 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/15 23:02:06 dmcmahill Exp $
 
---- makefile.gui.orig	Sun Sep 17 22:18:44 2000
-+++ makefile.gui	Sat Nov 11 19:35:59 2000
-@@ -1,5 +1,5 @@
--CC		=	g++
-+CC		=	${CXX}
- #WXWIN		= 	../wx_src
--WXWINDOW_LIBPATH=       /usr/local/lib
-+WXWINDOW_LIBPATH=       ${LOCALBASE}/lib
- WXWIN		=	$(WXWINDOW_LIBPATH)
- TEMPDIR		=	../temp/linuxgui
-@@ -11,19 +11,17 @@
- 			-I$(SRCDIR)/tools \
- 			-I$(SRCDIR)/bool \
--         -I$(SRCDIR)/drivers \
-+			-I$(SRCDIR)/drivers \
- 			-I$(SRCDIR)/intrface \
- 			-I$(SRCDIR)/dosint \
--         -I$(SRCDIR)/list \
--			-I$(WXWIN)/wx/include\
--			-I/usr/local/include\
--			-I/usr/local/lib/wx/include\
--			-I/usr/local/lib/glib/include\
--			-I/usr/local/include\
--			-I/usr/X11R6/include 
--LIBDIR		=	-L/usr/X11R6/lib \
--			-L/usr/local/lib
-+			-I$(SRCDIR)/list \
-+			-I${LOCALBASE}/include \
-+			-I${X11BASE}/include \
-+			`glib-config --cflags` \
-+			`gtk-config --cflags` \
-+			`wx-config --cflags`
-+LIBDIR		=	-L${X11BASE}/lib -Wl,-R${X11BASE}/lib \
-+			-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
- XTRAFLAGS	=	-static
- CFLAGS 		= 	-D_G_UNIX \
--			-DBIGINDIAN \
- 			-DLINUX \
- 			-DWIN_INT \
-@@ -31,15 +29,16 @@
- 			-fenum-int-equiv \
- 			-fexceptions \
--         -fguiding-decls \
-+			-fguiding-decls \
- 			-fno-implicit-templates \
--		   -D_REENTRANT -g 
-+			-D_REENTRANT -g 
- #		   -D_REENTRANT -g -D__WXDEBUG__
- #			-Wall -D_REENTRANT    -g -D__WXDEBUG__  
- TEXTLIBS	= 	-ll -lm -lg++ -lstdc++
- LIBS   		= 	-lstdc++ -lXmu -lXt \
--		        -lwx_gtk \
--			-lgtk -lgdk -lglib -lgmodule \
--			-lpthread  -rdynamic  -ldl -lXext -lX11 -lm -lgthread
--		
-+			`glib-config --libs` \
-+			`gtk-config --libs` \
-+			`wx-config --libs` \
-+			--Wl,-export-dynamic -lXext \
-+			-lX11 -lm
- PROGNAME 	= 	boolean
- SRCPOOLS 	= 	interface misc  bool gdssource drivers tools parser list
-@@ -72,8 +71,8 @@
- 			$(TEMPDIR)/unitsdlg.o \
- 			$(TEMPDIR)/distdlg.o \
--         $(TEMPDIR)/orderdlg.o \
-+			$(TEMPDIR)/orderdlg.o \
- 			$(TEMPDIR)/groupdlg.o \
- 			$(TEMPDIR)/strucdlg.o \
--         $(TEMPDIR)/about.o \
-+			$(TEMPDIR)/about.o \
- 			$(TEMPDIR)/wait.o \
- 			$(TEMPDIR)/gdsapp.o \
-@@ -126,5 +125,5 @@
- 			$(TEMPDIR)/trans.o\
- 			$(TEMPDIR)/dcclbuf.o\
--         $(TEMPDIR)/windrv.o \
-+			$(TEMPDIR)/windrv.o \
- 			$(TEMPDIR)/gdsdrout.o \
- 			$(TEMPDIR)/emaskin.o \
+--- bin/boolean.orig	Thu Nov 28 13:49:06 2002
++++ bin/boolean
+@@ -1,7 +1,6 @@
+ #! /bin/sh
+-PATH=/opt/protools/boolean/6.3/boolean/apps/edit:$PATH
+ 
+-GDSROOT=/opt/protools/boolean/6.3/boolean/apps/edit
++GDSROOT=@prefix@/share/boolean
+ export GDSROOT
+ 
+ echo "boolean operation program"
+@@ -12,9 +11,9 @@ if test ! -d ${HOME}/gdsuser ; then 
+    cp -r $GDSROOT/gdsuser $HOME
+ else
+    if test ! -f  ${HOME}/gdsuser/6.3_version ; then
+-        echo copying gdsuser to your HOME directory because the one there is too old
+-   	rm -r ${HOME}/gdsuser
+-	cp -r $GDSROOT/gdsuser $HOME
++        echo "The files in your $HOME/gdsuser directory are not recent enough."
++	echo "Please remove this directory and run this program again."
++	echo "A new set of files will be installed to $HOME/gdsuer."
+    fi	    
+ fi
+