I am fine with the way it is now, however we can improve. Thanks very much for your time on this!

I see what is happening! I am using a shared build system. The option of PNG is being added to the options for building of print/freetype. Thanks for all of your help. I'll send the patch through, as is, and bump to 5.59.

I'm using a nearly identical patch to the one you submitted... and same issue.

In D21556#478351, @jrm wrote:

print/freetype2 does not have a hard dependency on graphics/png unless you turn on the non-default PNG knob.

In D21556#478348, @jrm wrote:

Those are not identical builds to the patch that I submitted, are they? I see the version is 5.59, so I can't really say.

After building, I am getting the same error. Any ideas?

In D21556#478274, @jrm wrote:

I didn't get any errors with poudriere testport building in 11/12 i386/amd64 with the default options.

Here are the logs:
11i386: http://pkg.awarnach.mathstat.dal.ca/data/11i386-default/2019-10-04_13h55m33s/logs/xlockmore-5.58_2.log
11amd64: http://pkg.awarnach.mathstat.dal.ca/data/11amd64-default/2019-10-04_12h06m41s/logs/xlockmore-5.58_2.log
12i386: http://pkg.awarnach.mathstat.dal.ca/data/12i386-default/2019-10-04_12h06m41s/logs/xlockmore-5.58_2.log
12amd64: http://pkg.awarnach.mathstat.dal.ca/data/12amd64-default/2019-10-04_12h06m40s/logs/xlockmore-5.58_2.log

All the outputs of ldd /usr/local/bin/xlock are empty, so xlock is not linking to libpng with the default options.

root@11i386-default:~ # ldd /usr/local/bin/xlock | grep png
root@11amd64-default:~ # ldd /usr/local/bin/xlock | grep png
root@12i386-default:~ # ldd /usr/local/bin/xlock | grep png
root@12amd64-default:~ # ldd /usr/local/bin/xlock | grep png

For some reason I am unable to update the diff and have it not create a brand new revision in the tool. Attached is the diff that I re-sorted so I could properly review the changes more effectively for me.

I can look at this more later this week, but I wasn't suggesting to not do them, but I was suggesting to do them after fixing the bugs. Cleaning up the Makefile is other commit, imho, that I would rather commit once bugs are fixed. I would prefer minimal change and not introduce any other variables at this time. I really appreciate your time on this!

I will look this over, but I urge you to please not shift changes that aren't required for this change. It makes it difficult to review changes that are necessary with those that aren't for this particular fix.

Please review notes from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=240526

I can take a look at this more later this week/weekend, but I did look at the previous revision, and MB was not enabled. I thought you had mentioned not making XINERAMA default. Do you still feel this way? I also sent a message to upstream regarding setuid note.