[src/trunk]: src/share/misc Strip carriage returns in domains.sed, not with t...

[jhawk <jhawk%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c3c36dba7ac
branches:  trunk
changeset: 543701:0c3c36dba7ac
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Sun Mar 02 21:32:33 2003 +0000

description:
Strip carriage returns in domains.sed, not with tr in Makefile.

diffstat:

 share/misc/Makefile    |  3 +--
 share/misc/domains.sed |  4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 1c217dad5a93 -r 0c3c36dba7ac share/misc/Makefile
--- a/share/misc/Makefile       Sun Mar 02 20:13:23 2003 +0000
+++ b/share/misc/Makefile       Sun Mar 02 21:32:33 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2003/03/02 20:12:16 jhawk Exp $
+#      $NetBSD: Makefile,v 1.25 2003/03/02 21:32:33 jhawk Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/8/93
 
 NOOBJ= # defined
@@ -15,7 +15,6 @@
        ( \
          mkdir /tmp/domains.$$$$; cd /tmp/domains.$$$$ ; \
          ftp -o - http://www.iana.org/cctld/cctld-whois.htm | \
-         tr -d \\015 | \
          sed -f ${.CURDIR}/domains.sed > list ;\
          echo '# $$''NetBSD: $$' ;  \
          echo '# ISO 3166 country codes, from http://www.iana.org/cctld/cctld-whois.htm' ; \
diff -r 1c217dad5a93 -r 0c3c36dba7ac share/misc/domains.sed
--- a/share/misc/domains.sed    Sun Mar 02 20:13:23 2003 +0000
+++ b/share/misc/domains.sed    Sun Mar 02 21:32:33 2003 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: domains.sed,v 1.1 2003/03/02 20:10:39 jhawk Exp $
+# $NetBSD: domains.sed,v 1.2 2003/03/02 21:32:33 jhawk Exp $
 :top
+#                              Strip ^Ms
+s/
//g                     
 #                              Join all lines with unterminated HTML tags
 /<[^>]*$/{
        N