Bug 206930
| Summary: | science/afni: Update to 2015.11.13 | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Jason W. Bacon <jwb> | ||||||||||||||
| Component: | Individual Port(s) | Assignee: | Raphael Kubo da Costa <rakuco> | ||||||||||||||
| Status: | Closed FIXED | ||||||||||||||||
| Severity: | Affects Some People | CC: | rakuco | ||||||||||||||
| Priority: | --- | Keywords: | patch, patch-ready | ||||||||||||||
| Version: | Latest | ||||||||||||||||
| Hardware: | Any | ||||||||||||||||
| OS: | Any | ||||||||||||||||
| Attachments: |
|
||||||||||||||||
Created attachment 166576 [details]
Poudriere log
Created attachment 166577 [details]
Poudriere log
Created attachment 166578 [details]
Poudriere log, compressed
Created attachment 166579 [details]
Poudriere log, compressed
The attached patch fails here:
===> Applying FreeBSD patches for afni-2015.11.13
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to 3DEdge/src/Makefile.rej
=> Patch patch-3DEdge_src_Makefile failed to apply cleanly.
While at it:
> +#${CP} -R ${PRESTAGE}/share/* ${STAGEDIR}${DATADIR}
This is probably stale, right?
Finally, isn't it possible to merge the post-build and do-install stages? I'm not asking you to do it in this patch, it's just not clear to me why there's a ${PRESTAGE} directory or why these things can't be done in the Makefile itself since you apparently wrote it.
Created attachment 167453 [details]
Unified diff
The 3DEdge patch was not supposed to be part of the port. It was generated from a preexisting Makefile.orig by make makepatch just before I generated the diff. I added a line to remove that Makefile.orig post-extract so this won't happen again.
Yes, the ${CP} was replaced by the ${COPYTREE_SHARE}. Sorry for neglecting to remove the comment.
The prestage directory can probably be eliminated at this point. This was my original solution to a problem where the AFNI core Makefile (Makefile.INCLUDE) shuffles things around after the build is finished, tripping up the ports Makefile targets and triggering rebuilds where they shouldn't be necessary. I've been averse to messing with it because the build system is so squirrely and each build takes hours. I added a FIXME comment to my wip version to address this with the next update.
Thanks!
A commit references this bug: Author: rakuco Date: Sat Feb 27 22:03:31 UTC 2016 New revision: 409693 URL: https://svnweb.freebsd.org/changeset/ports/409693 Log: Update to 2015.11.13. Upgrade to a more recent snapshot, and stop requiring GCC. PR: 206930 Submitted by: Jason Bacon <bacon4000@gmail.com> (maintainer) Changes: head/science/afni/Makefile head/science/afni/distinfo head/science/afni/files/Makefile head/science/afni/files/Makefile.FreeBSD_PORT head/science/afni/files/patch-Makefile.INCLUDE head/science/afni/files/patch-XmHTML-Makefile head/science/afni/files/patch-misc_math.c head/science/afni/files/patch-netcdf-3.5.0_src_configure head/science/afni/files/patch-nifti_cifti_afni__xml.h head/science/afni/files/pkg-message.in head/science/afni/pkg-plist Finally landed, thanks for the patch! |
Created attachment 166575 [details] Unified diff Upgrade to recent snapshot. Remove dependency on GCC.