3 files changed, 46 insertions, 3 deletions
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 4315ed0cc52..f27bfd9ffd2 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/05/21 15:57:42 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/06/26 09:24:09 rillig Exp $
 #
 
 DISTNAME=	boolean_6_7
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/boolean
 GCC_REQD+=	3.0
 
 USE_TOOLS+=	gmake pkg-config tar
-USE_LANGUAGES=	c++
+USE_LANGUAGES=	c c++
 
 INSTALLATION_DIRS=	bin
 
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo
index a9e6e1eec32..7eae3c1add3 100644
--- a/cad/boolean/distinfo
+++ b/cad/boolean/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/05/21 15:57:43 rillig Exp $
+$NetBSD: distinfo,v 1.9 2006/06/26 09:24:09 rillig Exp $
 
 SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3
 RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 19bf76826a67bd640451c558e8e36d830c23ebf5
 SHA1 (patch-ac) = a8973d02b73d13c0cf07d766324d33f5161b98aa
 SHA1 (patch-ad) = 5934a12e35d6977721c979557cf33bf069001443
 SHA1 (patch-ae) = c5b69b5f7f4732fa184d2bcf0359caeb67082693
+SHA1 (patch-af) = ca0f2ffeafd904fb3c65532a28f03d11a77078f6
diff --git a/cad/boolean/patches/patch-af b/cad/boolean/patches/patch-af
new file mode 100644
index 00000000000..cf015e70b27
--- /dev/null
+++ b/cad/boolean/patches/patch-af
@@ -0,0 +1,42 @@
+$NetBSD: patch-af,v 1.3 2006/06/26 09:24:09 rillig 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,6 +26,15 @@ FOREACH(file ${header_files})
+     SET( headerwithpath  ${headerwithpath} ${edit_SOURCE_DIR}/include/${file}  )
+ ENDFOREACH(file)   
+ 
++AUX_SOURCE_DIRECTORY( src/parser parser_src )
++AUX_SOURCE_DIRECTORY( src/tools tools_src )
++AUX_SOURCE_DIRECTORY( src/intrface intrface_src )
++AUX_SOURCE_DIRECTORY( src/misc misc_src )
++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_  )
+@@ -33,17 +42,9 @@ IF(WIN32)
+ 	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 ) 
++	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 )
+-AUX_SOURCE_DIRECTORY( src/misc misc_src )
+-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 )
+ 
+ LINK_LIBRARIES( kbool )
+