Module Name:    src
Committed By:   mlelstv
Date:           Sun May 24 22:59:18 UTC 2009

Modified Files:
        src/distrib/amiga/miniroot: install.md list

Log Message:
file(1) no longer provides the plain text "magic" database.

change the install.md script to not need file(1) similar to what the
sparc port did.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.18 -r1.19 src/distrib/amiga/miniroot/list

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.26 src/distrib/amiga/miniroot/install.md:1.27
--- src/distrib/amiga/miniroot/install.md:1.26	Wed Apr 30 13:10:47 2008
+++ src/distrib/amiga/miniroot/install.md	Sun May 24 22:59:18 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: install.md,v 1.26 2008/04/30 13:10:47 martin Exp $
+#	$NetBSD: install.md,v 1.27 2009/05/24 22:59:18 mlelstv Exp $
 #
 #
 # Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -329,8 +329,7 @@
 	test -h $1 && return 1
 	test -f $1 || return 1
 
-	r=`file $1 | sed -n -e '/ELF/p'`
-	test -z "$r" || return 1
+	[ "`dd if=$1 bs=1 skip=1 count=3 2> /dev/null`" = "ELF" ] && return 1
 	return 0
 }
 

Index: src/distrib/amiga/miniroot/list
diff -u src/distrib/amiga/miniroot/list:1.18 src/distrib/amiga/miniroot/list:1.19
--- src/distrib/amiga/miniroot/list:1.18	Thu Oct 30 12:39:16 2008
+++ src/distrib/amiga/miniroot/list	Sun May 24 22:59:18 2009
@@ -1,10 +1,9 @@
-#	$NetBSD: list,v 1.18 2008/10/30 12:39:16 tsutsui Exp $
+#	$NetBSD: list,v 1.19 2009/05/24 22:59:18 mlelstv Exp $
 
 # Amiga extra's
 PROG	sbin/disklabel
 PROG	sbin/mount_ados
 PROG	sbin/mount_kernfs
-PROG	usr/bin/file
 PROG	usr/bin/netstat
 PROG	usr/bin/printf
 PROG	usr/bin/vi
@@ -30,9 +29,6 @@
 # and the termcap file
 COPY	${ARCHDIR}/termcap.vt		usr/share/misc/termcap
 
-# and the magic file
-COPY	${DESTDIR}/usr/share/misc/magic usr/share/misc/magic
-
 # and the installation scripts
 COPY	${ARCHDIR}/install.md		install.md
 COPY	${ARCHDIR}/dot.profile		.profile

Reply via email to