pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Move some wrapper definitions into a separate file ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/98e6b9d195cc
branches: trunk
changeset: 481185:98e6b9d195cc
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Sep 27 12:05:53 2004 +0000
description:
Move some wrapper definitions into a separate file wrapper-defs.mk that is
included by bsd.prefs.mk. This allows the following variables to be used
before bsd.wrapper.mk is included:
WRAPPER_DIR WRAPPER_SRCDIR
WRAPPER_BINDIR WRAPPER_SHELL
WRAPPER_TMPDIR
diffstat:
mk/bsd.prefs.mk | 7 ++++++-
mk/wrapper/bsd.wrapper.mk | 9 +++------
mk/wrapper/wrapper-defs.mk | 46 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 7 deletions(-)
diffs (97 lines):
diff -r 6f88410883f4 -r 98e6b9d195cc mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Mon Sep 27 12:00:56 2004 +0000
+++ b/mk/bsd.prefs.mk Mon Sep 27 12:05:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.167 2004/09/27 12:00:56 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.168 2004/09/27 12:05:53 jlam Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -511,4 +511,9 @@
PKG_DEFAULT_OPTIONS?= # empty
PKG_OPTIONS?= # empty
+# Wrapper framework definitions
+.if exists(${PKGSRC_TOPDIR}/mk/wrapper/wrapper-defs.mk)
+. include "${PKGSRC_TOPDIR}/mk/wrapper/wrapper-defs.mk"
+.endif
+
.endif # BSD_PKG_MK
diff -r 6f88410883f4 -r 98e6b9d195cc mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Mon Sep 27 12:00:56 2004 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Mon Sep 27 12:05:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.4 2004/09/26 21:38:03 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.5 2004/09/27 12:05:53 jlam Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,16 +34,13 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+.include "../../mk/wrapper/wrapper-defs.mk"
+
.if ${PKG_DEBUG_LEVEL} > 0
ECHO_WRAPPER_MSG?= ${ECHO}
.else
ECHO_WRAPPER_MSG?= ${TRUE}
.endif
-WRAPPER_DIR= ${WRKDIR}/.wrapper
-WRAPPER_BINDIR= ${WRAPPER_DIR}/bin
-WRAPPER_TMPDIR= ${WRAPPER_DIR}/tmp
-WRAPPER_SRCDIR= ${.CURDIR}/../../mk/wrapper
-WRAPPER_SHELL= ${SH}
_WRAP_VARS_MK= ${WRAPPER_DIR}/vars.mk
.if exists(${_WRAP_VARS_MK})
diff -r 6f88410883f4 -r 98e6b9d195cc mk/wrapper/wrapper-defs.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/wrapper-defs.mk Mon Sep 27 12:05:53 2004 +0000
@@ -0,0 +1,46 @@
+# $NetBSD: wrapper-defs.mk,v 1.1 2004/09/27 12:05:53 jlam Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the NetBSD
+# Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+.if !defined(WRAPPER_DEFS_MK)
+WRAPPER_DEFS_MK= defined
+
+WRAPPER_DIR= ${WRKDIR}/.wrapper
+WRAPPER_BINDIR= ${WRAPPER_DIR}/bin
+WRAPPER_TMPDIR= ${WRAPPER_DIR}/tmp
+WRAPPER_SRCDIR= ${.CURDIR}/../../mk/wrapper
+WRAPPER_SHELL= ${SH}
+
+.endif # WRAPPER_DEFS_MK
Home |
Main Index |
Thread Index |
Old Index