Bug 235886 - [patch] x11-clocks/xclock: update to 1.0.8; add missing dependencies and LICENSE
Summary: [patch] x11-clocks/xclock: update to 1.0.8; add missing dependencies and LICENSE
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: freebsd-x11 (Nobody)
URL:
Keywords: patch
Depends on:
Blocks:
 
Reported: 2019-02-20 16:34 UTC by Samy Mahmoudi
Modified: 2019-02-27 15:07 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (x11)


Attachments
Patch file generated with svn diff (1.03 KB, patch)
2019-02-20 16:35 UTC, Samy Mahmoudi
no flags Details | Diff
Poudriere log (32.50 KB, text/plain)
2019-02-20 16:36 UTC, Samy Mahmoudi
no flags Details
Patch file generated with svn diff (1.03 KB, patch)
2019-02-20 21:23 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 2019-02-20 16:34:35 UTC
- Update to version 1.0.8
- Add missing dependencies
- Add LICENSE
- Reorder section blocks to pet portlint
Comment 1 Samy Mahmoudi 2019-02-20 16:35:57 UTC
Created attachment 202190 [details]
Patch file generated with svn diff
Comment 2 Samy Mahmoudi 2019-02-20 16:36:35 UTC
Created attachment 202191 [details]
Poudriere log
Comment 3 Samy Mahmoudi 2019-02-20 16:41:34 UTC
(In reply to Samy Mahmoudi from comment #0)

- Update to version 1.0.8
- Add missing dependencies
- Add LICENSE
- Reorder section blocks to pet portlint

Release announcement: https://lists.x.org/archives/xorg/2019-February/059610.html
Comment 4 Niclas Zeising freebsd_committer freebsd_triage 2019-02-20 17:31:00 UTC
XORG_CAT probably needs to be before USE_XORG, since USE_XORG pulls in bsd.xorg.mk, which uses XORG_CAT.  Looking at a sample of Makefiles with XORG_CAT in them, it is always defined before USE_XORG (usually the line above, if the makefile is simple) or after any BUILD/RUN/LIB_DEPENDS.

Portlint is wrong in this regard (and should probably be patched).

This comment applies to all your submissions.
Comment 5 Samy Mahmoudi 2019-02-20 20:26:48 UTC
(In reply to Niclas Zeising from comment #4)

Thank you for bringing this to my attention.

> Portlint is wrong in this regard (and should probably be patched).

I was indeed trusting portlint in this regard. I may file a problem report as soon as possible.

I also noticed XORG_CAT is not mentioned in the FreeBSD Porter's Handbook, which may result in a second problem report.
Comment 6 Niclas Zeising freebsd_committer freebsd_triage 2019-02-20 20:35:35 UTC
(In reply to Samy Mahmoudi from comment #5)

XORG_CAT is somewhat internal to xorg core ports, which is why it's not documented, and probably also why portlint isn't aware of it.
It is used to pull in certain dependencies that all xorg ports in a certain category require.

It's very hard to know if you're not neck deep in the xorg stuff, so some documentation might be a good idea.
Comment 7 Samy Mahmoudi 2019-02-20 21:20:46 UTC
(In reply to Niclas Zeising from comment #6)

I just had a look at bsd.port.mk and bsd.xorg.mk.

We could stay to:

XORG_CAT=	app
USES=		iconv
USE_XORG=	xrender xft xkbfile xt xaw

or we could go for:

USES=		iconv
XORG_CAT=	app
USE_XORG=	xrender xft xkbfile xt xaw

or even:

XORG_CAT=	app

USES=		iconv
USE_XORG=	xrender xft xkbfile xt xaw

These blocks would have the same effect: XORG_CAT only needs to be before USE_XORG, as you suggested. But which style do you prefer (in case we submit patches for portlint and the handbook) ?

IMHO, we should mention XORG_CAT directly before USE_XORG (second alternative) to avoid duplication of Xorg-related variables, as in:

XORG_CAT=	app
USES=		iconv
USE_SOMETHING=
USE_SOMETHING=
USE_SOMETHING=
USE_SOMETHING=
USE_SOMETHING=
USE_XORG=	xrender xft xkbfile xt xaw
Comment 8 Samy Mahmoudi 2019-02-20 21:23:56 UTC
Created attachment 202204 [details]
Patch file generated with svn diff
Comment 9 Samy Mahmoudi 2019-02-20 21:45:09 UTC
- Update to version 1.0.8
- Add missing dependencies
- Add LICENSE
- Reorder section blocks to pet portlint *

Release announcement: https://lists.x.org/archives/xorg/2019-February/059610.html

* USES still has to be before USE_XORG
Comment 10 commit-hook freebsd_committer freebsd_triage 2019-02-27 14:54:53 UTC
A commit references this bug:

Author: zeising
Date: Wed Feb 27 14:53:58 UTC 2019
New revision: 494057
URL: https://svnweb.freebsd.org/changeset/ports/494057

Log:
  x11-clocks/xclock: Update to 1.0.8

  Update xclock to 1.0.8
  Add LICENSE
  Add missing dependency and sort USE_XORG.
  Move USES before USE_XORG to pet portlint.

  PR:		235886
  Submitted by:	Samy Mahmoudi
  Sponsored by:	B3 Init (zeising)

Changes:
  head/x11-clocks/xclock/Makefile
  head/x11-clocks/xclock/distinfo
Comment 11 Niclas Zeising freebsd_committer freebsd_triage 2019-02-27 14:56:58 UTC
Committed, thanks!

I'm still on the fence on where to put XORG_CAT, I think it should go as early as possible in the makefile, but looking in the ports tree I saw a variety of options.