pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Introduce DJB_SLASHPACKAGE, defaulting to NO. /pack...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c3f57bd4fce
branches:  trunk
changeset: 506048:3c3f57bd4fce
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Jan 11 09:26:52 2006 +0000

description:
Introduce DJB_SLASHPACKAGE, defaulting to NO. /package is DJB's
scheme for the installation and maintenance of software. Over time,
more software will follow /package.

For now, setting DJB_SLASHPACKAGE to YES has two effects:
* DJB_CONFIG_DIR is set to ${WRKSRC}/src
* A do-build target is defined to call package/compile.

diffstat:

 mk/djbware.mk |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (43 lines):

diff -r 023c26a5f33d -r 3c3f57bd4fce mk/djbware.mk
--- a/mk/djbware.mk     Wed Jan 11 05:48:19 2006 +0000
+++ b/mk/djbware.mk     Wed Jan 11 09:26:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.13 2005/12/18 20:25:35 joerg Exp $
+# $NetBSD: djbware.mk,v 1.14 2006/01/11 09:26:52 schmonz Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -30,6 +30,12 @@
 DJB_MAKE_TARGETS?=     YES
 DJB_BUILD_TARGETS?=    # empty
 DJB_INSTALL_TARGETS?=  # empty
+DJB_SLASHPACKAGE?=     NO
+.if !empty(DJB_SLASHPACKAGE:M[yY][eE][sS])
+DJB_CONFIG_DIR?=       ${WRKSRC}/src
+.else
+DJB_CONFIG_DIR?=       ${WRKSRC}
+.endif
 DJB_CONFIG_PREFIX?=    ${PREFIX}
 DJB_CONFIG_HOME?=      conf-home
 DJB_CONFIG_CMDS?=      ${DO_NADA}
@@ -47,7 +53,7 @@
 
 .if !defined(NO_CONFIGURE) && !target(do-configure)
 do-configure:
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${DJB_CONFIG_DIR};                \
        for i in conf-*; do ${CP} $${i} $${i}.orig_dist; done;          \
        [ -f ${DJB_CONFIG_HOME} ] && \
                ${ECHO} ${DJB_CONFIG_PREFIX} > ${DJB_CONFIG_HOME};      \
@@ -68,6 +74,11 @@
        ${DJB_CONFIG_CMDS}
 .endif
 
+.if !target(do-build) && !empty(DJB_SLASHPACKAGE:M[yY][eE][sS])
+do-build:
+       cd ${WRKSRC} && package/compile
+.endif
+
 PKG_SUPPORTED_OPTIONS+=        djbware-errno-hack
 PKG_SUGGESTED_OPTIONS+=        djbware-errno-hack
 



Home | Main Index | Thread Index | Old Index