pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Don't make pkgsrc depend on dc(1) to be present in ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3c18972cdaee
branches: trunk
changeset: 488359:3c18972cdaee
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jan 28 21:05:59 2005 +0000
description:
Don't make pkgsrc depend on dc(1) to be present in the system. Since
we already use awk so pervasively in pkgsrc, simply use awk in place
of dc for simple computations.
diffstat:
mk/bsd.pkg.mk | 15 +++++----------
mk/platform/AIX.mk | 3 +--
mk/platform/BSDOS.mk | 3 +--
mk/platform/Darwin.mk | 3 +--
mk/platform/DragonFly.mk | 3 +--
mk/platform/FreeBSD.mk | 3 +--
mk/platform/IRIX.mk | 3 +--
mk/platform/Interix.mk | 3 +--
mk/platform/Linux.mk | 3 +--
mk/platform/NetBSD.mk | 3 +--
mk/platform/OSF1.mk | 3 +--
mk/platform/OpenBSD.mk | 3 +--
mk/platform/SunOS.mk | 3 +--
mk/platform/UnixWare.mk | 3 +--
14 files changed, 18 insertions(+), 36 deletions(-)
diffs (264 lines):
diff -r 16ab6296b63f -r 3c18972cdaee mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/bsd.pkg.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1577 2005/01/27 18:32:20 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1578 2005/01/28 21:05:59 jlam Exp $
#
# This file is in the public domain.
#
@@ -4529,10 +4529,7 @@
| ${SORT} -u \
| ${SED} -e "s/'/'\\\\''/g" -e "s/.*/'&'/" \
| ${XARGS} -n 256 ${LS} -ld \
- | ${AWK} 'BEGIN { print("0 "); } \
- { print($$5, " + "); } \
- END { print("p"); }' \
- | ${DC}
+ | ${AWK} '{ s += $$5; } END { print s; }' \
# Sizes of required pkgs (only)
#
@@ -4546,10 +4543,7 @@
| ${XARGS} -n 1 ${SETENV} ${PKG_BEST_EXISTS} \
| ${SORT} -u \
| ${XARGS} -n 256 ${SETENV} ${PKG_INFO} -qs \
- | ${AWK} -- 'BEGIN { print("0 "); } \
- /^[0-9]+$$/ { print($$1, " + "); } \
- END { print("p"); }' \
- | ${DC}; \
+ | ${AWK} '/^[0-9]+$$/ { s += $$1; } END { print s; }'; \
else \
${ECHO} "0"; \
fi
@@ -4890,7 +4884,8 @@
size_this=`${MAKE} ${MAKEFLAGS} print-pkg-size-this`; \
size_depends=`${MAKE} ${MAKEFLAGS} print-pkg-size-depends`; \
${ECHO} $$size_this >${SIZE_PKG_FILE}; \
- ${ECHO} $$size_this $$size_depends + p | ${DC} >${SIZE_ALL_FILE}
+ ${ECHO} $$size_this $$size_depends \
+ | ${AWK} '{ print $$1 + $$2; }' >${SIZE_ALL_FILE}
.endif
# Fake installation of package so that user can pkg_delete it later.
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/AIX.mk
--- a/mk/platform/AIX.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/AIX.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: AIX.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the AIX operating system.
@@ -13,7 +13,6 @@
CPP?= ${LOCALBASE}/bin/cpp
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/BSDOS.mk
--- a/mk/platform/BSDOS.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/BSDOS.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -17,7 +17,6 @@
.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/Darwin.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: Darwin.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the Darwin operating system.
@@ -15,7 +15,6 @@
.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/DragonFly.mk
--- a/mk/platform/DragonFly.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/DragonFly.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.9 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the DragonFly operating system.
@@ -13,7 +13,6 @@
CP?= /bin/cp
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/FreeBSD.mk
--- a/mk/platform/FreeBSD.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/FreeBSD.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -13,7 +13,6 @@
CP?= /bin/cp
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/IRIX.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: IRIX.mk,v 1.9 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the IRIX operating system.
@@ -12,7 +12,6 @@
CP?= /sbin/cp
CUT?= /usr/bin/cut
DATE?= /sbin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/Interix.mk
--- a/mk/platform/Interix.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/Interix.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.22 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: Interix.mk,v 1.23 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the Interix operating system.
@@ -47,7 +47,6 @@
CP?= /bin/cp
CUT?= /bin/cut
DATE?= /bin/date
-DC?= /bin/dc
DIRNAME?= /bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= /bin/printf %s # does not support "echo -n"
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/Linux.mk
--- a/mk/platform/Linux.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/Linux.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.7 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: Linux.mk,v 1.8 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the Linux operating system.
@@ -20,7 +20,6 @@
CUT?= /usr/bin/cut
.endif
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/NetBSD.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -16,7 +16,6 @@
.endif
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/OSF1.mk
--- a/mk/platform/OSF1.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/OSF1.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.1 2004/11/20 04:37:08 grant Exp $
+# $NetBSD: OSF1.mk,v 1.2 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the OSF1 operating system.
@@ -20,7 +20,6 @@
CPP?= /usr/bin/cpp
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/bin/echo
ECHO_N?= ${SETENV} CMD_ENV=bsd /usr/bin/echo -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/OpenBSD.mk
--- a/mk/platform/OpenBSD.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/OpenBSD.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.10 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.11 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -12,7 +12,6 @@
CP?= /bin/cp
CUT?= /usr/bin/cut
DATE?= /bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= echo # Shell builtin
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/SunOS.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: SunOS.mk,v 1.9 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -12,7 +12,6 @@
CP?= /usr/bin/cp
CUT?= /usr/bin/cut
DATE?= /usr/xpg4/bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/ucb/echo
ECHO_N?= ${ECHO} -n
diff -r 16ab6296b63f -r 3c18972cdaee mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk Fri Jan 28 19:06:07 2005 +0000
+++ b/mk/platform/UnixWare.mk Fri Jan 28 21:05:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.7 2005/01/28 21:05:59 jlam Exp $
#
# Variable definitions for the UnixWare 7 operating system.
@@ -12,7 +12,6 @@
CP?= /usr/bin/cp
CUT?= /usr/bin/cut
DATE?= /usr/bin/date
-DC?= /usr/bin/dc
DIRNAME?= /usr/bin/dirname
ECHO?= /usr/ucb/echo
ECHO_N?= ${ECHO} -n
Home |
Main Index |
Thread Index |
Old Index