Attempt to fix build by reverting bits not planned to be MFC'd
MFH: r365258

Mark BROKEN: Unfetchable

Reported by:	pkg-fallout
With hat:	portmgr
MFH: r364411

Mark BROKEN: fails to link

cc -O2 -pipe -fno-strict-aliasing       -I/usr/local/include -I../flx -I/usr/local/include    -DCSRG_BASED  -DFUNCPROTO=15 -DNARROWPROTO    -DHELP_DIR=\"/usr/local/lib/X11/xfpovray/help\" -c ./util.c
rm -f xfpovray
cc -o xfpovray       -L/usr/local/lib   ./build_pages.o 	./callbacks.o 	./show_image.o 	./xfpovray.o 	./tips.o 	./state.o 	./config.o 	./run_program.o 	./util.o  ../flx/libflx.a -L/usr/local/lib -lforms -lXpm -lm -lXext -lX11  -Wl,-rpath,/usr/local/lib
../flx/libflx.a(flx_return_button.o): In function `draw_return_button':
flx_return_button.c:(.text+0x178): undefined reference to `fl_drw_box'
flx_return_button.c:(.text+0x1a9): undefined reference to `fl_drw_box'
flx_return_button.c:(.text+0x1ff): undefined reference to `fl_drw_box'
*** [xfpovray] Error code 1

Reported by:	pkg-fallout
MFH: r365378

- Fix plist for WITH_DBI case

Approved by:	portmgr
MFH: r364735

- Fix dependency line for p5-Net. This was causing needless rebuilding of
  p5-Test-OpenLDAP with poudriere as it always thought the dependencies
  were changed. This also correctly registers the p5-Net as a dependency
  for package use.

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."