pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Some updates:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/092e1a608a3d
branches:  trunk
changeset: 649538:092e1a608a3d
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sun Apr 05 00:22:44 2015 +0000

description:
Some updates:

* Test for /usr/sbin/chgrp (it's a link, but hey);
* Test for /usr/sbin/openssl as an alternative location. There is no entry
  in /usr/bin (at least in OpenBSD 5.6);
* /usr/bin/tbl doesn't exist in OpenBSD 5.6, so test for it before setting;

diffstat:

 mk/tools/tools.OpenBSD.mk |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (40 lines):

diff -r 9e4949852326 -r 092e1a608a3d mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Sat Apr 04 21:50:51 2015 +0000
+++ b/mk/tools/tools.OpenBSD.mk Sun Apr 05 00:22:44 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.35 2014/03/06 07:34:20 uebayasi Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.36 2015/04/05 00:22:44 rodent Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -11,6 +11,8 @@
 TOOLS_PLATFORM.chgrp?=         /bin/chgrp
 .elif exists(/usr/bin/chgrp)
 TOOLS_PLATFORM.chgrp?=         /usr/bin/chgrp
+.elif exists(/usr/sbin/chgrp)
+TOOLS_PLATFORM.chgrp?=         /usr/sbin/chgrp
 .endif
 TOOLS_PLATFORM.chmod?=         /bin/chmod
 .if exists(/sbin/chown)
@@ -65,7 +67,11 @@
 .if exists(/usr/bin/nroff)
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
 .endif
+.if exists(/usr/bin/openssl)
 TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
+.elif exists(/usr/sbin/openssl)
+TOOLS_PLATFORM.openssl?=       /usr/sbin/openssl
+.endif
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pax?=           /bin/pax
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
@@ -89,7 +95,9 @@
 .elif exists(/usr/bin/tar)
 TOOLS_PLATFORM.tar?=           /usr/bin/tar
 .endif
+.if exists(/usr/bin/tbl)
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
+.endif
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
 TOOLS_PLATFORM.touch?=         /usr/bin/touch



Home | Main Index | Thread Index | Old Index