MFH: r364589

devel/thrift-cpp:
- Unbreak Makefile when building with QT4 support. USE_QT4 cannot be set
  after bsd.port.pre.mk and requires inclusion of bsd.port.options.mk
  (when used with options). However converting to options helpers saves
  us from additional include.
- Replace spaces with tab while here

PR:		189127
Reported by:	jrh29@alumni.cwru.edu
Approved by:	maintainer timeout (3 months from the date of report, I didn't
		wait approval for my patch)
Approved by:	portmgr (erwin)
MFH: r364945

net-im/psi:
- Add dependence on archivers/minizip
- Convert to options helpers
- Reorder paths to always include internal socks.h [1]

PR:		192270 [1]
Reported by:	Jordan Irwin
Approved by:	portmgr (erwin)
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."