20:21 Tijl Coosemans (tijl) 

Mk/*: Build with a clean environment

Both our make and gmake use the MAKEFLAGS environment variable but the
values aren't compatible and the latest version of gmake complains about
that.  To rule out that any environment variable can cause problems like
this, add a new command SETENVI=/usr/bin/env -i that clears the
environment, and use it to run upstream build systems with a clean
environment.

Introduce a new variable WRK_ENV that contains the environment to use
with SETENVI in all targets that run upstream build commands.  Variables
that are common between CONFIGURE_ENV and MAKE_ENV could be moved to
WRK_ENV but for now it just contains a minimal environment:

HOME=${WRKDIR}: Fixes USES=elixir ports that were using the user's HOME.
OSVERSION: For cross building; determines the output of uname -K and
getosreldate(3); affects net/freebsd-telnetd for example.
PATH: Fixes USES=gem ports that were using the user's PATH.
PWD=$${PWD}: Preserve current working directory; affects USES=go ports.
TERM: To preserve colored output to terminals.
TMPDIR: For users who define that.
UNAME_*: For cross building; determines the output of uname(1); affects
lang/python* for example.

This commit deals with everything under Mk/.  Ports that have their own
targets running upstream build commands can switch to SETENVI later.

The ports tree adds its definition of ARCH to the MAKEFLAGS environment
variable, which is interpreted by sub-makes as command line arguments,
which means that any definition of ARCH in upstream makefiles was
overridden.  The following ports required fixes now that this is no
longer the case.

games/iortcw, games/q3cellshading, games/tremulous:
These use Quake 3 engine code.  Fix use of ARCH.  Reduce diff between
FreeBSD code and Linux code.

games/legesmotus:
Remove ARCH related patches.

lang/ocaml:
Patch configure script so it detects amd64 correctly.  Also make the
powerpc case consistent with the other architectures.  This also affects
other ocaml ports like devel/ocaml-ocamlbuild and math/ocaml-num that
include a Makefile.config installed by lang/ocaml.  While here, use
SETENVI in check-test target.

net/libnatpmp:
Use of upstream definition of ARCH triggers installation in PREFIX/lib64
on amd64.  Disable this.

PR:		276478
Approved by:	portmgr (antoine)
Exp-run by:	antoine

    572f236

00:37 Muhammad Moinur Rahman (bofh) 

*/*: Sunset 12.4-RELEASE/12-STABLE from ports tree

- Remove all references to defunct ARCH arm
- Remove all references to defunct ARCH sparc64
- Remove x11-drivers/xf86-video-sunffb which requires defunct sparc64
  ARCH
- Remove sysutils/afbinit requires defunct sparc64 ARCH
- Remove all references to bktr driver
- Remove all references to defunct FreeBSD_12
- Remove all references to OSVERSION/OSREL corresponding to 12
- Remove conditionals in Mk/Uses/cabal.mk
- Remove sparc reference from Mk/Uses/qt-dist.mk
- Remove BROKEN_sparc64/NOT_FOR_ARCH=sparc64
- Remove BROKEN_FreeBSD_12* from:
- Remove OpenSSL patches from:
- Remove conditional flags for OSVERSION >= 1300000 to fixed flags.
  Also move conditional flags for non sparc64/arm ARCH to fixed flags.

Reviewed by:	brooks, jbeich, rene, salvadore
Differential Revision: https://reviews.freebsd.org/D42068

    bbab7f5

13:42 Baptiste Daroussin (bapt) 

Uses/cabal: revert change introduced by mistake

    80cc534

13:38 Baptiste Daroussin (bapt) 

devel/pkgconf: update to 2.0.2

PR:		272934
exp-run:	antoine

    8e3a5d9

17:25 Gleb Popov (arrowd) 

Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4

Reported by:	pkg-fallout

    f9a1f46

23:59 Muhammad Moinur Rahman (bofh) 

*/*: Sunset 12.3-RELEASE from ports tree

- Mk/bsd.port.mk: mark FreeBSD 12.3 as unsupported.
- Mk/Uses/cabal.mk: Remove the text-2 workaround for 12.3-RELEASE
- biology/wfa2-lib: remove obsolete patch
- databases/mongodb60: remove IGNORE for EOL FreeBSD 12.3
- devel/concurrencpp: remove workaround for EOL FreeBSD 12.3
- devel/electron22: remove IGNORE for EOL FreeBSD 12.3
- devel/malloy: this should build fine on 12.4-RELEASE
- devel/qcoro: remove BROKEN for EOL FreeBSD 12.3
- devel/root: remove workaround for EOL FreeBSD 12.3
- editors/imhex: remove IGNORE for EOL FreeBSD 12.3
- emulators/ppsspp: remove workaround for EOL FreeBSD 12.3
- emulators/rpcs3: remove workaround for EOL FreeBSD 12.3
- emulators/yuzu: remove workaround for EOL 12.3-RELEASE
- games/aquaria: remove support for EOL FreeBSD 12.3
- games/punchy: remove workaround for EOL FreeBSD 12.3
- graphics/cxxplot: remove support for EOL FreeBSD 12.3
- lang/gcc11*: bump a __FreeBSD_version in libphobos to 1204000
- lang/rust: untangle OSVERSION logic a bit
- misc/mbuffer: remove workaround for EOL FreeBSD 12.3 for aarch64
- sysutils/libdisplay-info: remove workaround for EOL FreeBSD 12.3
- www/*chromium: remove IGNORE for EOL FreeBSD 12.3
- x11/hyprpaper: remove workaround for expired FreeBSD 12.3
- x11-wm/labwc: remove workaround for EOL FreeBSD 12.3
- x11-wm/kwinft: remove workaround for EOL FreeBSD 12.3
- www/iridium: remove IGNORE for EOL FreeBSD 12.3

Differential Revision: https://reviews.freebsd.org/D38664

    5693229

17:38 Gleb Popov (arrowd) 

Uses/cabal.mk: Extend the text-2 workaround to 12.3-RELEASE.

    565a7ea

07:31 Gleb Popov (arrowd) 

Uses/cabal.mk: Fix indentation.

Reported by:	fluffy

    0d54165

19:47 Gleb Popov (arrowd) 

Uses/cabal.mk: Add a workaround to fix compilation of text-2 on FreeBSD 13.1

    1d1c5c6

16:10 Gleb Popov (arrowd) 

Mk/Uses: Introduce HACKAGE_DISTNAME knob.

    c622ccc

07:15 Gleb Popov (arrowd) 

Uses/cabal.mk: Do not hide commands being run.

    4aa96fa

07:15 Gleb Popov (arrowd) 

Uses/cabal.mk: Pass correct XDG_* environment in cabal invocations.

    3eb1fbc

19:38 Gleb Popov (arrowd) 

Mk/Uses: Drop the "/package/" part of URI when calling cabal2tuple.

Some repositories unlike Hackage append "/package/" when accessing a package.
This confuses cabal2tuple, so chop it.

    4caa2e2

18:11 Gleb Popov (arrowd) 

Uses/cabal.mk: Add support for LTO feature.

Haskell code benefits greatly from splitting functions into distinct ELF
sections and then letting the linker to garbage-collect them.

devel/hs-haskell-language-server port goes from 277MiB to 176MiB in size.
net-p2p/cardano-node ports goes 302MiB -> 76.2MiB

Relevant blog post: http://brandon.si/code/linking-smaller-haskell-binaries/

Reported by:	Greg Steuck <greg@nest.cx>

    37b6619

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Add support for building multi-repository cabal.projects.

To build such projects a port must add the repository to MASTER_SITES under
some group and then use this group in USE_CABAL.

Cabal2Tuple (ports-mgmt/hs-cabal2tuple) supports this feature starting with
version 2.0. Running `make make-use-cabal` will automatically pass necessary
flags to it.

    934c0a2

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Rework MASTER_SITES and DISTFILES handling.

This change removes duplicated entries from MASTER_SITES and DISTFILES
variables. Now the MASTER_SITES variable will contain single Hackage URL without
any group for the simplest case and with :_cabal_mk_hackage group in nodefault
case.

This change opens a path to using non-Hackage Cabal repositories
(needed for Cardano) and pulling in .cabal revisions without using patches.

Unfortunately, this change results in a large churn in Haskell ports distinfos.
To make this churn less useless, refresh all Haskell dependencies in all ports.

    2fca709

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Introduce CABAL_REVISION knob.

This knob allows pulling in a revised .cabal file for a Haskell package
being ported. This allows us to drop local patches that were serving the
same purpose.

    9e425fc

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Use "cabal build --dry-run" in cabal-configure target.

In the future Cabal release the "cabal configure" command changes its meaning.
The closest thing to the configure step in Cabal is "build --dry-run".

    56e3d88

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Change the way we act on cabal.project files.

Instead of moving the original project file into a temporary location,
employ cabal.project.local for Ports-related adjustments.

This implements an idea that upstream cabal.project files shouldn't be touched
by Ports framework. If needed they can be patched by the port maintainer
directly.

Adapt existing Haskell ports to this change.

    e254bdd

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Do not extract any USE_CABAL distfiles in cabal-extract.

    b55505d

17:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Use .for directive to introduce temporary variables inside loops.

Suggested by:	tijl

    d72b566

13:11 Gleb Popov (arrowd) 

Uses/cabal.mk: Extend i386 brokeness to basement-0.0.15

    eaf7a4e

09:16 Gleb Popov (arrowd) 

Uses/cabal.mk: Rename `EXECUTABLES` to `CABAL_EXECUTABLES`.

Approved by: tcberner

Differential Revision: https://reviews.freebsd.org/D36079

    505ecf2

15:58 Gleb Popov (arrowd) 

Uses/cabal.mk: Fix `cabal-extract` target when GH_TUPLE is present.

The presence of dist-newstyle directory created by unpacking Haskell
dependencies from GH_TUPLE makes `cabal` run `git pull` instead of `git clone`.

    949672a

19:52 Gleb Popov (arrowd) 

Uses/cabal.mk: Introduce CABAL_WRAPPER_SCRIPTS variable.

Before this change every Haskell executable was wrapped into a shell script
which was installed into ${PREFIX}/bin while the actual executable was installed
into {PREFIX}/libexec/cabal. This was required to set env variables pointing the
Haskell program to its data files under ${PREFIX}/share. However, not every
Haskell program uses this feature.

Now the shell wrapping is off by default and CABAL_WRAPPER_SCRIPTS knob can be
used to enable it for a given port/executable.

Adjust all Haskell ports affected by this change.

    166cea3

19:52 Gleb Popov (arrowd) 

Uses/cabal.mk: Document SKIP_CABAL_PLIST.

    842a12d

19:52 Gleb Popov (arrowd) 

Uses/cabal.mk: Expand comment for cabal-extract target.

    74817eb

14:55 Gleb Popov (arrowd) 

Uses/cabal.mk: Various improvements.

- Rename CABAL_BOOTSTRAP to SKIP_CABAL_EXTRACT. This is a much more descriptive
name as to what this knob does.
- Improve cabal-extract target to not overwrite WRKDIR and to leave a cookie
file to let framework know if the user is updating the port.

    839dbcc

14:55 Gleb Popov (arrowd) 

Uses/cabal.mk: Simplify EXTRACT_ONLY setting.

Adapt ports that were using hacks to set EXTRACT_ONLY.

    22d118e

14:55 Gleb Popov (arrowd) 

Uses/cabal.mk: Do not include '.' package when CABAL_PROJECT=append

If we are appending to an exisiting project file all needed package directories
are already listed there.

    d5655de

14:55 Gleb Popov (arrowd) 

Uses/cabal.mk: Simplify USE_LOCALE handling.

    92e98a2

14:55 Gleb Popov (arrowd) 

Uses/cabal.mk: Use cabal2tuple in the make-use-cabal target.

    4ad8bbf

13:05 Gleb Popov (arrowd) 

Uses/cabal.mk: Mark all ports using basement-0.0.14 BROKEN on i386.

Reported by:	pkg-fallout

    bbb24e0

10:24 Gleb Popov (arrowd) 

Uses/cabal.mk: Add support for lang/ghcXXX ports:

- Do not add lang/ghc to BUILD_DEPENDS if another GHC is already there.
- Pass --with-compiler flag to cabal if we're using lang/ghcXXX port to build.

    429fe39

19:13 Gleb Popov (arrowd) 

Uses/cabal.mk: Replace all occurencies of '-' instead of only one.

Executables named "foo-bar-baz" are now correctly handled.

    f500b9d

10:00 Tobias C. Berner (tcberner) 

framework: cleanup conditional-indentations in Mk/

Run Tools/scripts/indent_make_if.pl on all of Mk.

These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible

Differential Revision:	https://reviews.freebsd.org/D35024
Reviewed by:		portmgr (rene, bapt)

    aa25396

10:14 Gleb Popov (arrowd) 

Uses/cabal.mk: Omit "_0" part of the package version in make-use-cabal-revs

    1d2372e

16:43 Gleb Popov (arrowd) 

Uses/cabal.mk: Fix make-use-cabal-revs after upstream changes.

Hackage now returns a JSON array with all revisions, so sed/grep trickery
is not working anymore. Use Python to parse the reply and extract revision
number.

    8c54911

06:32 Gleb Popov (arrowd) 

Uses/cabal.mk: Make cabal-extract-deps target overridable.

    0da1ad3

14:13 Gleb Popov (arrowd) 

Uses/cabal.mk: Improve our Cabal machinery.

- Introduce CABAL_PROJECT variable to simplify handling project files in ports.
- Put dependencies into ${WRKSRC}/_cabal_deps subdir to make WRKSRC look
  clean after `extract` stage.
- Perform cabal.project trickery on post-patch stage to allow users to fiddle
  with the original one before creation.
- Document some code.

    1db8869

19:11 Gleb Popov (arrowd) 

Uses/cabal.mk: Pass same flags to do-build and cabal-extract-deps.

    8d6788c

05:39 Gleb Popov (arrowd) 

Uses/cabal.mk: Improve cabal-extract for USE_GITHUB/USE_GITLAB cases.

The `cabal-extract` is an auxiliary target that is intended to be run
interactively by the port developer. It populates Cabal cache and then tries
to fetch the main distribution file from Hackage package database. However,
some packages reside on GitHub and other hostings, in which case this target
fails. This commit modifies the target in such way that it does the usual
`make extract`, but preserves the Cabal cache.

Differential Revision: https://reviews.freebsd.org/D30014

    f4397f5

04:46 Tobias Kortkamp (tobik) 

Mk/Uses/cabal.mk: Replace shell process in EXECUTABLES wrapper scripts

The wrapper scripts leave the shell running for no reason.  Add an
exec to replace the shell process.

Before:
$ ps -d
35230  5  Ss    0:00.09 -oksh (oksh)
35351  5  S+    0:00.00 - /bin/sh /usr/local/bin/shellcheck -
35352  5  S+    0:00.00 `-- /usr/local/libexec/cabal/shellcheck -

After:
$ ps -d
35230  5  Is    0:00.05 -oksh (oksh)
35236  5  I+    0:00.01 - /usr/local/libexec/cabal/shellcheck -

Approved by:	arrowd
Differential Revision:	https://reviews.freebsd.org/D29852

    1283769

04:33 Tobias Kortkamp (tobik) 

Mk/Uses/cabal.mk: use ECHO_CMD not ECHO (D29852)

ECHO is set to true on make -s in /usr/share/mk/sys.mk and shouldn't
be used for things like this.

Approved by:	arrowd

    a0109ed

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

12:31 arrowd 

devel/hs-cabal-install: Update to 3.4.0.0 and adjust Uses/cabal.mk to its
changes.

 

08:00 arrowd 

Uses/cabal.mk: Take into account MAKE_JOBS_NUMBERS.

 

12:17 arrowd 

Uses/cabal.mk: Add "nodefault" argument.

 

11:31 arrowd 

Uses/cabal.mk: More correct fix for EXTRACT_ONLY problem from r559679.

 

18:57 arrowd 

Uses/cabal.mk: Set EXTRACT_ONLY based on DISTFILES value, just like bsd.port.mk
does.

This removes the need for specifying EXTRACT_ONLY for Haskell ports that have
USE_{GITHUB,GITLAB}.

PR:		244784

 

18:11 zeising 

Chanse update of devel/libffi

Chase the devel/libffi update
Bump portrevision of all dependent ports to chace shard library version bump
in libffi.
Update LIB_DEPENDS lines where needed to not require a specific version of
libffi.so.

PR:		247028 (for tracking)

 

14:29 arrowd 

Mk/Uses/cabal.mk: Modify make-use-cabal target to also show some build tools in
its output.

 

18:08 arrowd 

Upgrade lang/ghc to 8.8.3 and many Haskell ports along the way.

PR:		244784
Submitted by:	Evilham <contact@evilham.com> (some ports)

 

19:59 arrowd 

Mk/Uses/cabal.mk: Wrap *.cabal argument in ticks.

 

07:30 tobik 

Mk/Uses/cabal.mk: Fix typo in make-use-cabal-revs ENV vs. SETENV

While this typo is harmless when ENV is undefined in the environment,
ENV is also used by oksh(1) or sh(1) to source files on startup,
so when it set to some file like ~/.shrc it breaks the entire
command.

 

16:57 arrowd 

cabal.mk: Move hpack invocation to post-patch stage, as sometimes we need to
patch package.yaml before feeding it to hpack.

 

18:18 arrowd 

devel/hs-git-annex: Fix git-annex-shell and git-remote-tor-annex executables.

PR:		239289

 

07:53 arrowd 

Uses/cabal.mk: In case of wrong arguments, print the wrong one, not all of them.

Reported by:	tobik

 

10:16 arrowd 

Mk/Uses/cabal.mk: Check for invalid args.

Reported by:	tobik

 

16:52 arrowd 

Add support for USES= cabal:hpack and document this option.

 

18:37 arrowd 

cabal.mk: Transforms check-revs aux target into make-use-cabal-revs, which works
much better.

Submitted by:	Evilham <contact@evilham.com>

 

14:59 arrowd 

Make `make-use-cabal` aux target output an item per line.

 

18:44 arrowd 

cabal.mk: Pass `--disable-benchmarks --disable-tests` in do-build rule.
This cuts down amount of required dependencies and decreases build time.

 

16:03 arrowd 

In wrapper scripts, use $@ instead of $* to correctly pass arguments to the real
program

PR:		238719
Approved by:	tcberner (mentor, implicit)

 

13:57 arrowd 

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, install their data files.

PR:		237878
Reviewed by:	tcberner
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D20556

 

15:02 arrowd 

Restore "hs-" package name prefix for Haskell packages.

Reported by:	mat
Approved by:	mat

 

14:39 arrowd 

Introduce USES=cabal and use it to build Haskell applications.

PR:		230186
Reviewed by:	mat, tcberner
Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D19730