pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "openssl".



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d67e2fa539f5
branches:  trunk
changeset: 514587:d67e2fa539f5
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 14 16:57:07 2006 +0000

description:
Teach the tools framework about "openssl".

diffstat:

 mk/tools/defaults.mk        |   3 ++-
 mk/tools/replace.mk         |  13 ++++++++++++-
 mk/tools/tools.Darwin.mk    |   3 ++-
 mk/tools/tools.DragonFly.mk |   3 ++-
 mk/tools/tools.FreeBSD.mk   |   3 ++-
 mk/tools/tools.Linux.mk     |   5 ++++-
 mk/tools/tools.NetBSD.mk    |   3 ++-
 mk/tools/tools.OpenBSD.mk   |   3 ++-
 mk/tools/tools.SunOS.mk     |   5 ++++-
 9 files changed, 32 insertions(+), 9 deletions(-)

diffs (167 lines):

diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/defaults.mk      Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.46 2006/03/06 05:25:45 jlam Exp $
+# $NetBSD: defaults.mk,v 1.47 2006/06/14 16:57:07 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -106,6 +106,7 @@
 _TOOLS_VARNAME.mv=             MV
 _TOOLS_VARNAME.nice=           NICE
 _TOOLS_VARNAME.nroff=          NROFF
+_TOOLS_VARNAME.openssl=                OPENSSL
 _TOOLS_VARNAME.patch=          PATCH
 _TOOLS_VARNAME.pax=            PAX
 _TOOLS_VARNAME.perl=           PERL5
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/replace.mk       Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.169 2006/06/06 19:25:59 jlam Exp $
+# $NetBSD: replace.mk,v 1.170 2006/06/14 16:57:07 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -532,6 +532,17 @@
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.openssl) && !empty(_USE_TOOLS:Mopenssl)
+.  if !empty(PKGPATH:Msecurity/openssl)
+MAKEFLAGS+=                    TOOLS_IGNORE.openssl=
+.  elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS])
+TOOLS_DEPENDS.openssl?=                openssl>=0.9.6:../../security/openssl
+TOOLS_CREATE+=                 openssl
+TOOLS_FIND_PREFIX+=            TOOLS_PREFIX.openssl=openssl
+TOOLS_PATH.openssl=            ${TOOLS_PREFIX.openssl}/bin/openssl
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
 .  if !empty(PKGPATH:Mdevel/patch)
 MAKEFLAGS+=                    TOOLS_IGNORE.patch=
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.Darwin.mk  Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.25 2006/03/08 21:18:43 minskim Exp $
+# $NetBSD: tools.Darwin.mk,v 1.26 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -61,6 +61,7 @@
 TOOLS_PLATFORM.mv?=            /bin/mv
 TOOLS_PLATFORM.nice?=          /usr/bin/nice
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pwd?=           /bin/pwd
 TOOLS_PLATFORM.rm?=            /bin/rm
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.DragonFly.mk       Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.25 2006/05/21 16:55:23 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.26 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -55,6 +55,7 @@
 TOOLS_PLATFORM.mv?=            /bin/mv
 TOOLS_PLATFORM.nice?=          /usr/bin/nice
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pax?=           /bin/pax
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.FreeBSD.mk Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.26 2006/05/21 16:55:23 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.27 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -56,6 +56,7 @@
 TOOLS_PLATFORM.mv?=            /bin/mv
 TOOLS_PLATFORM.nice?=          /usr/bin/nice
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pax?=           /bin/pax
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.Linux.mk   Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.33 2006/05/21 16:55:23 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.34 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -138,6 +138,9 @@
 .if exists(/usr/bin/nroff)
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
 .endif
+.if exists(/usr/bin/openssl)
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
+.endif
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 .if exists(/usr/bin/printf)
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.NetBSD.mk  Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.31 2006/05/21 17:25:27 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.32 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -67,6 +67,7 @@
 TOOLS_PLATFORM.mv?=            /bin/mv
 TOOLS_PLATFORM.nice?=          /usr/bin/nice
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.pax?=           /bin/pax
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.OpenBSD.mk Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.24 2006/03/06 05:25:45 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.25 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -61,6 +61,7 @@
 TOOLS_PLATFORM.mv?=            /bin/mv
 TOOLS_PLATFORM.nice?=          /usr/bin/nice
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
 TOOLS_PLATFORM.patch?=         /usr/bin/patch
 TOOLS_PLATFORM.printf?=                /usr/bin/printf
 TOOLS_PLATFORM.pwd?=           /bin/pwd
diff -r ede8e7d0cca4 -r d67e2fa539f5 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Wed Jun 14 15:53:43 2006 +0000
+++ b/mk/tools/tools.SunOS.mk   Wed Jun 14 16:57:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.23 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.SunOS.mk,v 1.24 2006/06/14 16:57:07 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -58,6 +58,9 @@
 .if exists(/usr/bin/nroff)
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
 .endif
+.if exists(/usr/bin/openssl)
+TOOLS_PLATFORM.openssl?=       /usr/bin/openssl
+.endif
 .if exists(/usr/bin/gpatch)
 TOOLS_PLATFORM.patch?=         /usr/bin/gpatch
 .endif



Home | Main Index | Thread Index | Old Index