pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Fix awk warnings in MASTER_SORT* code.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9a77cff394e
branches:  trunk
changeset: 465813:f9a77cff394e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jan 06 14:43:02 2004 +0000

description:
Fix awk warnings in MASTER_SORT* code.
>From Stoned Elipot (seb@).

diffstat:

 mk/bsd.pkg.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r afacd7445809 -r f9a77cff394e mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jan 06 12:03:20 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Jan 06 14:43:02 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1337 2004/01/06 09:30:41 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1338 2004/01/06 14:43:02 wiz Exp $
 #
 # This file is in the public domain.
 #
@@ -1622,14 +1622,14 @@
 MASTER_SORT_REGEX?=
 MASTER_SORT_REGEX+= ${MASTER_SORT:S/./\\./g:C/.*/:\/\/[^\/]*&\//}
 
-MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX}"; }
+MASTER_SORT_AWK= BEGIN { RS = " "; ORS = " "; IGNORECASE = 1 ; gl = "${MASTER_SORT_REGEX:S/\\/\\\\/g}"; }
 .  for srt in ${MASTER_SORT_REGEX}
-MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt}"] = good["${srt}"] " " $$0 ; next; }
+MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt:S/\\/\\\\/g}"] = good["${srt:S/\\/\\\\/g}"] " " $$0 ; next; }
 .  endfor
 MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; }
 
 SORT_SITES_CMD= ${ECHO} $$unsorted_sites | ${AWK} '${MASTER_SORT_AWK}'
-ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD:C/"/\"/g}`
+ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD:S/\\/\\\\/g:C/"/\"/g}`
 .else
 ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites
 .endif



Home | Main Index | Thread Index | Old Index