Partial MFH of r363230 and r362796 to fix multiple databases being added to
LIB_DEPENDS. This was causing needless rebuilding with poudriere.

With hat:	portmgr
Fix devel/hs-haddock losing the HSCOLOUR option in the package it creates. This
was causing poudriere to rebuild the package on every run even if the port
was not updated.

Direct commit as head did a major release to the Haskell ports in r364579
which covered this.

With hat:	portmgr
Obtained from:	https://github.com/freebsd-haskell/ports/commit/8a17f83af2b4793103f5ef6ffced95dfd6d831fe.patch
MFH: r365528

- Remove unneeded LIB_DEPENDS for avahi.
  padevchooser does not link directly to avahi. Pulseaudio links directly to it
  and already depends on it. Pkg only considers library dependencies for
  DT_NEEDED links. Because avahi is not actually needed it is not registered as
  a dependency in the package. This causes poudriere to rebuild this port
  on every build because it sees avahi in LIB_DEPENDS but not registered in
  the package.
  ldd(1) shows the indirect dependency on avahi, however the direct deps can
  be seen with ldd -a or readelf -d.

With hat:	portmgr
MFH: r365576

- Make 'clean-restricted' tell that it is deleting the package.
  Don't show this verbose output when calling delete-package on
  failures from do-package though.

With hat:	portmgr
Make sysutils/pstree operable in jailed environment.

(cherry picked from commit 0aa00da618ffa2bc5b4c4f8b89be22b9df2e9936)
Fixed replacement of $(PGBOUNCER_RUNDIR) in files/pgbouncer.in
Revert "Define and use "our_gid" variable."