pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace SUBST the path to ${MAKE}.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4558112d51e3
branches:  trunk
changeset: 522707:4558112d51e3
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Dec 18 12:36:17 2006 +0000

description:
SUBST the path to ${MAKE}.
PKGREVISION++.

diffstat:

 pkgtools/pkg_rolling-replace/Makefile                     |  10 ++++++++--
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh |  12 +++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r a49f1b59593f -r 4558112d51e3 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Mon Dec 18 11:35:37 2006 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Mon Dec 18 12:36:17 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/12/06 00:54:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2006/12/18 12:36:17 gdt Exp $
 
 DISTNAME=      pkg_rolling-replace-0.04
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -23,6 +23,12 @@
 
 INSTALLATION_DIRS=     sbin man/man8
 
+SUBST_CLASSES+=                makepath
+SUBST_STAGE.makepath=  pre-configure
+SUBST_MESSAGE.makepath=        Fixing path to ${MAKE}.
+SUBST_FILES.makepath=  pkg_rolling-replace.sh
+SUBST_SED.makepath=    -e 's,@MAKE@,${MAKE},g'
+
 .include "../../mk/bsd.prefs.mk"
 
 # target exists only to force check-pkgsrc-patch prior to install
diff -r a49f1b59593f -r 4558112d51e3 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Mon Dec 18 11:35:37 2006 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Mon Dec 18 12:36:17 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.1.1.1 2006/12/05 18:23:52 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.2 2006/12/18 12:36:17 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -67,14 +67,8 @@
 
 unset PKG_PATH || true  #or pkgsrc makefiles will complain
 
-MAKE=make
-# XXX Find BSD make at package build time.
-UNAME=`uname`
-case "$UNAME" in
-    Darwin)
-    MAKE=bmake
-    ;;
-esac
+# Substituted by pkgsrc at pre-configure time.
+MAKE=@MAKE@
 
 usage()
 {



Home | Main Index | Thread Index | Old Index