@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2014/05/16 01:21:12 pho Exp $
+$NetBSD: distinfo,v 1.3 2014/05/16 12:51:24 wiz Exp $
 
 SHA1 (graphite2-1.2.4.tgz) = 5b3a907fee3ce0c6efcc2b31d0d98939ec031b7d
 RMD160 (graphite2-1.2.4.tgz) = a4adc89befc86a9adcab3b0dbd6caf2ac3866fb4
 Size (graphite2-1.2.4.tgz) = 6938866 bytes
 SHA1 (patch-Graphite.cmake) = 32cab319afa56ecb5f379e4097fe9059a89d2b59
-SHA1 (patch-src_CMakeLists.txt) = 4ea7c6f237f05334dffd09b33edf2ab00ee1059a
+SHA1 (patch-src_CMakeLists.txt) = 31f9f7d4751f4a95e0567120aa232dca68029d37

@@ -1,4 +1,4 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2014/05/16 01:21:12 pho Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2014/05/16 12:51:24 wiz Exp $
 
 Don't pass -nodefaultlibs to compiler or the build fails for missing
 symbols on PowerPC and possibly other platforms. I can't see any
@@ -18,7 +18,17 @@
          LINKER_LANGUAGE C)
      if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
          target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
-@@ -133,7 +133,7 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Li
+@@ -123,28 +123,27 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
+         else (GRAPHITE2_ASAN)
+             target_link_libraries(graphite2 c gcc)
+         endif (GRAPHITE2_ASAN)
+-        include(Graphite)
+         nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     endif (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+-    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ 
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
      set_target_properties(graphite2 PROPERTIES 
          COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
@@ -26,4 +36,18 @@
 +        LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}" 
          LINKER_LANGUAGE C)
      target_link_libraries(graphite2 c)
-     include(Graphite)
+-    include(Graphite)
+     nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+-    CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+ 
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+     set_target_properties(graphite2 PROPERTIES 
+         COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
++else  (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
++include(Graphite)
++CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ 
+