Update to 6.92. Clean up package. Fix build with gcc4.

version 6.9
Update for wxWidgets 2.6.2

11 files changed, 313 insertions, 383 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index c211ea3686f..1b0da78ec02 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2006/08/24 00:01:27 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.34 2007/02/23 16:42:30 wiz Exp $
 #
 
-DISTNAME=	boolean_6_7
-PKGNAME=	boolean-${REL}
-PKGREVISION=	3
+DISTNAME=	boolean_6_92
+PKGNAME=	boolean-6.92
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://www.xs4all.nl/~kholwerd/download/boolzip/
 EXTRACT_SUFX=	.zip
@@ -12,37 +11,21 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.xs4all.nl/~kholwerd/bool.html
 COMMENT=	GDSII viewer/editor + (boolean) operations on sets of 2d polygons
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
-REL=		6.7
-
-BUILD_DEPENDS+=	cmake>=1.6.6:../../devel/cmake
-
 WRKSRC=		${WRKDIR}/boolean
+# avoid lowercasing files
+EXTRACT_OPTS_ZIP=	-aqo
 
 GCC_REQD+=	3.0
-
 USE_TOOLS+=	gmake pkg-config tar
 USE_LANGUAGES=	c c++
 
-INSTALLATION_DIRS=	bin
+SUBST_CLASSES+=		prefix
+SUBST_FILES.prefix=	bin/boolean
+SUBST_SED.prefix=	-e 's;@prefix@;${PREFIX};g'
+SUBST_STAGE.prefix=	pre-configure
+SUBST_MESSAGE.prefix=	Fixing installation prefix.
 
-# the zip archive messes up the case of these files which breaks
-# cmake.
-post-extract:
-	set -e; \
-	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} ${WRKSRC}/bin/checkmsvc.cmake ${WRKSRC}/bin/CheckMSVC.cmake
-		${MV} ${WRKSRC}/bin/findpkgconfig.cmake ${WRKSRC}/bin/FindPkgConfig.cmake
-		${MV} ${WRKSRC}/bin/findwxwin.cmake ${WRKSRC}/bin/FindwxWin.cmake
-		${MV} ${WRKSRC}/bin/macros.cmake ${WRKSRC}/bin/Macros.cmake
-	${MV} -f ${WRKSRC}/bin/boolean ${WRKSRC}/bin/boolean.bak
-	${SED} 's;@prefix@;${PREFIX};g' ${WRKSRC}/bin/boolean.bak > \
-		${WRKSRC}/bin/boolean
-	${CP} -f ${WRKSRC}/apps/edit/include/valuesvc.h ${WRKSRC}/modules/kbool/include
+INSTALLATION_DIRS=	bin
 
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
@@ -51,12 +34,13 @@ do-configure:
 do-install:
 	${INSTALL_DATA_DIR}  ${PREFIX}/share/boolean
 	cd ${WRKSRC}/apps/edit						\
-	&& ${PAX} -rw default gdsuser ${PREFIX}/share/boolean
+		&& ${PAX} -rw default gdsuser ${PREFIX}/share/boolean
 	cd ${WRKSRC}/docs						\
-	&& ${PAX} -rw html ${PREFIX}/share/boolean
+		&& ${PAX} -rw html ${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 "../../devel/cmake/buildlink3.mk"
 .include "../../x11/wxGTK/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/boolean/PLIST b/cad/boolean/PLIST
index 2cb744b3745..25b1cd0ac39 100644
--- a/cad/boolean/PLIST
+++ b/cad/boolean/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/02/23 16:42:30 wiz Exp $
 bin/boolean
 bin/edit
 share/boolean/default/config/boolean.ad
@@ -12,6 +12,7 @@ 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/amsterdam.cal
 share/boolean/default/data/bbbb.key
 share/boolean/default/data/bbbb2.key
 share/boolean/default/data/bignext.cal
@@ -25,7 +26,9 @@ 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/cir2.key
 share/boolean/default/data/circ.key
+share/boolean/default/data/circ3.key
 share/boolean/default/data/circir.key
 share/boolean/default/data/circlerr.cal
 share/boolean/default/data/d1110118.cal
@@ -249,256 +252,256 @@ 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/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/classCircleTool-members.html
+share/boolean/html/classCircleTool.html
+share/boolean/html/classCircleTool.png
+share/boolean/html/classCircleditDialog-members.html
+share/boolean/html/classCircleditDialog.html
+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/classDeSelectTool-members.html
+share/boolean/html/classDeSelectTool.html
+share/boolean/html/classDeSelectTool.png
+share/boolean/html/classDeleteTool-members.html
+share/boolean/html/classDeleteTool.html
+share/boolean/html/classDeleteTool.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/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/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/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/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/classFactors-members.html
+share/boolean/html/classFactors.html
+share/boolean/html/classFillPatterns-members.html
+share/boolean/html/classFillPatterns.html
+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/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/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/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/classInsLayer-members.html
+share/boolean/html/classInsLayer.html
+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/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/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/classPolyeditDialog-members.html
+share/boolean/html/classPolyeditDialog.html
+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/classSLine-members.html
+share/boolean/html/classSLine.html
+share/boolean/html/classSLine.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/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/classTextTool-members.html
+share/boolean/html/classTextTool.html
+share/boolean/html/classTextTool.png
+share/boolean/html/classTextinsDialog-members.html
+share/boolean/html/classTextinsDialog.html
+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/classZoomTool-members.html
+share/boolean/html/classZoomTool.html
+share/boolean/html/classZoomTool.png
 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/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/cnchier_8h-source.html
 share/boolean/html/command_8h-source.html
 share/boolean/html/copylist_8h-source.html
@@ -598,4 +601,5 @@ share/boolean/html/wxwin_8h-source.html
 @dirrm share/boolean/default/data/democal
 @dirrm share/boolean/default/data
 @dirrm share/boolean/default/config
+@dirrm share/boolean/default
 @dirrm share/boolean
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index 28afee59d92..b7bd016dd2c 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.11 2006/09/23 14:08:10 joerg Exp $
+$NetBSD: distinfo,v 1.12 2007/02/23 16:42:30 wiz Exp $
 
-SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3
-RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d
-Size (boolean-6.7/boolean_6_7.zip) = 3841104 bytes
-SHA1 (patch-aa) = d2287a7271b7aa0a50b1ef9d87bf5e5ba8a6db6e
+SHA1 (boolean_6_92.zip) = c0b75d957186cb482b9a363984133e311f291c14
+RMD160 (boolean_6_92.zip) = efb5b5cd0237c5fe13cc994f89c5061b768fdd11
+Size (boolean_6_92.zip) = 4366947 bytes
+SHA1 (patch-aa) = 2bca0775e3f94bd53041c4083d9b85394bfbfae4
 SHA1 (patch-ab) = 19bf76826a67bd640451c558e8e36d830c23ebf5
-SHA1 (patch-ac) = a8973d02b73d13c0cf07d766324d33f5161b98aa
-SHA1 (patch-ad) = 5934a12e35d6977721c979557cf33bf069001443
-SHA1 (patch-ae) = c5b69b5f7f4732fa184d2bcf0359caeb67082693
-SHA1 (patch-af) = fbb16e2e2479239dc7ecffa28192b7d2811b0ba9
-SHA1 (patch-ag) = 7b3dbab4bff23f611b722b3ed8b8df3475e89c7f
+SHA1 (patch-ac) = 64f7c933057367364366d83f2388fc263aeb42bc
+SHA1 (patch-ah) = 7443745169170f2df6744706cc12a020bc5711af
+SHA1 (patch-ai) = 787bdae151487758891a2849992749dff00cf767
diff --git a/cad/boolean/patches/patch-aa b/cad/boolean/patches/patch-aa
index a070a4fd22c..a8b1b043182 100644
--- a/cad/boolean/patches/patch-aa
+++ b/cad/boolean/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2007/02/23 16:42:30 wiz Exp $
 
---- bin/boolean.orig	2005-03-04 14:23:04.000000000 +0000
-+++ bin/boolean	2005-08-11 12:11:15.000000000 +0000
-@@ -1,6 +1,5 @@
+--- bin/boolean.orig	2005-03-04 13:23:04.000000000 +0000
++++ bin/boolean
+@@ -1,7 +1,6 @@
  #! /bin/sh
 -PATH=/opt/protools/boolean/6.3/boolean/apps/edit:$PATH
  
@@ -10,7 +10,9 @@ $NetBSD: patch-aa,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $
 +GDSROOT=@prefix@/share/boolean
  export GDSROOT
  
-@@ -12,8 +11,8 @@
+ echo "boolean operation program"
+@@ -11,10 +10,10 @@ if test ! -d ${HOME}/gdsuser ; then 
+    echo copying gdsuser to your HOME directory, It can be used for personal settings
     cp -r $GDSROOT/gdsuser $HOME
  else
 -   if test ! -f  ${HOME}/gdsuser/6.3_version ; then
@@ -23,3 +25,4 @@ $NetBSD: patch-aa,v 1.3 2005/08/18 23:52:14 dmcmahill Exp $
 +	echo "A new set of files will be installed to $HOME/gdsuer."
     fi	    
  fi
+ 
diff --git a/cad/boolean/patches/patch-ac b/cad/boolean/patches/patch-ac
index 7148e273484..c4efbe7ba6b 100644
--- a/cad/boolean/patches/patch-ac
+++ b/cad/boolean/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2006/05/21 15:57:43 rillig Exp $
+$NetBSD: patch-ac,v 1.5 2007/02/23 16:42:30 wiz Exp $
 
 Don't define identifiers that are already macros.
 
---- modules/kbool/include/booleng.h.orig	Mon Jul 18 21:56:16 2005
-+++ modules/kbool/include/booleng.h	Sun Dec 18 20:56:07 2005
-@@ -56,8 +56,12 @@
+--- modules/kbool/include/booleng.h.orig	2005-11-28 13:32:50.000000000 +0000
++++ modules/kbool/include/booleng.h
+@@ -56,8 +56,12 @@ class KBoolLink;

  typedef long long B_INT;		   // 8 bytes integer

  //#define MAXB_INT LONG_LONG_MAX

  //#define MINB_INT LONG_LONG_MIN	// 8 bytes integer

diff --git a/cad/boolean/patches/patch-ad b/cad/boolean/patches/patch-ad
deleted file mode 100644
index 167405db6f7..00000000000
--- a/cad/boolean/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/05/21 15:57:43 rillig Exp $
-
---- modules/kbool/src/scanbeam.cpp.orig	2006-03-28 17:34:33.000000000 +0000
-+++ modules/kbool/src/scanbeam.cpp
-@@ -1417,3 +1417,9 @@
- 

-    return true;

- }

-+
-+#include "kbool/include/statusb.h"

-+
-+StatusBar::StatusBar()
-+{
-+}
diff --git a/cad/boolean/patches/patch-ae b/cad/boolean/patches/patch-ae
deleted file mode 100644
index 80becc77f56..00000000000
--- a/cad/boolean/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2006/05/21 15:57:43 rillig Exp $
-
---- modules/kbool/include/statusb.h.orig	2006-03-28 17:33:35.000000000 +0000
-+++ modules/kbool/include/statusb.h
-@@ -32,7 +32,7 @@
- {

- 	public:

- 		// constructor & destructor

--		StatusBar(){};

-+		StatusBar();

- 		~StatusBar(){};

- 

- 		virtual void	SetXY(double = 0.0, double = 0.0)=0;

diff --git a/cad/boolean/patches/patch-af b/cad/boolean/patches/patch-af
deleted file mode 100644
index 709dc8fdf5e..00000000000
--- a/cad/boolean/patches/patch-af
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/09/23 14:08:10 joerg Exp $
-
-Variables are referenced using $, not by plain text. Additionally, they
-should be defined before being used.
-
---- apps/edit/CMakeLists.txt.orig	2005-07-18 21:37:32.000000000 +0200
-+++ apps/edit/CMakeLists.txt	2006-06-26 11:13:47.000000000 +0200
-@@ -26,16 +26,6 @@ FOREACH(file ${header_files})

-     SET( headerwithpath  ${headerwithpath} ${edit_SOURCE_DIR}/include/${file}  )

- ENDFOREACH(file)   

- 

--IF(WIN32)

--    IF(NOT BORLAND)

--		ADD_DEFINITIONS( -D_MSWVC_  )

--    ENDIF(NOT BORLAND)  

--	ADD_EXECUTABLE( edit WIN32 parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src win32/boolean.rc ${headerwithpath} ) 

--ELSE(WIN32)

--    ADD_DEFINITIONS( -D__UNIX__  )

--	ADD_EXECUTABLE( edit  parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src ) 

--ENDIF(WIN32)	

--

- AUX_SOURCE_DIRECTORY( src/parser parser_src )

- AUX_SOURCE_DIRECTORY( src/tools tools_src )

- AUX_SOURCE_DIRECTORY( src/intrface intrface_src )

-@@ -44,9 +34,19 @@ AUX_SOURCE_DIRECTORY( src/list list_src 
- AUX_SOURCE_DIRECTORY( src/gdssourc gdssourc_src )

- AUX_SOURCE_DIRECTORY( src/drivers drivers_src )

- AUX_SOURCE_DIRECTORY( src/props prop_src )

-+
-+IF(WIN32)

-+    IF(NOT BORLAND)

-+		ADD_DEFINITIONS( -D_MSWVC_  )

-+    ENDIF(NOT BORLAND)  

-+	ADD_EXECUTABLE( edit WIN32 parser_src tools_src intrface_src misc_src list_src gdssourc_src drivers_src prop_src win32/boolean.rc ${headerwithpath} ) 

-+ELSE(WIN32)

-+    ADD_DEFINITIONS( -D__UNIX__  )

-+	ADD_EXECUTABLE( edit  ${parser_src} ${tools_src} ${intrface_src} ${misc_src} ${list_src} ${gdssourc_src} ${drivers_src} ${prop_src}) 

-+ENDIF(WIN32)	

- 

--LINK_LIBRARIES( kbool )

- 

- TARGET_LINK_LIBRARIES( edit  ${WXART2D_LIBS})

-+TARGET_LINK_LIBRARIES( edit  kbool)

- 

- 

diff --git a/cad/boolean/patches/patch-ag b/cad/boolean/patches/patch-ag
deleted file mode 100644
index 467543e10b0..00000000000
--- a/cad/boolean/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2006/08/30 07:28:26 joerg Exp $
-
---- modules/kbool/include/valuesvc.h.orig	2006-08-22 18:35:39.000000000 +0000
-+++ modules/kbool/include/valuesvc.h
-@@ -38,7 +38,7 @@
- 

- #else

- 

--#if defined(__NetBSD__)

-+#if defined(__NetBSD__) || defined(__DragonFly__)

- 

- #include <math.h>

- 

diff --git a/cad/boolean/patches/patch-ah b/cad/boolean/patches/patch-ah
new file mode 100644
index 00000000000..8e98183068f
--- /dev/null
+++ b/cad/boolean/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2007/02/23 16:42:31 wiz Exp $
+
+--- apps/edit/include/chandbas.h.orig	2005-03-04 14:20:52.000000000 +0000
++++ apps/edit/include/chandbas.h
+@@ -298,7 +298,7 @@ class CommandHandler

+       //!add files to the history

+       bool AddFileToHistory(const wxString& file,const wxString& type);

+       //!save the history files

+-      bool CommandHandler::SaveHistory();

++      bool SaveHistory();

+ 

+       //!the file history

+       //!holds some of the files that were loaded

diff --git a/cad/boolean/patches/patch-ai b/cad/boolean/patches/patch-ai
new file mode 100644
index 00000000000..037dbd947a7
--- /dev/null
+++ b/cad/boolean/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/02/23 16:42:31 wiz Exp $
+
+--- apps/edit/include/insdlg.h.orig	2005-03-04 14:21:00.000000000 +0000
++++ apps/edit/include/insdlg.h
+@@ -84,7 +84,7 @@ public:
+                         const wxPoint& pos,

+                         const wxSize& size, long style , MyBoolEdit* edit

+                  );

+-      void MyCheckBox::OnMouseEvent(wxMouseEvent& event);

++      void OnMouseEvent(wxMouseEvent& event);

+       DECLARE_EVENT_TABLE()
+       MyBoolEdit* m_edit;
+ };