Page MenuHomeFreeBSD

Hacks for installing data files for Haskell ports.
ClosedPublic

Authored by arrowd on Jun 8 2019, 6:25 AM.

Details

Summary

For ports with USES=cabal install a wrapper shell script instead of a real executable into /bin/, that sets some environment variables to workaround https://github.com/haskell/cabal/issues/5997
While there, update bunch of Haskell ports, make them install their data files.
Unbreak math/hs-Agda.

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237878

Test Plan

poud bulk -t for all Haskell ports for i386 and amd64 12.0-RELEASE.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

arrowd created this revision.Jun 8 2019, 6:25 AM
tcberner added inline comments.Jun 11 2019, 4:21 AM
devel/hs-git-annex/pkg-plist
1 ↗(On Diff #58391)

why are only the manpages in the plist-file and not the binaries?

arrowd added inline comments.Jun 11 2019, 4:24 AM
devel/hs-git-annex/pkg-plist
1 ↗(On Diff #58391)

Binaries are added automatically in Uses/cabal.mk based on EXECUTABLES variable.

Does for example x11-wm/hs-xmonad not also require a bump? It also has an EXECUTABLES=xmonad. In short, all hs-ports that define EXECUTABLES should be bumped, as their plist changes due to the new wrapper script: or did I misread the cabal.mk change?

devel/hs-git-annex/Makefile
167 ↗(On Diff #58391)

^ then what about this?

arrowd updated this revision to Diff 58509.Jun 11 2019, 4:27 AM
arrowd marked an inline comment as done.

Remove PLIST_FILES now that devel/hs-git-annex has pkg-plist.

arrowd marked an inline comment as done.Jun 11 2019, 4:29 AM

Does for example x11-wm/hs-xmonad not also require a bump? It also has an EXECUTABLES=xmonad. In short, all hs-ports that define EXECUTABLES should be bumped, as their plist changes due to the new wrapper script: or did I misread the cabal.mk change?

x11-wm/hs-xmonad uses old machinery (lang/ghc/bsd.cabal.mk), so it is not affected. All ports that used new one were bumped.

devel/hs-git-annex/Makefile
167 ↗(On Diff #58391)

Right, missed that, fixed.

tcberner accepted this revision.Jun 11 2019, 3:38 PM

Looks good to me then :)

This revision is now accepted and ready to land.Jun 11 2019, 3:38 PM
This revision was automatically updated to reflect the committed changes.
arrowd marked an inline comment as done.