From: espie <espie@openbsd.org>
Date: Fri, 3 Aug 2018 06:49:26 +0000 (+0000)
Subject: actually heed localbase when looking for groff
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4d5b0139938b02015774e094328b21dd925fd1d4;p=openbsd

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 0e252304646..df84aef443a 100644
--- 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 3cf12e4cfa6..9cef44b4290 100644
--- 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}) {