Bug 210198 - remove dead things, simplify & refactor do-fetch, extract create-manifest...
Summary: remove dead things, simplify & refactor do-fetch, extract create-manifest...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Ports Framework (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Port Management Team
URL: https://reviews.freebsd.org/D6779
Keywords:
Depends on:
Blocks:
 
Reported: 2016-06-11 01:36 UTC by Mathieu Arnold
Modified: 2016-06-19 12:24 UTC (History)
1 user (show)

See Also:
mat: exp-run?


Attachments
patch (31.08 KB, patch)
2016-06-11 01:36 UTC, Mathieu Arnold
no flags Details | Diff
patch-v2 (31.76 KB, patch)
2016-06-14 18:25 UTC, Mathieu Arnold
no flags Details | Diff
patch-v3 (32.67 KB, patch)
2016-06-14 18:29 UTC, Mathieu Arnold
no flags Details | Diff
patch-v4 (34.46 KB, patch)
2016-06-14 19:00 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer 2016-06-11 01:36:42 UTC
Created attachment 171288 [details]
patch
Comment 1 Antoine Brodin freebsd_committer 2016-06-12 18:19:27 UTC
New failures:

+ {"origin"=>"shells/ksh93", "pkgname"=>"ksh93-20120801_2", "phase"=>"fetch", "errortype"=>"fetch"}
+ {"origin"=>"sysutils/geomWatch", "pkgname"=>"geomWatch-1.3.0_2", "phase"=>"checksum", "errortype"=>"checksum"}
+ {"origin"=>"www/xpi-splash", "pkgname"=>"xpi-splash-2.0.2", "phase"=>"extract", "errortype"=>"makefile"}

Failure logs:

http://package22.nyi.freebsd.org/data/101i386-default-PR210198/2016-06-12_13h44m39s/logs/errors/ksh93-20120801_2.log
http://package22.nyi.freebsd.org/data/101i386-default-PR210198/2016-06-12_13h44m39s/logs/errors/geomWatch-1.3.0_2.log
http://package22.nyi.freebsd.org/data/101i386-default-PR210198/2016-06-12_13h44m39s/logs/errors/xpi-splash-2.0.2.log
Comment 2 Mathieu Arnold freebsd_committer 2016-06-14 18:25:19 UTC
Created attachment 171436 [details]
patch-v2

Fixup what I broke, and remove more eval/quote madness.
Comment 3 Mathieu Arnold freebsd_committer 2016-06-14 18:29:26 UTC
Created attachment 171437 [details]
patch-v3

Actually commit all the changes.
Comment 4 Mathieu Arnold freebsd_committer 2016-06-14 19:00:55 UTC
Created attachment 171439 [details]
patch-v4

Hey, you know what, let's throw another patch in there.
Comment 5 commit-hook freebsd_committer 2016-06-17 16:31:11 UTC
A commit references this bug:

Author: mat
Date: Fri Jun 17 16:30:36 UTC 2016
New revision: 417017
URL: https://svnweb.freebsd.org/changeset/ports/417017

Log:
  Fix last entry of MASTER_SITE_EXIM.

  PR:		210198
  Sponsored by:	Absolight

Changes:
  head/Mk/bsd.sites.mk
Comment 6 Antoine Brodin freebsd_committer 2016-06-18 18:26:42 UTC
There was 1 new failure on 10.1 i386  (on 9.3 with fmake it succeeds):

+ {"origin"=>"www/xpi-splash", "pkgname"=>"xpi-splash-2.0.2", "phase"=>"extract", "errortype"=>"makefile"}

Failure log:

http://package22.nyi.freebsd.org/data/101i386-default-PR210198/2016-06-17_21h55m32s/logs/errors/xpi-splash-2.0.2.log
Comment 7 commit-hook freebsd_committer 2016-06-19 11:24:43 UTC
A commit references this bug:

Author: mat
Date: Sun Jun 19 11:24:40 UTC 2016
New revision: 417109
URL: https://svnweb.freebsd.org/changeset/ports/417109

Log:
  Simplify do-fetch, and remove now unused code.

  Turns out that the DEFAULT, and other groups sites were handled in
  a different way, ending up having the same code twice, but in
  slightly different places.

  PR:		210198
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight
  Differential Revision:	https://reviews.freebsd.org/D6779

Changes:
  head/Mk/Scripts/do-fetch.sh
  head/Mk/bsd.port.mk
Comment 8 commit-hook freebsd_committer 2016-06-19 11:25:44 UTC
A commit references this bug:

Author: mat
Date: Sun Jun 19 11:25:30 UTC 2016
New revision: 417110
URL: https://svnweb.freebsd.org/changeset/ports/417110

Log:
  Remove unnecessary evals that do-fetch was using.

  Turns out that env(1) knows how to parse a properly quoted string
  using -S "string", it makes the double eval used for the fetch
  command to be unnecessary.

  This is because running:
  eval "foo $(escape $bar)"
  is silly when this works:
  foo $bar

  So remove escaping and quoting, and sillyness.

  PR:		210198
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight
  Differential Revision:	https://reviews.freebsd.org/D6779

Changes:
  head/Mk/Scripts/checksum.sh
  head/Mk/Scripts/do-fetch.sh
  head/Mk/bsd.port.mk
  head/games/narcissu2/Makefile
  head/graphics/waifu2x-converter-cpp/Makefile
  head/shells/ksh93/Makefile
  head/sysutils/geomWatch/Makefile
  head/textproc/kmfl-sil-ezra/Makefile
  head/textproc/kmfl-sil-ipa-unicode/Makefile
  head/textproc/kmfl-sil-panafrican-latin/Makefile
  head/www/xpi-splash/Makefile
Comment 9 commit-hook freebsd_committer 2016-06-19 11:25:46 UTC
A commit references this bug:

Author: mat
Date: Sun Jun 19 11:25:35 UTC 2016
New revision: 417111
URL: https://svnweb.freebsd.org/changeset/ports/417111

Log:
  Reverse tests to decrease complexity.

  PR:		210198
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight
  Differential Revision:	https://reviews.freebsd.org/D6779

Changes:
  head/Mk/Scripts/check-vulnerable.sh
  head/Mk/Scripts/checksum.sh
  head/Mk/Scripts/do-fetch.sh
Comment 10 commit-hook freebsd_committer 2016-06-19 11:25:47 UTC
A commit references this bug:

Author: mat
Date: Sun Jun 19 11:25:40 UTC 2016
New revision: 417112
URL: https://svnweb.freebsd.org/changeset/ports/417112

Log:
  Extract create-manifest.

  PR:		210198
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight
  Differential Revision:	https://reviews.freebsd.org/D6779

Changes:
  head/Mk/Scripts/create-manifest.sh
  head/Mk/bsd.port.mk
Comment 11 commit-hook freebsd_committer 2016-06-19 11:26:51 UTC
A commit references this bug:

Author: mat
Date: Sun Jun 19 11:25:44 UTC 2016
New revision: 417113
URL: https://svnweb.freebsd.org/changeset/ports/417113

Log:
  Add a few checks for (MASTER|PATCH)_SITES groups.

  While make(1) is ok with variable names having quite a lot of strange
  characters in them, the fetch code mostly uses sh(1), where variable
  names can't include a dash (or pluses, or many other things).

  PR:		210251 210198
  Submitted by:	mat
  Exp-run by:	antoine
  Sponsored by:	The FreeBSD Foundation, Absolight
  Differential Revision:	https://reviews.freebsd.org/D6779

Changes:
  head/Mk/bsd.port.mk
  head/Mk/bsd.sites.mk