4 files changed, 51 insertions, 18 deletions

diff --git a/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake b/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
index 890bebe72368..e088f004b157 100644
--- a/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
+++ b/x11-toolkits/fltk-devel/files/patch-CMake_install.cmake
@@ -1,9 +1,18 @@
---- CMake/install.cmake.orig	2014-02-14 15:10:59.000000000 +0100
-+++ CMake/install.cmake	2014-02-14 15:11:07.000000000 +0100
-@@ -63,7 +63,7 @@
+--- CMake/install.cmake.orig	2014-09-27 02:41:06.000000000 +0200
++++ CMake/install.cmake	2014-10-08 14:32:55.000000000 +0200
+@@ -32,7 +32,7 @@
+ )
+ 
+ install(DIRECTORY ${FLTK_SOURCE_DIR}/FL
+-   DESTINATION include USE_SOURCE_PERMISSIONS
++   DESTINATION include/fltk-devel USE_SOURCE_PERMISSIONS
+    PATTERN ".svn" EXCLUDE
+ )
+ 
+@@ -75,7 +75,7 @@
     install(FILES
        ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man
-       DESTINATION ${PREFIX_MAN}/man${LEVEL}
+       DESTINATION man/man${LEVEL}
 -      RENAME ${FILE}.${LEVEL}
 +      RENAME ${FILE}-devel.${LEVEL}
     )
diff --git a/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake b/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake
new file mode 100644
index 000000000000..7d4494bcef99
--- /dev/null
+++ b/x11-toolkits/fltk-devel/files/patch-CMake_macros.cmake
@@ -0,0 +1,15 @@
+--- CMake/macros.cmake.orig	2014-10-08 14:15:49.000000000 +0200
++++ CMake/macros.cmake	2014-10-08 14:17:23.000000000 +0200
+@@ -65,9 +65,9 @@
+ 
+     install(TARGETS ${LIBRARY_NAME}
+         EXPORT FLTK-Targets
+-        RUNTIME DESTINATION bin
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
++        RUNTIME DESTINATION bin/fltk-devel
++        LIBRARY DESTINATION lib/fltk-devel
++        ARCHIVE DESTINATION lib/fltk-devel
+         )
+ 
+     list(APPEND FLTK_LIBRARIES "${LIBRARY_NAME}")
diff --git a/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake b/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake
index 295e93a0e435..d3fb3d636d58 100644
--- a/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake
+++ b/x11-toolkits/fltk-devel/files/patch-CMake_setup.cmake
@@ -1,15 +1,13 @@
---- CMake/setup.cmake.orig	2014-02-14 15:09:21.000000000 +0100
-+++ CMake/setup.cmake	2014-02-14 15:10:00.000000000 +0100
-@@ -56,6 +56,12 @@
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
- endif(APPLE)
+--- CMake/setup.cmake.orig	2014-10-08 14:16:19.000000000 +0200
++++ CMake/setup.cmake	2014-10-08 14:16:59.000000000 +0200
+@@ -58,8 +58,8 @@
+    set(FLTK_CONFIG_PATH FLTK/.framework/Resources/CMake)
+    set(FLTK_EXAMPLES_PATH share/fltk-examples)
+ else()
+-   set(FLTK_CONFIG_PATH lib/fltk)
+-   set(FLTK_EXAMPLES_PATH share/fltk-examples)
++   set(FLTK_CONFIG_PATH lib/fltk-devel)
++   set(FLTK_EXAMPLES_PATH share/examples/fltk-devel)
+ endif(WIN32 AND NOT CYGWIN)
  
-+if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
-+    set(HAVE_STRTOL 1)
-+    set(HAVE_STRCASECMP 1)
-+    set(HAVE_DIRENT_H 1)
-+endif()
-+
- if(WIN32)
-    if(MSVC)
-       add_definitions(-DWIN32_LEAN_AND_MEAN)
+ include(TestBigEndian)
diff --git a/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt b/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt
new file mode 100644
index 000000000000..d8a18b8d61aa
--- /dev/null
+++ b/x11-toolkits/fltk-devel/files/patch-fluid_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- fluid/CMakeLists.txt.orig	2014-10-08 14:22:45.000000000 +0200
++++ fluid/CMakeLists.txt	2014-10-08 14:23:33.000000000 +0200
+@@ -35,7 +35,7 @@
+ 
+ install(TARGETS fluid
+     EXPORT FLTK-Targets
+-    RUNTIME DESTINATION bin
++    RUNTIME DESTINATION bin/fltk-devel
+     LIBRARY DESTINATION lib
+     ARCHIVE DESTINATION lib
+     )