commit: fix perl scripts for FreeBSD and add explicit gmake

lib.d/do-configure.pl

@@ -1,5 +1,7 @@
-#!/usr/bin/perl -w
-# eotk (c) 2017 Alec Muffett
+#!/bin/sh
+exec perl -wx $0 "$@";
+#!perl -w
+# eotk (c) 2017-2020 Alec Muffett
 
 use Data::Dumper;
 

lib.d/do-obconfig.pl

@@ -1,4 +1,7 @@
-#!/usr/bin/perl
+#!/bin/sh
+exec perl -x $0 "$@";
+#!perl
+# eotk (c) 2017-2020 Alec Muffett
 
 # data structures
 

lib.d/expand-config.pl

@@ -1,5 +1,7 @@
-#!/usr/bin/perl -w
-# eotk (c) 2017 Alec Muffett
+#!/bin/sh
+exec perl -wx $0 "$@";
+#!perl -w
+# eotk (c) 2017-2020 Alec Muffett
 
 if (-t STDIN) { # stderr is already redirected...
     if (open(DOTS, ">/dev/tty")) {

lib.d/expand-template.pl

@@ -1,5 +1,7 @@
-#!/usr/bin/perl -w
-# eotk (c) 2017 Alec Muffett
+#!/bin/sh
+exec perl -wx $0 "$@";
+#!perl -w
+# eotk (c) 2017-2020 Alec Muffett
 
 use Data::Dumper;
 

lib.d/explain.pl

@@ -1,4 +1,8 @@
-#!/usr/bin/perl -n
+#!/bin/sh
+exec perl -nx $0 "$@";
+#!perl -n
+# eotk (c) 2017-2020 Alec Muffett
+
 next unless /##/o;
 
 s/\s+/ /go;

lib.d/generate-bw-code.pl

@@ -1,4 +1,7 @@
-#!/usr/bin/perl
+#!/bin/sh
+exec perl -x $0 "$@";
+#!perl
+# eotk (c) 2017-2020 Alec Muffett
 
 $warning = "(generated)";
 $begin = "# ---- BEGIN CODE GENERATED BY $0 ---- -*- awk -*-\n\n";

lib.d/lint-expressions.pl

@@ -1,4 +1,7 @@
-#!/usr/bin/perl -n
+#!/bin/sh
+exec perl -nx $0 "$@";
+#!perl -n
+# eotk (c) 2017-2020 Alec Muffett
 
 if (/^\s*%\w+(?=[^\w%])/) {  # catch "%IF" and similar single-percent typos
     print "suspicious expression at $ARGV line $.: $_";

lib.d/lint.pl

@@ -1,5 +1,7 @@
-#!/usr/bin/perl
-# eotk (c) 2017 Alec Muffett
+#!/bin/sh
+exec perl -x $0 "$@";
+#!perl
+# eotk (c) 2017-2020 Alec Muffett
 
 my %known =
     (

opt.d/build-freebsd-12.1.sh

@@ -6,18 +6,19 @@ opt_dir=`pwd`
 . $opt_dir/lib.sh
 
 # platform dependencies
-shared_deps="
-gmake
-libevent
-"
-: pkg install $shared_deps || exit 1
+shared_deps="gmake libevent"
+echo $0: calling su to satisfy package dependencies
+su root -c "pkg install $shared_deps" || exit 1
+
+# use GNU make
+MAKE=gmake
 
 # build openresty
-: SetupOpenRestyVars || exit 1
-: CustomiseVars || exit 1
-: SetupForBuild || exit 1
-: ConfigureOpenResty || exit 1
-: BuildAndCleanup || exit 1
+SetupOpenRestyVars || exit 1
+CustomiseVars || exit 1
+SetupForBuild || exit 1
+ConfigureOpenResty || exit 1
+BuildAndCleanup || exit 1
 
 # build tor
 SetupTorVars || exit 1

opt.d/lib.sh

@@ -1,5 +1,6 @@
 #!/bin/sh -x
 
+MAKE=make
 keyserver="keyserver.ubuntu.com" # standard
 
 CustomiseVars() {
@@ -19,8 +20,8 @@ SetupForBuild() {
 }
 
 BuildAndCleanup() {
-    gmake || exit 1
-    gmake install || exit 1
+    $MAKE || exit 1
+    $MAKE install || exit 1
     cd $opt_dir || exit 1
     for x in $tool_link_paths ; do ln -sf "$install_dir/$x" || exit 1 ; done
     rm -rf "$tool_tarball" "$tool_sig" "$tool_dir" || exit 1