Index: head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp =================================================================== --- head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp (revision 440938) +++ head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp (revision 440939) @@ -1,11 +1,10 @@ -$FreeBSD$ --- src/vsp_graphic/src/Scene.cpp.orig 2017-01-09 21:50:15 UTC +++ src/vsp_graphic/src/Scene.cpp @@ -15,6 +15,7 @@ #include "ByteOperationUtil.h" #include +#include namespace VSPGraphic { Property changes on: head/cad/openvsp/files/patch-src_vsp__graphic_src_Scene.cpp ___________________________________________________________________ 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 Index: head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp =================================================================== --- head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp (revision 440938) +++ head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp (revision 440939) @@ -1,10 +1,9 @@ -$FreeBSD$ --- src/vsp_graphic/src/Shader.cpp.orig 2017-01-08 05:14:57 UTC +++ src/vsp_graphic/src/Shader.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "Shader.h" Property changes on: head/cad/openvsp/files/patch-src_vsp__graphic_src_Shader.cpp ___________________________________________________________________ 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 Index: head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp =================================================================== --- head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp (revision 440938) +++ head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp (revision 440939) @@ -1,11 +1,10 @@ -$FreeBSD$ --- src/vsp_graphic/src/VBO.cpp.orig 2017-01-08 05:14:57 UTC +++ src/vsp_graphic/src/VBO.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "VBO.h" Property changes on: head/cad/openvsp/files/patch-src_vsp__graphic_src_VBO.cpp ___________________________________________________________________ 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 Index: head/databases/neo4j/files/patch-bin-neo4j-shared-sh =================================================================== --- head/databases/neo4j/files/patch-bin-neo4j-shared-sh (revision 440938) +++ head/databases/neo4j/files/patch-bin-neo4j-shared-sh (revision 440939) @@ -1,29 +1,27 @@ -$FreeBSD$ - --- bin/neo4j-shared.sh.orig 2016-08-25 00:54:03.496139435 +0100 +++ bin/neo4j-shared.sh 2016-08-25 01:02:34.689503862 +0100 @@ -124,7 +124,7 @@ if [[ -z "${NEO4J_HOME:-}" ]]; then NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)" fi - : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}" + export NEO4J_CONF=%%PREFIX%%/etc readonly NEO4J_HOME NEO4J_CONF } @@ -159,10 +159,10 @@ } _setup_configurable_paths() { - NEO4J_DATA=$(resolve_path "${dbms_directories_data:-data}") - NEO4J_LIB=$(resolve_path "${dbms_directories_lib:-lib}") - NEO4J_LOGS=$(resolve_path "${dbms_directories_logs:-logs}") - NEO4J_PLUGINS=$(resolve_path "${dbms_directories_plugins:-plugins}") - NEO4J_RUN=$(resolve_path "${dbms_directories_run:-run}") + export NEO4J_DATA=%%DATADIR%% + export NEO4J_LIB=%%PREFIX%%/lib/neo4j + export NEO4J_LOGS=/var/log/neo4j + export NEO4J_PLUGINS=${NEO4J_LIB}/plugins + export NEO4J_RUN=/var/run readonly NEO4J_DATA NEO4J_LIB NEO4J_LOGS NEO4J_PLUGINS NEO4J_RUN } Property changes on: head/databases/neo4j/files/patch-bin-neo4j-shared-sh ___________________________________________________________________ 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 Index: head/databases/neo4j/files/patch-conf-neo4j-conf =================================================================== --- head/databases/neo4j/files/patch-conf-neo4j-conf (revision 440938) +++ head/databases/neo4j/files/patch-conf-neo4j-conf (revision 440939) @@ -1,17 +1,15 @@ -$FreeBSD$ - --- conf/neo4j.conf.orig 2016-08-25 02:30:25.057742736 +0100 +++ conf/neo4j.conf 2016-08-25 02:32:53.932724521 +0100 @@ -6,9 +6,9 @@ #dbms.active_database=graph.db # Paths of directories in the installation. -#dbms.directories.data=data -#dbms.directories.plugins=plugins -#dbms.directories.certificates=certificates +dbms.directories.data=%%DATADIR%% +dbms.directories.plugins=%%PREFIX%%/lib/neo4j/plugins +dbms.directories.certificates=%%PREFIX%%/etc/neo4j-certificates # This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or uncomment it to # allow files to be loaded from anywhere in filesystem; this introduces possible security problems. See the `LOAD CSV` Property changes on: head/databases/neo4j/files/patch-conf-neo4j-conf ___________________________________________________________________ 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 Index: head/devel/dbus-sharp/files/patch-src_Transports_UnixNativeTransport.cs =================================================================== --- head/devel/dbus-sharp/files/patch-src_Transports_UnixNativeTransport.cs (revision 440938) +++ head/devel/dbus-sharp/files/patch-src_Transports_UnixNativeTransport.cs (revision 440939) @@ -1,31 +1,28 @@ - -$FreeBSD$ - --- src/Transports/UnixNativeTransport.cs.orig 2014-06-24 17:10:54 UTC +++ src/Transports/UnixNativeTransport.cs @@ -94,10 +94,8 @@ namespace DBus.Transports byte[] sa = new byte[2 + p.Length + 1]; - //we use BitConverter to stay endian-safe - byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX); - sa[0] = afData[0]; - sa[1] = afData[1]; + sa[0] = (byte) sa.Length; + sa[1] = 1; /* AF_UNIX */ for (int i = 0 ; i != p.Length ; i++) sa[2 + i] = p[i]; @@ -112,10 +110,8 @@ namespace DBus.Transports byte[] sa = new byte[2 + 1 + p.Length]; - //we use BitConverter to stay endian-safe - byte[] afData = BitConverter.GetBytes (UnixSocket.AF_UNIX); - sa[0] = afData[0]; - sa[1] = afData[1]; + sa[0] = (byte) sa.Length; + sa[1] = 1; /* AF_UNIX */ sa[2] = 0; //null prefix for abstract domain socket addresses, see unix(7) for (int i = 0 ; i != p.Length ; i++) Index: head/devel/debugedit/files/patch-Makefile =================================================================== --- head/devel/debugedit/files/patch-Makefile (revision 440938) +++ head/devel/debugedit/files/patch-Makefile (revision 440939) @@ -1,12 +1,9 @@ - -$FreeBSD$ - --- Makefile.orig 2017-04-11 06:09:46 UTC +++ Makefile @@ -1,5 +1,5 @@ CC?=gcc -CFLAGS+=-lelf -lpopt -Wall +CFLAGS+=-lelf -lpopt -Wall -I${LOCALBASE}/include -L${LOCALBASE}/lib SOURCES=debugedit.c hashtab.c OBJECTS=$(SOURCES:.c=.o) EXECUTABLE=debugedit Index: head/devel/llvm-devel/files/openmp-patch-tools_openmp_libomptarget_CMakeLists.txt =================================================================== --- head/devel/llvm-devel/files/openmp-patch-tools_openmp_libomptarget_CMakeLists.txt (revision 440938) +++ head/devel/llvm-devel/files/openmp-patch-tools_openmp_libomptarget_CMakeLists.txt (revision 440939) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- runtimes/openmp/libomptarget/CMakeLists.txt.orig +++ runtimes/openmp/libomptarget/CMakeLists.txt @@ -94,7 +94,6 @@ # Build libomptarget library with libdl dependency. add_library(omptarget SHARED ${src_files}) target_link_libraries(omptarget - dl "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports") # Install libomptarget under the lib destination folder. Property changes on: head/devel/llvm-devel/files/openmp-patch-tools_openmp_libomptarget_CMakeLists.txt ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -x \ No newline at end of property +yes \ No newline at end of property Index: head/devel/llvm34/files/patch-svn-219512 =================================================================== --- head/devel/llvm34/files/patch-svn-219512 (revision 440938) +++ head/devel/llvm34/files/patch-svn-219512 (revision 440939) @@ -1,62 +1,61 @@ -$FreeBSD$ ------------------------------------------------------------------------ r219512 | hfinkel | 2014-10-10 17:06:20 +0000 (Fri, 10 Oct 2014) | 10 lines [MiSched] Fix a logic error in tryPressure() Fixes a logic error in the MachineScheduler found by Steve Montgomery (and confirmed by Andy). This has gone unfixed for months because the fix has been found to introduce some small performance regressions. However, Andy has recommended that, at this point, we fix this to avoid further dependence on the incorrect behavior (and then follow-up separately on any regressions), and I agree. Fixes PR18883. ------------------------------------------------------------------------ Index: lib/CodeGen/MachineScheduler.cpp =================================================================== --- lib/CodeGen/MachineScheduler.cpp (revision 219511) +++ lib/CodeGen/MachineScheduler.cpp (revision 219512) @@ -2495,8 +2495,8 @@ } // If one candidate decreases and the other increases, go with it. // Invalid candidates have UnitInc==0. - if (tryLess(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand, - Reason)) { + if (tryGreater(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand, + Reason)) { return true; } // If the candidates are decreasing pressure, reverse priority. #Index: test/CodeGen/X86/ragreedy-last-chance-recoloring.ll #=================================================================== #--- test/CodeGen/X86/ragreedy-last-chance-recoloring.ll (revision 219511) #+++ test/CodeGen/X86/ragreedy-last-chance-recoloring.ll (revision 219512) #@@ -2,10 +2,12 @@ # ; Without the last chance recoloring, this test fails with: # ; "ran out of registers". # #-; RUN: not llc -regalloc=greedy -relocation-model=pic -lcr-max-depth=0 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEPTH #+; NOTE: With the fix to PR18883, we don't actually run out of registers here #+; any more, and so those checks are disabled. This test remains only for general coverage. #+; XXX: not llc -regalloc=greedy -relocation-model=pic -lcr-max-depth=0 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEPTH # ; Test whether failure due to cutoff for depth is reported # #-; RUN: not llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-INTERF #+; XXX: not llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-INTERF # ; Test whether failure due to cutoff for interference is reported # # ; RUN: llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 -lcr-max-depth=0 -exhaustive-register-search < %s > %t 2>&1 #Index: test/CodeGen/X86/misched-matmul.ll #=================================================================== #--- test/CodeGen/X86/misched-matmul.ll (revision 219511) #+++ test/CodeGen/X86/misched-matmul.ll (revision 219512) #@@ -10,7 +10,7 @@ # ; more complex cases. # ; # ; CHECK: @wrap_mul4 #-; CHECK: 22 regalloc - Number of spills inserted #+; CHECK: 23 regalloc - Number of spills inserted # # define void @wrap_mul4(double* nocapture %Out, [4 x double]* nocapture %A, [4 x double]* nocapture %B) #0 { # entry: Index: head/devel/llvm35/files/patch-svn-218295 =================================================================== --- head/devel/llvm35/files/patch-svn-218295 (revision 440938) +++ head/devel/llvm35/files/patch-svn-218295 (revision 440939) @@ -1,21 +1,20 @@ -$FreeBSD$ ------------------------------------------------------------------------ r218295 | akirtzidis | 2014-09-23 08:06:43 +0200 (Tue, 23 Sep 2014) | 2 lines [ADT/IntrusiveRefCntPtr] Give friend access to IntrusiveRefCntPtr so the relevant move constructor can access 'Obj'. ------------------------------------------------------------------------ Index: include/llvm/ADT/IntrusiveRefCntPtr.h =================================================================== --- include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218294) +++ include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218295) @@ -197,6 +197,9 @@ public: private: void retain() { if (Obj) IntrusiveRefCntPtrInfo::retain(Obj); } void release() { if (Obj) IntrusiveRefCntPtrInfo::release(Obj); } + + template + friend class IntrusiveRefCntPtr; }; template Index: head/devel/llvm35/files/patch-svn-219512 =================================================================== --- head/devel/llvm35/files/patch-svn-219512 (revision 440938) +++ head/devel/llvm35/files/patch-svn-219512 (revision 440939) @@ -1,62 +1,61 @@ -$FreeBSD$ ------------------------------------------------------------------------ r219512 | hfinkel | 2014-10-10 17:06:20 +0000 (Fri, 10 Oct 2014) | 10 lines [MiSched] Fix a logic error in tryPressure() Fixes a logic error in the MachineScheduler found by Steve Montgomery (and confirmed by Andy). This has gone unfixed for months because the fix has been found to introduce some small performance regressions. However, Andy has recommended that, at this point, we fix this to avoid further dependence on the incorrect behavior (and then follow-up separately on any regressions), and I agree. Fixes PR18883. ------------------------------------------------------------------------ Index: lib/CodeGen/MachineScheduler.cpp =================================================================== --- lib/CodeGen/MachineScheduler.cpp (revision 219511) +++ lib/CodeGen/MachineScheduler.cpp (revision 219512) @@ -2495,8 +2495,8 @@ } // If one candidate decreases and the other increases, go with it. // Invalid candidates have UnitInc==0. - if (tryLess(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand, - Reason)) { + if (tryGreater(TryP.getUnitInc() < 0, CandP.getUnitInc() < 0, TryCand, Cand, + Reason)) { return true; } // If the candidates are decreasing pressure, reverse priority. #Index: test/CodeGen/X86/ragreedy-last-chance-recoloring.ll #=================================================================== #--- test/CodeGen/X86/ragreedy-last-chance-recoloring.ll (revision 219511) #+++ test/CodeGen/X86/ragreedy-last-chance-recoloring.ll (revision 219512) #@@ -2,10 +2,12 @@ # ; Without the last chance recoloring, this test fails with: # ; "ran out of registers". # #-; RUN: not llc -regalloc=greedy -relocation-model=pic -lcr-max-depth=0 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEPTH #+; NOTE: With the fix to PR18883, we don't actually run out of registers here #+; any more, and so those checks are disabled. This test remains only for general coverage. #+; XXX: not llc -regalloc=greedy -relocation-model=pic -lcr-max-depth=0 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-DEPTH # ; Test whether failure due to cutoff for depth is reported # #-; RUN: not llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-INTERF #+; XXX: not llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 < %s 2>&1 | FileCheck %s --check-prefix=CHECK-INTERF # ; Test whether failure due to cutoff for interference is reported # # ; RUN: llc -regalloc=greedy -relocation-model=pic -lcr-max-interf=1 -lcr-max-depth=0 -exhaustive-register-search < %s > %t 2>&1 #Index: test/CodeGen/X86/misched-matmul.ll #=================================================================== #--- test/CodeGen/X86/misched-matmul.ll (revision 219511) #+++ test/CodeGen/X86/misched-matmul.ll (revision 219512) #@@ -10,7 +10,7 @@ # ; more complex cases. # ; # ; CHECK: @wrap_mul4 #-; CHECK: 22 regalloc - Number of spills inserted #+; CHECK: 23 regalloc - Number of spills inserted # # define void @wrap_mul4(double* nocapture %Out, [4 x double]* nocapture %A, [4 x double]* nocapture %B) #0 { # entry: Index: head/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer =================================================================== --- head/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440938) +++ head/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440939) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig +++ tools/clang/tools/scan-build/libexec/ccc-analyzer @@ -81,6 +81,9 @@ if (-x "/usr/bin/xcrun") { $UseXCRUN = 1; } +} elsif (`uname -s` eq "FreeBSD\n") { + $DefaultCCompiler = 'cc'; + $DefaultCXXCompiler = 'c++'; } else { $DefaultCCompiler = 'gcc'; $DefaultCXXCompiler = 'g++'; Index: head/devel/llvm39/files/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td =================================================================== --- head/devel/llvm39/files/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td (revision 440938) +++ head/devel/llvm39/files/clang-patch-tools_clang_include_clang_Basic_DiagnosticSemaKinds.td (revision 440939) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- tools/clang/include/clang/Basic/DiagnosticSemaKinds.td.orig +++ tools/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -3180,6 +3180,9 @@ def note_ovl_candidate_inherited_constructor : Note< "constructor from base class %0 inherited here">; +def note_ovl_candidate_inherited_constructor_slice : Note< + "candidate %select{constructor|template}0 ignored: " + "inherited constructor cannot be used to %select{copy|move}1 object">; def note_ovl_candidate_illegal_constructor : Note< "candidate %select{constructor|template}0 ignored: " "instantiation %select{takes|would take}0 its own class type by value">; Index: head/devel/llvm39/files/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp =================================================================== --- head/devel/llvm39/files/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp (revision 440938) +++ head/devel/llvm39/files/clang-patch-tools_clang_lib_Sema_SemaOverload.cpp (revision 440939) @@ -1,52 +1,49 @@ - -$FreeBSD$ - --- tools/clang/lib/Sema/SemaOverload.cpp.orig +++ tools/clang/lib/Sema/SemaOverload.cpp @@ -5783,6 +5783,28 @@ Candidate.FailureKind = ovl_fail_illegal_constructor; return; } + + // C++ [over.match.funcs]p8: (proposed DR resolution) + // A constructor inherited from class type C that has a first parameter + // of type "reference to P" (including such a constructor instantiated + // from a template) is excluded from the set of candidate functions when + // constructing an object of type cv D if the argument list has exactly + // one argument and D is reference-related to P and P is reference-related + // to C. + auto *Shadow = dyn_cast(FoundDecl.getDecl()); + if (Shadow && Args.size() == 1 && Constructor->getNumParams() >= 1 && + Constructor->getParamDecl(0)->getType()->isReferenceType()) { + QualType P = Constructor->getParamDecl(0)->getType()->getPointeeType(); + QualType C = Context.getRecordType(Constructor->getParent()); + QualType D = Context.getRecordType(Shadow->getParent()); + SourceLocation Loc = Args.front()->getExprLoc(); + if ((Context.hasSameUnqualifiedType(P, C) || IsDerivedFrom(Loc, P, C)) && + (Context.hasSameUnqualifiedType(D, P) || IsDerivedFrom(Loc, D, P))) { + Candidate.Viable = false; + Candidate.FailureKind = ovl_fail_inhctor_slice; + return; + } + } } unsigned NumParams = Proto->getNumParams(); @@ -9750,6 +9772,17 @@ case ovl_fail_enable_if: return DiagnoseFailedEnableIfAttr(S, Cand); + case ovl_fail_inhctor_slice: + // It's generally not interesting to note copy/move constructors here. + if (cast(Fn)->isCopyOrMoveConstructor()) + return; + S.Diag(Fn->getLocation(), + diag::note_ovl_candidate_inherited_constructor_slice) + << (Fn->getPrimaryTemplate() ? 1 : 0) + << Fn->getParamDecl(0)->getType()->isRValueReferenceType(); + MaybeEmitInheritedConstructorNote(S, Cand->FoundDecl); + return; + case ovl_fail_addr_not_available: { bool Available = checkAddressOfCandidateIsAvailable(S, Cand->Function); (void)Available; Index: head/devel/llvm39/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer =================================================================== --- head/devel/llvm39/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440938) +++ head/devel/llvm39/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440939) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig +++ tools/clang/tools/scan-build/libexec/ccc-analyzer @@ -81,6 +81,9 @@ if (-x "/usr/bin/xcrun") { $UseXCRUN = 1; } +} elsif (`uname -s` eq "FreeBSD\n") { + $DefaultCCompiler = 'cc'; + $DefaultCXXCompiler = 'c++'; } else { $DefaultCCompiler = 'gcc'; $DefaultCXXCompiler = 'g++'; Index: head/devel/llvm39/files/config-patch-tools_clang_include_clang_Sema_Overload.h =================================================================== --- head/devel/llvm39/files/config-patch-tools_clang_include_clang_Sema_Overload.h (revision 440938) +++ head/devel/llvm39/files/config-patch-tools_clang_include_clang_Sema_Overload.h (revision 440939) @@ -1,18 +1,15 @@ - -$FreeBSD$ - --- tools/clang/include/clang/Sema/Overload.h.orig +++ tools/clang/include/clang/Sema/Overload.h @@ -586,7 +586,11 @@ ovl_fail_enable_if, /// This candidate was not viable because its address could not be taken. - ovl_fail_addr_not_available + ovl_fail_addr_not_available, + + /// This inherited constructor is not viable because it would slice the + /// argument. + ovl_fail_inhctor_slice, }; /// OverloadCandidate - A single candidate in an overload set (C++ 13.3). Index: head/devel/llvm40/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer =================================================================== --- head/devel/llvm40/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440938) +++ head/devel/llvm40/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer (revision 440939) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig +++ tools/clang/tools/scan-build/libexec/ccc-analyzer @@ -81,6 +81,9 @@ if (-x "/usr/bin/xcrun") { $UseXCRUN = 1; } +} elsif (`uname -s` eq "FreeBSD\n") { + $DefaultCCompiler = 'cc'; + $DefaultCXXCompiler = 'c++'; } else { $DefaultCCompiler = 'gcc'; $DefaultCXXCompiler = 'g++'; Index: head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt =================================================================== --- head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt (revision 440938) +++ head/devel/llvm40/files/patch-tools_llvm-shlib_CMakeLists.txt (revision 440939) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- tools/llvm-shlib/CMakeLists.txt.orig +++ tools/llvm-shlib/CMakeLists.txt @@ -37,7 +37,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) list(REMOVE_DUPLICATES LIB_NAMES) -if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf" +if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly") OR MINGW) # FIXME: It should be "GNU ld for elf" # GNU ld doesn't resolve symbols in the version script. set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") Index: head/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj =================================================================== --- head/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj (revision 440938) +++ head/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj (revision 440939) @@ -1,35 +1,32 @@ - -$FreeBSD$ - --- Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj.orig +++ Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj @@ -141,25 +141,25 @@ plugin-22.png - plugin-22.png + plugin-22@2x.png plugin-22~dark.png - plugin-22~dark.png + plugin-22~dark@2x.png plugin-22~sel.png - plugin-22~sel.png + plugin-22~sel@2x.png plugin-22~dark~sel.png - plugin-22~dark~sel.png + plugin-22~dark~sel@2x.png plugin-32.png Index: head/games/gbrainy/files/patch-configure =================================================================== --- head/games/gbrainy/files/patch-configure (revision 440938) +++ head/games/gbrainy/files/patch-configure (revision 440939) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- configure.orig +++ configure @@ -13674,8 +13674,8 @@ for i in $needed_assemblies; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i.dll" >&5 $as_echo_n "checking for $i.dll... " >&6; } - if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0/$i.dll \); then - if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/4.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/4.0/$i.dll \); then + if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0-api/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0-api/$i.dll \); then + if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/4.0-api/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/4.0-api/$i.dll \); then as_fn_error $? "missing required mono 2.0/4.0 DLL: $i.dll" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 Index: head/lang/clang35/files/patch-svn-218295 =================================================================== --- head/lang/clang35/files/patch-svn-218295 (revision 440938) +++ head/lang/clang35/files/patch-svn-218295 (revision 440939) @@ -1,21 +1,20 @@ -$FreeBSD$ ------------------------------------------------------------------------ r218295 | akirtzidis | 2014-09-23 08:06:43 +0200 (Tue, 23 Sep 2014) | 2 lines [ADT/IntrusiveRefCntPtr] Give friend access to IntrusiveRefCntPtr so the relevant move constructor can access 'Obj'. ------------------------------------------------------------------------ Index: include/llvm/ADT/IntrusiveRefCntPtr.h =================================================================== --- include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218294) +++ include/llvm/ADT/IntrusiveRefCntPtr.h (revision 218295) @@ -197,6 +197,9 @@ public: private: void retain() { if (Obj) IntrusiveRefCntPtrInfo::retain(Obj); } void release() { if (Obj) IntrusiveRefCntPtrInfo::release(Obj); } + + template + friend class IntrusiveRefCntPtr; }; template Index: head/multimedia/banshee/files/patch-configure =================================================================== --- head/multimedia/banshee/files/patch-configure (revision 440938) +++ head/multimedia/banshee/files/patch-configure (revision 440939) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- configure.orig +++ configure @@ -15696,8 +15696,8 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mono 2.0 GAC for $asm.dll" >&5 $as_echo_n "checking for Mono 2.0 GAC for $asm.dll... " >&6; } if test \ - -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/$asm.dll" -o \ - -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/$asm.dll"; \ + -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0-api/$asm.dll" -o \ + -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0-api/$asm.dll"; \ then \ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } Index: head/multimedia/zoneminder/files/patch-src_zm__logger.cpp =================================================================== --- head/multimedia/zoneminder/files/patch-src_zm__logger.cpp (revision 440938) +++ head/multimedia/zoneminder/files/patch-src_zm__logger.cpp (revision 440939) @@ -1,22 +1,20 @@ -$FreeBSD$ - --- src/zm_logger.cpp +++ src/zm_logger.cpp @@ -504,7 +504,8 @@ va_list argPtr; struct timeval timeVal; - const char * const file = basename(filepath); + char *filecopy = strdup(filepath); + const char * const file = basename(filecopy); if ( level < PANIC || level > DEBUG9 ) Panic( "Invalid logger level %d", level ); @@ -624,6 +625,8 @@ abort(); exit( -1 ); } + + free(filecopy); } } Property changes on: head/multimedia/zoneminder/files/patch-src_zm__logger.cpp ___________________________________________________________________ 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 Index: head/net/radvd/files/patch-device-bsd44.c =================================================================== --- head/net/radvd/files/patch-device-bsd44.c (revision 440938) +++ head/net/radvd/files/patch-device-bsd44.c (revision 440939) @@ -1,30 +1,27 @@ - -$FreeBSD$ - --- device-bsd44.c.orig 2015-11-19 13:58:52 UTC +++ device-bsd44.c @@ -116,6 +116,24 @@ int update_device_info(int sock, struct int setup_allrouters_membership(int sock, struct Interface *iface) { + struct ipv6_mreq mreq; + + memset(&mreq, 0, sizeof(mreq)); + mreq.ipv6mr_interface = iface->props.if_index; + + /* all-routers multicast address */ + if (inet_pton(AF_INET6, "ff02::2", + &mreq.ipv6mr_multiaddr.s6_addr) != 1) { + flog(LOG_ERR, "inet_pton failed"); + return (-1); + } + + if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, + &mreq, sizeof(mreq)) < 0) { + flog(LOG_ERR, "can't join ipv6-allrouters on %s", iface->props.name); + return (-1); + } + return 0; } Index: head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt =================================================================== --- head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt (revision 440938) +++ head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt (revision 440939) @@ -1,102 +1,99 @@ - -$FreeBSD$ - --- src/CMakeLists.txt.orig 2016-06-22 05:22:26 UTC +++ src/CMakeLists.txt @@ -27,6 +27,13 @@ project(FastNetMon) set (FASTNETMON_VERSION_MAJOR 1) set (FASTNETMON_VERSION_MINOR 1) +# Respect PREFIX variable in FreeBSD +if($ENV{PREFIX}) + set(PREFIX $ENV{PREFIX}) +else() + set(PREFIX "/usr/local") +endif() + if (ENABLE_GOBGP_SUPPORT) # We could not compile gRPC without C++ 11 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") @@ -59,12 +66,14 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL message(STATUS "C++ compilation flags: ${CMAKE_CXX_FLAGS_RELEASE}") -set(HIREDIS_CUSTOM_INSTALL_PATH "/opt/libhiredis_0_13") -set(LOG4CPP_CUSTOM_INSTALL_PATH "/opt/log4cpp1.1.1") -set(JSONC_CUSTOM_INSTALL_PATH "/opt/json-c-0.12") -set(PFRING_CUSTOM_INSTALL_PATH "/opt/pf_ring_6.0.3") -set(LIBPCAP_CUSTOM_INSTALL_PATH "/opt/libpcap_1.7.4") -set(MONGO_C_CUSTOM_INSTALL_PATH "/opt/mongo_c_driver_1_1_9") +set(HIREDIS_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LOG4CPP_CUSTOM_INSTALL_PATH ${PREFIX}) +set(JSONC_CUSTOM_INSTALL_PATH ${PREFIX}) +set(PFRING_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LIBPCAP_CUSTOM_INSTALL_PATH ${PREFIX}) +set(MONGO_C_CUSTOM_INSTALL_PATH ${PREFIX}) +set(NDPI_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LUAJIT_CUSTOM_INSTALL_PATH ${PREFIX}) set(FASTNETMON_PROFILER OFF) @@ -190,15 +199,15 @@ if (ENABLE_DPI_SUPPORT) add_library(fast_dpi STATIC fast_dpi.cpp) - set(NDPI_INCLUDE_DIRS "/opt/ndpi/include/libndpi-1.7.1") - - find_library(NDPI_LIBRARIES NAMES ndpi PATHS "/opt/ndpi/lib" NO_DEFAULT_PATH) + file(GLOB NDPI_SEARCH_PATHS "${NDPI_CUSTOM_INSTALL_PATH}/include/libndpi-*") + find_path(NDPI_INCLUDE_DIRS NAMES libndpi/ndpi_api.h PATHS ${NDPI_SEARCH_PATHS} NO_DEFAULT_PATH) + find_library(NDPI_LIBRARIES NAMES ndpi PATHS "${NDPI_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH) if (NOT NDPI_LIBRARIES) message(FATAL_ERROR "Could not find nDPI library") endif() - link_directories("/opt/ndpi/lib") + link_directories(${NDPI_LIBRARIES}) include_directories(${NDPI_INCLUDE_DIRS}) add_definitions(-DENABLE_DPI) @@ -215,8 +224,6 @@ if (ENABLE_LUA_SUPPORT) add_definitions(-DENABLE_LUA_HOOKS) - set(LUAJIT_CUSTOM_INSTALL_PATH "/opt/luajit_2.0.4") - link_directories("${LUAJIT_CUSTOM_INSTALL_PATH}/lib") include_directories("${LUAJIT_CUSTOM_INSTALL_PATH}/include") @@ -578,14 +585,14 @@ if (BUILD_TESTS) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "DragonFly") - install(TARGETS fastnetmon DESTINATION bin) - install(TARGETS fastnetmon_client DESTINATION bin) + install(TARGETS fastnetmon DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS fastnetmon_client DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - install(FILES fastnetmon.conf DESTINATION etc) + install(FILES fastnetmon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) # Install blank files for networks list and whitelist - install(FILES networks_list DESTINATION etc) - install(FILES networks_whitelist DESTINATION etc) + install(FILES networks_list DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + install(FILES networks_whitelist DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) else() # Linux install(TARGETS fastnetmon DESTINATION /usr/sbin) @@ -599,8 +606,10 @@ else() endif() # man pages -install(FILES man/fastnetmon.1 DESTINATION /usr/share/man/man1) -install(FILES man/fastnetmon_client.1 DESTINATION /usr/share/man/man1) +#install(FILES man/fastnetmon.1 DESTINATION /usr/share/man/man1) +#install(FILES man/fastnetmon_client.1 DESTINATION /usr/share/man/man1) + +install(FILES fastnetmon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) # Configure cpack package builder # Run it with: cd build; cpack -G DEB .. Index: head/sysutils/runit/files/patch-src_runit-init.c =================================================================== --- head/sysutils/runit/files/patch-src_runit-init.c (revision 440938) +++ head/sysutils/runit/files/patch-src_runit-init.c (revision 440939) @@ -1,20 +1,18 @@ -$FreeBSD$ - runit is designed to be placed in /sbin. However, there is no reason that PREFIX cannot be respected here, so should a user define in loader.conf this in place, then it will still be found. init_path=/usr/local/sbin/runit-init:/sbin/init --- src/runit-init.c.orig 2016-08-10 20:53:15 UTC +++ src/runit-init.c @@ -53,6 +53,9 @@ int main (int argc, const char * const * /* kernel is starting init, runit does the job. */ execve(RUNIT, (char *const *)prog, envp); + /* OK, running from PREFIX-- should be default */ + execve(PREFIX RUNIT, (char *const *)prog, envp); + /* serious error */ strerr_die4sys(111, FATAL, "unable to start ", prog[0], ": "); } Property changes on: head/sysutils/runit/files/patch-src_runit-init.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 Index: head/sysutils/runit/files/patch-src_runit.c =================================================================== --- head/sysutils/runit/files/patch-src_runit.c (revision 440938) +++ head/sysutils/runit/files/patch-src_runit.c (revision 440939) @@ -1,51 +1,49 @@ -$FreeBSD$ - Should the user neglect to add the symlink, rather than stick them in a reboot loop give a warning. --- src/runit.c.orig 2016-08-10 21:03:05 UTC +++ src/runit.c @@ -22,10 +22,13 @@ #define WARNING "- runit: warning: " #define FATAL "- runit: fatal: " -const char * const stage[3] ={ +const char * const stage[] ={ "/etc/runit/1", "/etc/runit/2", - "/etc/runit/3" }; + "/etc/runit/3", + PREFIX "/etc/runit/1", + PREFIX "/etc/runit/2", + PREFIX "/etc/runit/3" }; int selfpipe[2]; int sigc =0; @@ -134,6 +137,13 @@ int main (int argc, const char * const * strerr_warn3(INFO, "enter stage: ", stage[st], 0); execve(*prog, (char *const *)prog, envp); + /* Try with PREFIX */ + prog[0] = stage[st+3]; + strerr_warn3(INFO, + "Trying in " PREFIX "; not found in /etc: ", stage[st], 0); + strerr_warn3(INFO, + "Must run ln -s " PREFIX "/etc/runit /etc/ to work!", stage[st], 0); + execve(*prog, (char *const *)prog, envp); strerr_die4sys(0, FATAL, "unable to start child: ", stage[st], ": "); } @@ -229,6 +239,13 @@ int main (int argc, const char * const * /* child */ strerr_warn3(INFO, "enter stage: ", prog[0], 0); execve(*prog, (char *const *) prog, envp); + /* Try with PREFIX */ + prog[0] = stage[st+3]; + strerr_warn3(INFO, + "Trying in " PREFIX "; not found: ", stage[st], 0); + strerr_warn3(INFO, + "Must run ln -s " PREFIX "/etc/runit /etc/ to work!", stage[st], 0); + execve(*prog, (char *const *) prog, envp); strerr_die4sys(0, FATAL, "unable to start child: ", prog[0], ": "); } if (wait_pid(&wstat, pid2) == -1) Property changes on: head/sysutils/runit/files/patch-src_runit.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 Index: head/www/py-puppetboard02/files/patch-puppetboard_app.py =================================================================== --- head/www/py-puppetboard02/files/patch-puppetboard_app.py (revision 440938) +++ head/www/py-puppetboard02/files/patch-puppetboard_app.py (revision 440939) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- puppetboard/app.py.orig +++ puppetboard/app.py @@ -114,7 +114,7 @@ code = 204 description = '

No content