actually heed localbase when looking for groff

diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
index 0e25230..df84aef 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackingElement.pm,v 1.266 2018/08/03 06:39:12 espie Exp $
+# $OpenBSD: PackingElement.pm,v 1.267 2018/08/03 06:49:26 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -643,7 +643,7 @@ sub format
                    close $destfh;
                    chdir($dir) or die "Can't chdir to $dir";
                    },
-                   OpenBSD::Paths->groff,
+                   $state->{groff} // OpenBSD::Paths->groff,
                    qw(-mandoc -mtty-char -E -Ww -Tascii -P -c),
                    @extra, '--', $file);
                if ($r != 0) {

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index 3cf12e4..9cef44b 100644 (file)
--- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCreate.pm,v 1.152 2018/08/03 06:39:12 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.153 2018/08/03 06:49:26 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -1336,6 +1336,7 @@ sub add_elements
 
        if (defined $state->opt('L')) {
                OpenBSD::PackingElement::LocalBase->add($plist, $state->opt('L'));
+               $state->{groff} = $state->opt('L'). '/bin/groff';
        }
        $self->add_extra_info($plist, $state);
        if ($state->{system_version}) {