[pkgsrc/trunk]: pkgsrc/mk/platform Move "GNU replacements" block to the top.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a10b7ee821ff
branches:  trunk
changeset: 490836:a10b7ee821ff
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Mar 21 14:49:25 2005 +0000

description:
Move "GNU replacements" block to the top.

Use gsort from coreutils instead of /bin/sort if coreutils is installed.

Install coreutils in BULK_PREREQ to get gsort; /bin/sort can't handle the
amazingly long lines produced by the dependency-tree printing script.

diffstat:

 mk/platform/Interix.mk |  28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diffs (64 lines):

diff -r 3bbf88c3b801 -r a10b7ee821ff mk/platform/Interix.mk
--- a/mk/platform/Interix.mk    Mon Mar 21 14:44:08 2005 +0000
+++ b/mk/platform/Interix.mk    Mon Mar 21 14:49:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.26 2005/03/19 03:32:36 tv Exp $
+# $NetBSD: Interix.mk,v 1.27 2005/03/21 14:49:25 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -33,18 +33,24 @@
 #   (main lib) 0x48000000
 # zsh          *
 
-BULK_PREREQ+=  lang/gawk
+BULK_PREREQ+=  lang/gawk sysutils/coreutils
 
 # "catinstall" not yet supported as there's no shipped [gn]roff
 MANINSTALL=    maninstall
 MAKE_FLAGS+=   MKCATPAGES=no NOLINT=1
 
-# Allow for pkgsrc gawk as a newer and less buggy drop-in replacement.
-.if exists(${LOCALBASE}/bin/gawk)
-AWK?=          ${LOCALBASE}/bin/gawk
-.else
+# Use some pkgsrc versions as "better" replacements, if installed
+.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk)
+AWK?=          ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
+.endif
+.if exists(${LOCALBASE}/bin/gtar)
+GTAR?=         ${LOCALBASE}/bin/gtar
+.endif
+.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort)
+SORT?=         ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort
+.endif
+
 AWK?=          /usr/contrib/bin/gawk
-.endif
 BASENAME?=     /bin/basename
 CAT?=          /bin/cat
 CHMOD?=                /bin/chmod
@@ -65,11 +71,7 @@
 FIND?=         /bin/find
 GMAKE?=                ${LOCALBASE}/bin/gmake
 GREP?=         /bin/grep
-.if exists(${LOCALBASE}/bin/gtar)
-GTAR?=         ${LOCALBASE}/bin/gtar
-.else
 GTAR?=         ${LOCALBASE}/bin/tar
-.endif
 GUNZIP_CMD?=   /usr/contrib/bin/gunzip -f
 GZCAT?=                /usr/contrib/bin/gunzip -c
 GZIP?=         -9
@@ -89,11 +91,7 @@
 MV?=           /bin/mv
 NICE?=         /bin/nice
 PATCH?=                ${LOCALBASE}/bin/gpatch
-.if exists(${LOCALBASE}/bin/pax)
 PAX?=          ${LOCALBASE}/bin/pax
-.else
-PAX?=          /bin/pax
-.endif
 PERL5?=                ${LOCALBASE}/bin/perl
 PKGLOCALEDIR?= share
 PS?=           /bin/ps