diff --git a/cmake/modules/KDevPlatformMacros.cmake b/cmake/modules/KDevPlatformMacros.cmake
index 8cb9b4429e..32da099496 100644
--- a/cmake/modules/KDevPlatformMacros.cmake
+++ b/cmake/modules/KDevPlatformMacros.cmake
@@ -1,174 +1,174 @@
 #
 # KDevelop Platform Macros
 #
 # The following macros are defined here:
 #
 #  KDEVPLATFORM_ADD_APP_TEMPLATES( template1 ... templateN )
 #    Use this to get packaged template archives for the given app templates.
 #    Parameters should be the directories containing the templates.
 
 #  KDEVPLATFORM_ADD_FILE_TEMPLATES( template1 ... templateN )
 #    Use this to get packaged template archives for the given file templates.
 #    Parameters should be the directories containing the templates.
 #
 # Copyright 2007 Andreas Pakulat <apaku@gmx.de>
 # Redistribution and use is allowed according to the terms of the BSD license.
 
 include(CMakeParseArguments)
 
 # creates a template archive from the given directory
 macro(kdevplatform_create_template_archive _templateName)
     get_filename_component(_tmp_file ${_templateName} ABSOLUTE)
     get_filename_component(_baseName ${_tmp_file} NAME_WE)
     if(WIN32)
         set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.zip)
     else()
         set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.tar.bz2)
     endif()
 
 
     file(GLOB _files "${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}/*")
     set(_deps)
     foreach(_file ${_files})
         get_filename_component(_fileName ${_file} NAME)
         string(COMPARE NOTEQUAL ${_fileName} .kdev_ignore _v1)
         string(REGEX MATCH "\\.svn" _v2 ${_fileName} )
         if(WIN32)
             string(REGEX MATCH "_svn" _v3 ${_fileName} )
         else()
             set(_v3 FALSE)
         endif()
         if ( _v1 AND NOT _v2 AND NOT _v3 )
             set(_deps ${_deps} ${_file})
         endif ( _v1 AND NOT _v2 AND NOT _v3 )
     endforeach(_file)
 
     add_custom_target(${_baseName} ALL DEPENDS ${_template})
 
     if(WIN32)
         add_custom_command(OUTPUT ${_template}
             COMMAND zip ARGS -r ${_template} . -x .svn _svn .kdev_ignore
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}
             DEPENDS ${_deps}
         )
     else()
 
-        if(APPLE)
+        if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
             add_custom_command(OUTPUT ${_template}
                 COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}
                     --exclude .kdev_ignore --exclude .svn --numeric-owner
                     -j -f ${_template} .
                 DEPENDS ${_deps}
             )
         else()
             add_custom_command(OUTPUT ${_template}
                 COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName}
                     --exclude .kdev_ignore --exclude .svn --owner=root --group=root --numeric-owner
                     -j -f ${_template} .
                 DEPENDS ${_deps}
             )
         endif()
 
     endif()
 
 
 endmacro(kdevplatform_create_template_archive _templateName)
 
 # package and install the given directory as a template archive
 macro(kdevplatform_add_template _installDirectory _templateName)
     kdevplatform_create_template_archive(${_templateName})
 
     get_filename_component(_tmp_file ${_templateName} ABSOLUTE)
     get_filename_component(_baseName ${_tmp_file} NAME_WE)
     if(WIN32)
         set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.zip)
     else()
         set(_template ${CMAKE_CURRENT_BINARY_DIR}/${_baseName}.tar.bz2)
     endif()
 
     install( FILES ${_template} DESTINATION ${_installDirectory})
     GET_DIRECTORY_PROPERTY(_tmp_DIR_PROPS ADDITIONAL_MAKE_CLEAN_FILES )
     list(APPEND _tmp_DIR_PROPS ${_template})
     SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${_tmp_DIR_PROPS}")
 endmacro(kdevplatform_add_template _installDirectory _templateName)
 
 macro(kdevplatform_add_app_templates _templateNames)
     foreach(_templateName ${ARGV})
         kdevplatform_add_template(${DATA_INSTALL_DIR}/kdevappwizard/templates ${_templateName})
     endforeach(_templateName ${ARGV}) 
 endmacro(kdevplatform_add_app_templates _templateNames)
 
 macro(kdevplatform_add_file_templates _templateNames)
     foreach(_templateName ${ARGV})
         kdevplatform_add_template(${DATA_INSTALL_DIR}/kdevfiletemplates/templates ${_templateName})
     endforeach(_templateName ${ARGV})
 endmacro(kdevplatform_add_file_templates _templateNames)
 
 function(kdevplatform_add_library target)
     set(options)
     set(oneValueArgs)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(KDEV_ADD_LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     string(REPLACE "KDevPlatform" "" shortTargetName ${target})
     if (${shortTargetName} STREQUAL ${target})
         message(FATAL_ERROR "Target passed to kdevplatform_add_library needs to start with \"KDevPlatform\", was \"${target}\"")
     endif()
 
     string(TOLOWER ${shortTargetName} shortTargetNameToLower)
 
     add_library(${target} ${KDEV_ADD_LIBRARY_SOURCES})
     add_library(KDev::${shortTargetName} ALIAS ${target})
 
     generate_export_header(${target} EXPORT_FILE_NAME ${shortTargetNameToLower}export.h)
 
     target_include_directories(${target} INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/kdevplatform>")
     set_target_properties(${target} PROPERTIES
         VERSION ${KDEVPLATFORM_LIB_VERSION}
         SOVERSION ${KDEVPLATFORM_LIB_SOVERSION}
         EXPORT_NAME ${shortTargetName}
     )
 
     install(TARGETS ${target} EXPORT KDevPlatformTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
     install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/${shortTargetNameToLower}export.h
         DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/${shortTargetNameToLower} COMPONENT Devel)
 endfunction()
 
 function(kdevplatform_add_plugin plugin)
     set(options SKIP_INSTALL)
     set(oneValueArgs JSON)
     set(multiValueArgs SOURCES)
     cmake_parse_arguments(KDEV_ADD_PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
     get_filename_component(json "${KDEV_ADD_PLUGIN_JSON}" REALPATH)
 
     list(LENGTH KDEV_ADD_PLUGIN_SOURCES src_count)
     if (NOT ${src_count} GREATER 0)
         message(FATAL_ERROR "kdevplatform_add_plugin() called without passing any source files. Please uses the SOURCES parameter.")
     endif()
 
     # ensure we recompile the corresponding object files when the json file changes
     set(dependent_sources )
     foreach(source ${KDEV_ADD_PLUGIN_SOURCES})
         get_filename_component(source "${source}" REALPATH)
         if(EXISTS "${source}")
             file(STRINGS "${source}" match REGEX "K_PLUGIN_FACTORY_WITH_JSON")
             if(match)
                 list(APPEND dependent_sources "${source}")
             endif()
         endif()
     endforeach()
     if(NOT dependent_sources)
         # fallback to all sources - better safe than sorry...
         set(dependent_sources ${KDEV_ADD_PLUGIN_SOURCES})
     endif()
     set_property(SOURCE ${dependent_sources} APPEND PROPERTY OBJECT_DEPENDS ${json})
 
     add_library(${plugin} MODULE ${KDEV_ADD_PLUGIN_SOURCES})
     set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json})
 
     if (NOT KDEV_ADD_PLUGIN_SKIP_INSTALL)
         install(TARGETS ${plugin} DESTINATION ${PLUGIN_INSTALL_DIR}/kdevplatform/${KDEV_PLUGIN_VERSION})
     endif()
 endfunction()