[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace non-current make(1) doesn...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed43251ca353
branches:  trunk
changeset: 529080:ed43251ca353
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed May 23 18:11:05 2007 +0000

description:
non-current make(1) doesn't support -V.
Provide a target for printing PKGSRCDIR. PKGREVISION++

diffstat:

 pkgtools/pkg_rolling-replace/Makefile                     |  4 ++--
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r d5be24d858b9 -r ed43251ca353 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Wed May 23 15:05:36 2007 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Wed May 23 18:11:05 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2007/05/20 13:35:55 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2007/05/23 18:11:05 tnn Exp $
 
 DISTNAME=      pkg_rolling-replace-0.04
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r d5be24d858b9 -r ed43251ca353 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Wed May 23 15:05:36 2007 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Wed May 23 18:11:05 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.5 2007/05/20 13:35:56 tnn Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.6 2007/05/23 18:11:05 tnn Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -67,7 +67,9 @@
 test -z "$PKG_DBDIR" && PKG_DBDIR=/var/db/pkg
 test -z "$MAKECONF" && MAKECONF="@MAKECONF@"
 test -f "$MAKECONF" && test -z "$PKGSRCDIR" && \
-    PKGSRCDIR="`$MAKE -f \"$MAKECONF\" BSD_PKG_MK=1 -V PKGSRCDIR`"
+    PKGSRCDIR="`(cat "$MAKECONF"; \
+    printf '\n_print_pkgsrcdir:\n\t@echo "${PKGSRCDIR}"\n') | \
+    "$MAKE" BSD_PKG_MK=1 -f - _print_pkgsrcdir`"
 test -z "$PKGSRCDIR" && PKGSRCDIR=/usr/pkgsrc
 
 unset PKG_PATH || true  #or pkgsrc makefiles will complain