summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.pkg.mk15
-rw-r--r--mk/platform/AIX.mk3
-rw-r--r--mk/platform/BSDOS.mk3
-rw-r--r--mk/platform/Darwin.mk3
-rw-r--r--mk/platform/DragonFly.mk3
-rw-r--r--mk/platform/FreeBSD.mk3
-rw-r--r--mk/platform/IRIX.mk3
-rw-r--r--mk/platform/Interix.mk3
-rw-r--r--mk/platform/Linux.mk3
-rw-r--r--mk/platform/NetBSD.mk3
-rw-r--r--mk/platform/OSF1.mk3
-rw-r--r--mk/platform/OpenBSD.mk3
-rw-r--r--mk/platform/SunOS.mk3
-rw-r--r--mk/platform/UnixWare.mk3
14 files changed, 18 insertions, 36 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c099c93e5a1..5f07aabdb10 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -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 @@ print-pkg-size-this:
| ${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 @@ print-pkg-size-depends:
| ${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 @@ post-install-fake-pkg: ${PLIST} ${DESCR} ${MESSAGE}
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 --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index 5695de6b973..d039573035f 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -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 @@ CP?= /bin/cp
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 --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 4f03ea31373..d19f93a49a7 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -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 @@ CXX= /usr/bin/g++
.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 --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 8714595710f..ac54de959d3 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -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 @@ CPP= ${CC} -E ${CPP_PRECOMP_FLAGS}
.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 --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index d0b11faa24c..f361e229720 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -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 @@ CMP?= /usr/bin/cmp
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 --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index ab567b31d60..3757aca975f 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -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 @@ CMP?= /usr/bin/cmp
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 --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index d6f9c1c957e..c3d5e8f9321 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -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 @@ CMP?= /usr/bin/cmp
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 --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index b89c5ae4d33..939ec32600f 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -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 @@ CMP?= /bin/cmp
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 --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 4593f0949dd..556a5993f54 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -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?= /bin/cut
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 --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 6879f692129..d75490c81ef 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -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 @@ CPP= /usr/bin/cpp
.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 --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index 3e94e532ccf..e3165636f5f 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -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 @@ CP?= /bin/cp
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 --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 0e406c959a8..ae11afd70a3 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -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 @@ CMP?= /usr/bin/cmp
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 --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index e681f077ca0..5cbcadce1c1 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -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 @@ CMP?= cmp
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 --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 0b7b54733cd..ac136bc3875 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -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 @@ CMP?= /usr/bin/cmp
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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 18:01:41 +0000