Bug 230735 - x11/xorgproto: add LICENSE and clean up Makefile
Summary: x11/xorgproto: add LICENSE and clean up Makefile
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-08-18 17:14 UTC by Samy Mahmoudi
Modified: 2021-06-29 02:19 UTC (History)
3 users (show)

See Also:
kbowling: maintainer-feedback+


Attachments
Patch file generated with svn diff (507 bytes, patch)
2018-08-18 17:14 UTC, Samy Mahmoudi
no flags Details | Diff
Patch file generated with svn diff (539 bytes, patch)
2018-08-22 21:34 UTC, Samy Mahmoudi
no flags Details | Diff
Patch file (806 bytes, patch)
2020-10-20 02:22 UTC, Samy Mahmoudi
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Samy Mahmoudi 2018-08-18 17:14:34 UTC
Created attachment 196323 [details]
Patch file generated with svn diff

- Add LICENSE= MIT
- Replace xorg with X.org in COMMENT 
- Replace a space with a tab in CONFIGURE_ARGS
Comment 1 Niclas Zeising freebsd_committer freebsd_triage 2018-08-20 21:06:59 UTC
Hi!
I'm not sure about the license, there are a multitude of COPYING-* files in the upstream source.  While most of them probably are some variety of MIT perhaps we should look closer before adding it to the ports Makefile.

The rest of the changes look good.
Comment 2 Samy Mahmoudi 2018-08-22 21:34:53 UTC
Created attachment 196450 [details]
Patch file generated with svn diff
Comment 3 Samy Mahmoudi 2018-08-22 21:35:34 UTC
Hi Niclas,

Indeed, I should have looked closer: the deleted *proto ports all had their LICENSE set to MIT, except x11-fonts/fontcacheproto and x11/trapproto. The former had its LICENSE set to BSD2CLAUSE and the latter had its LICENSE unset. Fortunately, the file COPYING-trapproto looks like a Carnegie Mellon University (CMU) variant of MIT.

Moreover, COPYING-panoramixproto "is a stub file":

> This package has not yet had its complete licensing          
> information compiled.  Please see the individual source files for
> details on your rights to use and modify this software.                                    
> 
> Please submit updated COPYING files to the Xorg bugzilla:                       
> 
> https://bugs.freedesktop.org/enter_bug.cgi?product=xorg                         
> 
> All licensing questions regarding this software should be directed
> at the Xorg mailing list:                                                              
> 
> http://lists.freedesktop.org/mailman/listinfo/xorg

Although the license included as a header of panoramiXproto.h looks like a variant of MIT, I can not guarantee that other files (if any) provided by this package are licensed under MIT.

So, here is a second draft:

• Add LICENSE= MIT BSD2CLAUSE and LICENSE_COMB= multi
• Replace xorg with X.org in COMMENT 
• Replace a space with a tab in CONFIGURE_ARGS
Comment 4 Samy Mahmoudi 2019-02-07 23:00:08 UTC
Hi Niclas!

I wrote to the Xorg mailing list to ask for help and Adam Jackson answered me:

> Apologies, this was an error on our end. The panoramixproto module
> never had any real content:

> https://gitlab.freedesktop.org/xorg/proto/panoramixproto

> panoramiXproto.h actually came from the xineramaproto module. However
> when building the unified xorgproto module we just imported everything
> named *proto.

> I've removed the COPYING-panoramixproto file from xorgproto, which
> should prevent this confusion in the future. Thanks for bringing this
> to our attention!

So the file COPYING-panoramixproto which raised a last doubt (please reread Comment 3) has just been removed upstream and licensing information is complete thanks to your suggestion and Adam Jackson's help.

Removal: https://gitlab.freedesktop.org/xorg/proto/xorgproto/commit/2505b28a96b17ee394287a74091c42c86e2860fc

Consequently, I suggest to apply the patch of Comment 2:
• Add LICENSE= MIT BSD2CLAUSE and LICENSE_COMB= multi
• Replace xorg with X.org in COMMENT 
• Replace a space with a tab in CONFIGURE_ARGS
Comment 5 Niclas Zeising freebsd_committer freebsd_triage 2020-09-17 10:08:36 UTC
Can you update your patch to take into account the latest version of xorgproto?
Comment 6 Samy Mahmoudi 2020-09-17 11:27:53 UTC
(In reply to Niclas Zeising from comment #5)
Sure.
Comment 7 Samy Mahmoudi 2020-10-20 02:22:27 UTC
Created attachment 218910 [details]
Patch file

(In reply to Niclas Zeising from comment #5)
Hi Niclas,

• Legacy headers were removed from the package with the update to 2019.2 (r516911). Without fontcacheproto, BSD2CLAUSE is not necessary anymore.

• No relevant addition since then.

I have updated the patch accordingly:
• Add LICENSE=MIT
• Replace a space with a tab in CONFIGURE_ARGS to pet portlint
• Replace a tab with a space in pkg-descr to pet portlint
Comment 8 Warner Losh freebsd_committer freebsd_triage 2021-06-28 17:42:23 UTC
Make sure the MIT license is proper for this iteration of the MIT license.
Comment 10 Warner Losh freebsd_committer freebsd_triage 2021-06-29 02:05:33 UTC
(In reply to Kevin Bowling from comment #9)

I think it's correct, but what others call the MIT license is fuzzy since there's about a dozen variations that SPDX knows about (some of which have their own identifier). We have a MIT license file, and I need to make sure the license in that file matches. I think it does, because X is the canonical MIT license project, but I want to be sure...
Comment 11 commit-hook freebsd_committer freebsd_triage 2021-06-29 02:05:37 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=de0f70ed2f4f87a3e464443703e060077d40a722

commit de0f70ed2f4f87a3e464443703e060077d40a722
Author:     Samy Mahmoudi <samy.mahmoudi@gmail.com>
AuthorDate: 2021-06-29 02:04:16 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2021-06-29 02:04:16 +0000

    x11/xorgproto: add LICENSE and clean up Makefile

    PR:             230735
    Approved by:    x11 (verbal)

 x11/xorgproto/Makefile  | 4 +++-
 x11/xorgproto/pkg-descr | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
Comment 12 Kevin Bowling freebsd_committer freebsd_triage 2021-06-29 02:07:14 UTC
Thanks for your contribution!
Comment 13 Kevin Bowling freebsd_committer freebsd_triage 2021-06-29 02:12:43 UTC
(In reply to Warner Losh from comment #10)
Sorry Warner I saw this after pressing the buttons.  Let me know if I need to fix it.
Comment 14 Warner Losh freebsd_committer freebsd_triage 2021-06-29 02:14:00 UTC
(In reply to Kevin Bowling from comment #13)

Just sent you an email... I've pulled the changes and will do something new if there's a mismatch. Not worth doing anything else really.
Comment 15 Warner Losh freebsd_committer freebsd_triage 2021-06-29 02:19:14 UTC
(In reply to Warner Losh from comment #14)

Yea, there's 28 copies of the MIT license here (some with slight variations), but they all look the be the same as SPDX has, which is our source of truth for these things. We're all good, no further action needed.