Index: head/devel/leatherman/files/patch-cmake_leatherman.cmake.in =================================================================== --- head/devel/leatherman/files/patch-cmake_leatherman.cmake.in (revision 448619) +++ head/devel/leatherman/files/patch-cmake_leatherman.cmake.in (revision 448620) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- cmake/leatherman.cmake.in.orig +++ cmake/leatherman.cmake.in @@ -83,11 +83,6 @@ RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) - foreach(ARG ${ARGV}) - if (TARGET ${ARG}) - set_target_properties(${ARG} PROPERTIES PREFIX "" IMPORT_PREFIX "") - endif() - endforeach() endmacro() # Usage: add_cppcheck_dirs(dir1 dir2) Index: head/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt =================================================================== --- head/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt (revision 448619) +++ head/devel/llvm-devel/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt (revision 448620) @@ -1,34 +1,31 @@ - -$FreeBSD$ - --- tools/clang/lib/Headers/CMakeLists.txt.orig +++ tools/clang/lib/Headers/CMakeLists.txt @@ -44,7 +44,6 @@ intrin.h inttypes.h iso646.h - limits.h lwpintrin.h lzcntintrin.h mm3dnow.h @@ -64,20 +63,12 @@ s390intrin.h shaintrin.h smmintrin.h - stdalign.h - stdarg.h - stdatomic.h - stdbool.h - stddef.h __stddef_max_align_t.h - stdint.h - stdnoreturn.h tbmintrin.h tgmath.h tmmintrin.h unwind.h vadefs.h - varargs.h vecintrin.h wmmintrin.h __wmmintrin_aes.h Index: head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake =================================================================== --- head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake (revision 448619) +++ head/sysutils/facter/files/patch-cmake_FindCPPHOCON.cmake (revision 448620) @@ -1,12 +1,9 @@ - -$FreeBSD$ - --- cmake/FindCPPHOCON.cmake.orig 2017-06-27 17:42:22 UTC +++ cmake/FindCPPHOCON.cmake @@ -1,5 +1,5 @@ include(FindDependency) -find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a") +find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "liblibcpp-hocon.so") include(FeatureSummary) set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon") Index: head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc (revision 448619) +++ head/sysutils/facter/files/patch-lib_src_facts_posix_cache.cc (revision 448620) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- lib/src/facts/posix/cache.cc.orig +++ lib/src/facts/posix/cache.cc @@ -3,7 +3,7 @@ namespace facter { namespace facts { namespace cache { std::string fact_cache_location() { - return "/opt/puppetlabs/facter/cache/cached_facts/"; + return "/var/facter/cache/cached_facts/"; } }}} // namespace facter::facts::cache Index: head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc (revision 448619) +++ head/sysutils/facter/files/patch-lib_src_facts_posix_collection.cc (revision 448620) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- lib/src/facts/posix/collection.cc.orig +++ lib/src/facts/posix/collection.cc @@ -29,6 +29,8 @@ directories.emplace_back("/opt/puppetlabs/facter/facts.d"); directories.emplace_back("/etc/facter/facts.d"); directories.emplace_back("/etc/puppetlabs/facter/facts.d"); + directories.emplace_back("%%PREFIX%%/etc/facter/facts.d"); + directories.emplace_back("%%PREFIX%%/etc/puppetlabs/facter/facts.d"); } return directories; } Index: head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc =================================================================== --- head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc (revision 448619) +++ head/sysutils/facter/files/patch-lib_src_util_config_posix_config.cc (revision 448620) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- lib/src/util/config/posix/config.cc.orig +++ lib/src/util/config/posix/config.cc @@ -7,6 +7,6 @@ } std::string default_config_location() { - return "/etc/puppetlabs/facter/facter.conf"; + return "%%PREFIX%%/etc/facter/facter.conf"; } }}} // namespace facter::util::config Index: head/x11-wm/cde/files/patch-programs_dtcm_dtcm_calendarA.c =================================================================== --- head/x11-wm/cde/files/patch-programs_dtcm_dtcm_calendarA.c (revision 448619) +++ head/x11-wm/cde/files/patch-programs_dtcm_dtcm_calendarA.c (revision 448620) @@ -1,16 +1,14 @@ -$FreeBSD$ - We don't use inetd-- that involves messing with inetd.conf. May as well just launch as a daemon, which also deals with rpcbind dependency. --- programs/dtcm/dtcm/calendarA.c.orig 2016-09-14 10:18:38 UTC +++ programs/dtcm/dtcm/calendarA.c @@ -2051,7 +2051,7 @@ error_open(Calendar *c) { set_message(c->message_text, buf); sprintf(buf, "%s\n%s: %s, %s: %s", catgets(c->DT_catd, 1, 91, - "rpc.cmsd is not responding for your user name.\nMake sure the inetd process is running and the entry\nin inetd.conf for rpc.cmsd is correct for your host."), + "rpc.cmsd is not responding for your user name.\nMake sure that rpc.cmsd is running and enabled\nin /etc/rc.conf (dtcms_enable=yes)."), nl_user, name, nl_host, host); Property changes on: head/x11-wm/cde/files/patch-programs_dtcm_dtcm_calendarA.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property