Bug 232109

Created attachment 197955 [details]
Proposed patch (since 475857 revision)

Comment 2 Kubilay Kocak 2018-10-09 04:48:24 UTC

The following block probably needs a comment with explanation of the need for it, if nothing else than to help the reviewer/committer grok/evaluate the pattern:

+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000) || make(makesum)

Created attachment 197956 [details]
Proposed patch (since 475857 revision)

(In reply to Kubilay Kocak from comment #2)
> The following block probably needs a comment with explanation of the need
> for it, <..>
> +.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1100000) || make(makesum)
Ok, I added some comment for related block.

Some examples of related errors, if not using this:
-8<--
% make
<..>
In file included from lobster_impl.cpp:2:
In file included from ../lobster/src/lobster/stdafx.h:42:
In file included from /usr/include/c++/v1/unordered_map:350:
/usr/include/c++/v1/__hash_table:1165:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>'
__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table()
                                          ^
/usr/include/c++/v1/__hash_table:852:5: note: previous declaration is here
    __hash_table()
    ^
/usr/include/c++/v1/__hash_table:1233:43: error: conflicting types for '__hash_table<_Tp, _Hash, _Equal, _Alloc>'
__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u)
                                          ^
/usr/include/c++/v1/__hash_table:866:5: note: previous declaration is here
    __hash_table(__hash_table&& __u)
    ^
<..>
In file included from lobster_impl.cpp:2:
In file included from ../lobster/src/lobster/stdafx.h:84:
../lobster/src/lobster/tools.h:714:25: error: unknown type name 'string_view'; did you mean 'std::experimental::string_view'?
inline string operator+(string_view a, string_view b) {
                        ^~~~~~~~~~~
                        std::experimental::string_view
/usr/include/c++/v1/experimental/string_view:777:39: note: 'std::experimental::string_view' declared here
  typedef basic_string_view<char>     string_view;
                                      ^
In file included from lobster_impl.cpp:2:
In file included from ../lobster/src/lobster/stdafx.h:84:
../lobster/src/lobster/tools.h:714:40: error: unknown type name 'string_view'; did you mean 'std::experimental::string_view'?
inline string operator+(string_view a, string_view b) {
                                       ^~~~~~~~~~~
                                       std::experimental::string_view
/usr/include/c++/v1/experimental/string_view:777:39: note: 'std::experimental::string_view' declared here
  typedef basic_string_view<char>     string_view;
                                      ^
<..>
% make MAKE_JOBS_UNSAFE=yes
<..>
In file included from main.cpp:2:
./stdafx.h:73:10: fatal error: 'string_view' file not found
#include <string_view>
         ^~~~~~~~~~~~~
1 error generated.
<..>
-->8-

Comment 4 Steve Wills 2018-10-09 13:53:00 UTC

Committed, thanks!

Comment 5 commit-hook 2018-10-09 13:53:04 UTC

A commit references this bug:

Author: swills
Date: Tue Oct  9 13:52:06 UTC 2018
New revision: 481634
URL: https://svnweb.freebsd.org/changeset/ports/481634

Log:
  deskutils/treesheets: Update to 1.0.1

  PR:		232109
  Submitted by:	lightside <lightside@gmx.com> (maintianer)

Changes:
  head/deskutils/treesheets/Makefile
  head/deskutils/treesheets/distinfo