Page MenuHomeFreeBSD

graphics/xsane: Update MASTER_SITES
ClosedPublic

Authored by kai on Jul 4 2019, 5:02 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jun 22, 2:45 AM
Unknown Object (File)
Sun, Jun 16, 10:22 AM
Unknown Object (File)
Sat, Jun 8, 6:59 PM
Unknown Object (File)
Apr 20 2024, 3:32 PM
Unknown Object (File)
Apr 19 2024, 8:07 PM
Unknown Object (File)
Apr 19 2024, 8:07 PM
Unknown Object (File)
Apr 19 2024, 8:07 PM
Unknown Object (File)
Apr 17 2024, 10:01 AM
Subscribers

Details

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

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Looks (x)sane enought to me.

This revision is now accepted and ready to land.Jul 4 2019, 7:14 PM
This revision was automatically updated to reflect the committed changes.
mat added inline comments.
head/graphics/xsane/Makefile
24–29

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.

head/graphics/xsane/Makefile
24–29

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?

head/graphics/xsane/Makefile
24–29

By the way, the comments were removed in rP506318 and rP506320.