Differential D20856

graphics/xsane: Update MASTER_SITES
ClosedPublic
Actions

Authored by kai on Jul 4 2019, 5:02 PM.

Details

Reviewers

miwi
tcberner
joneum

Commits

rP505966: MFH: r505903
rP505903: graphics/xsane: Update MASTER_SITES

Summary

The main site http://www.xsane.org has vanished. The sources are available at the project page of the sane-project at GitLab.

The GL_* variables are used a bit differently to retrieve the tarball from a Gitlab subproject and to avoid slashes in the DISTNAME. Please see the comments in the diff for further details.

Also while I'm here:

Add "gnome" to USES as using USE_GNOME alone is deprecated.

PR: 237875
Reported by: Nick Godson

Test Plan

poudriere (11.2-RELEASE amd64) -> OK
Compared source codes -> OK (the old tarball seems a bit more messy as it contains some patch backup files (.orig), generated config.h headers, etc.)
Compared contents of old/new binary packages -> Slight differences between .po files for the Brazilian and Chinese (ZH) language

Diff Detail

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 25200
Build 23880: arc lint + arc unit

Event Timeline

kai created this revision.Jul 4 2019, 5:02 PM

Harbormaster completed remote builds in B25200: Diff 59398.Jul 4 2019, 5:02 PM

Looks (x)sane enought to me.

This revision is now accepted and ready to land.Jul 4 2019, 7:14 PM

Closed by commit rP505903: graphics/xsane: Update MASTER_SITES (authored by kai). · Explain WhyJul 5 2019, 4:38 PM

This revision was automatically updated to reflect the committed changes.

kai added a commit: rP505903: graphics/xsane: Update MASTER_SITES.

kai added a commit: rP505966: MFH: r505903.Jul 6 2019, 9:13 AM

mat added a subscriber: mat.Jul 7 2019, 9:31 PM

mat added inline comments.

head/graphics/xsane/Makefile
24–29 ↗	(On Diff #59447)	All those comments are wrong. You can either use: GL_SITE= https://gitlab.com/sane-project GL_ACCOUNT= frontend Or GL_SITE= https://gitlab.com/ GL_ACCOUNT= sane-project/frontend All other usage obviously leads to incorrect results.

kai added inline comments.Jul 8 2019, 6:11 AM

head/graphics/xsane/Makefile

24–29 ↗

(On Diff #59447)

Thank you for the info and examples. I've tried both examples before I opened the review here. As it seems, only the first example works so far:

$ grep GL_ Makefile
GL_SITE=        https://gitlab.com/sane-project
GL_ACCOUNT=     frontend
GL_COMMIT=      d01b4089ce6778e76fa86a0410d4e80cf6eb819e
$ make -V DISTNAME
frontend-xsane-d01b4089ce6778e76fa86a0410d4e80cf6eb819e_GL0

With the second one, the slash slips into DISTNAME:

$ grep GL_ Makefile
GL_SITE=        https://gitlab.com/
GL_ACCOUNT=     saneproject/frontend
GL_COMMIT=      d01b4089ce6778e76fa86a0410d4e80cf6eb819e
$ make -V DISTNAME
saneproject/frontend-xsane-d01b4089ce6778e76fa86a0410d4e80cf6eb819e_GL0

Maybe I'm missing a detail for the second example to make it work?

kai added inline comments.Jul 9 2019, 9:50 PM