diff options
| author | joerg <joerg@pkgsrc.org> | 2006-09-23 14:08:10 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-09-23 14:08:10 +0000 |
| commit | a8051c6c8e26c2a6af18494dfed1b4c1bac8c0d1 (patch) | |
| tree | 48688b5aaeee4b3237ebf4621de8400979f54928 /cad | |
| parent | 6caf254310a8b7210f144c3fd64977dc260fac8b (diff) | |
| download | pkgsrc-a8051c6c8e26c2a6af18494dfed1b4c1bac8c0d1.tar.gz | |
Fix build with newer cmake.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/boolean/distinfo | 4 | ||||
| -rw-r--r-- | cad/boolean/patches/patch-af | 59 |
2 files changed, 33 insertions, 30 deletions
diff --git a/cad/boolean/distinfo b/cad/boolean/distinfo index 76bcecca0ef..28afee59d92 100644 --- a/cad/boolean/distinfo +++ b/cad/boolean/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2006/08/30 07:28:26 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/09/23 14:08:10 joerg Exp $ SHA1 (boolean-6.7/boolean_6_7.zip) = c0d5dd7963e2f02be1ebe97eeddfb6a7377feaa3 RMD160 (boolean-6.7/boolean_6_7.zip) = 5a1a926dd130312ea8255576993b92f826b2e30d @@ -8,5 +8,5 @@ SHA1 (patch-ab) = 19bf76826a67bd640451c558e8e36d830c23ebf5 SHA1 (patch-ac) = a8973d02b73d13c0cf07d766324d33f5161b98aa SHA1 (patch-ad) = 5934a12e35d6977721c979557cf33bf069001443 SHA1 (patch-ae) = c5b69b5f7f4732fa184d2bcf0359caeb67082693 -SHA1 (patch-af) = ca0f2ffeafd904fb3c65532a28f03d11a77078f6 +SHA1 (patch-af) = fbb16e2e2479239dc7ecffa28192b7d2811b0ba9 SHA1 (patch-ag) = 7b3dbab4bff23f611b722b3ed8b8df3475e89c7f diff --git a/cad/boolean/patches/patch-af b/cad/boolean/patches/patch-af index cf015e70b27..709dc8fdf5e 100644 --- a/cad/boolean/patches/patch-af +++ b/cad/boolean/patches/patch-af @@ -1,42 +1,45 @@ -$NetBSD: patch-af,v 1.3 2006/06/26 09:24:09 rillig Exp $ +$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,6 +26,15 @@ FOREACH(file ${header_files}) +@@ -26,16 +26,6 @@ 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__ )
+-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)
++ENDIF(WIN32)
+
+-LINK_LIBRARIES( kbool )
--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 )
+ TARGET_LINK_LIBRARIES( edit ${WXART2D_LIBS})
++TARGET_LINK_LIBRARIES( edit kbool)
- LINK_LIBRARIES( kbool )
|