Module Name: src
Committed By: christos
Date: Fri May 8 17:34:35 UTC 2009
Modified Files:
src/external/bsd/file/dist: Makefile.am Makefile.in configure
src/external/bsd/file/dist/doc: file.1
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: archive filesystems
Log Message:
apply our local patches
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/Makefile.am \
src/external/bsd/file/dist/Makefile.in \
src/external/bsd/file/dist/configure
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/Makefile.am \
src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/file/dist/magic/magdir/archive \
src/external/bsd/file/dist/magic/magdir/filesystems
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/file/dist/Makefile.am
diff -u src/external/bsd/file/dist/Makefile.am:1.1.1.1 src/external/bsd/file/dist/Makefile.am:1.2
--- src/external/bsd/file/dist/Makefile.am:1.1.1.1 Fri May 8 12:35:01 2009
+++ src/external/bsd/file/dist/Makefile.am Fri May 8 13:34:34 2009
@@ -2,4 +2,4 @@
EXTRA_DIST = MAINT
-SUBDIRS = src magic tests doc python
+SUBDIRS = src magic doc
Index: src/external/bsd/file/dist/Makefile.in
diff -u src/external/bsd/file/dist/Makefile.in:1.1.1.1 src/external/bsd/file/dist/Makefile.in:1.2
--- src/external/bsd/file/dist/Makefile.in:1.1.1.1 Fri May 8 12:35:01 2009
+++ src/external/bsd/file/dist/Makefile.in Fri May 8 13:34:34 2009
@@ -185,7 +185,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
EXTRA_DIST = MAINT
-SUBDIRS = src
+SUBDIRS = src magic
#SUBDIRS = src magic tests doc python
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -235,6 +235,8 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_srcdir_config.h.in:
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
Index: src/external/bsd/file/dist/configure
diff -u src/external/bsd/file/dist/configure:1.1.1.1 src/external/bsd/file/dist/configure:1.2
--- src/external/bsd/file/dist/configure:1.1.1.1 Fri May 8 12:35:03 2009
+++ src/external/bsd/file/dist/configure Fri May 8 13:34:34 2009
@@ -2163,7 +2163,7 @@
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ MKDIR_P="\$(SHELL) $ac_install_sh -d"
fi
fi
{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
Index: src/external/bsd/file/dist/doc/file.1
diff -u src/external/bsd/file/dist/doc/file.1:1.2 src/external/bsd/file/dist/doc/file.1:1.3
--- src/external/bsd/file/dist/doc/file.1:1.2 Fri May 8 12:39:46 2009
+++ src/external/bsd/file/dist/doc/file.1 Fri May 8 13:34:34 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: file.1,v 1.2 2009/05/08 16:39:46 christos Exp $
+.\" $NetBSD: file.1,v 1.3 2009/05/08 17:34:34 christos Exp $
.\"
.\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $
.Dd October 9, 2008
@@ -177,7 +177,7 @@
.Ar testname
from the list of tests made to determine the file type. Valid test names
are:
-.Bl -tag -width
+.Bl -tag -width compress
.It apptype
.Dv EMX
application type (only on EMX).
Index: src/external/bsd/file/dist/magic/Makefile.am
diff -u src/external/bsd/file/dist/magic/Makefile.am:1.1.1.1 src/external/bsd/file/dist/magic/Makefile.am:1.2
--- src/external/bsd/file/dist/magic/Makefile.am:1.1.1.1 Fri May 8 12:35:06 2009
+++ src/external/bsd/file/dist/magic/Makefile.am Fri May 8 13:34:35 2009
@@ -1,7 +1,7 @@
#
# $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
#
-MAGIC_FRAGMENT_BASE = Magdir
+MAGIC_FRAGMENT_BASE = magdir
MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
pkgdata_DATA = magic.mgc
Index: src/external/bsd/file/dist/magic/Makefile.in
diff -u src/external/bsd/file/dist/magic/Makefile.in:1.1.1.1 src/external/bsd/file/dist/magic/Makefile.in:1.2
--- src/external/bsd/file/dist/magic/Makefile.in:1.1.1.1 Fri May 8 12:35:07 2009
+++ src/external/bsd/file/dist/magic/Makefile.in Fri May 8 13:34:35 2009
@@ -168,7 +168,7 @@
#
# $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
#
-MAGIC_FRAGMENT_BASE = Magdir
+MAGIC_FRAGMENT_BASE = magdir
MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
pkgdata_DATA = magic.mgc
EXTRA_DIST = Header Localstuff \
Index: src/external/bsd/file/dist/magic/magdir/archive
diff -u src/external/bsd/file/dist/magic/magdir/archive:1.1.1.1 src/external/bsd/file/dist/magic/magdir/archive:1.2
--- src/external/bsd/file/dist/magic/magdir/archive:1.1.1.1 Fri May 8 12:35:07 2009
+++ src/external/bsd/file/dist/magic/magdir/archive Fri May 8 13:34:35 2009
@@ -574,6 +574,7 @@
!:mime application/zip
>4 byte 0x14
>>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract
+>0x161 string WINZIP Zip archive data, WinZIP self-extracting
!:mime application/zip
# OpenOffice.org / KOffice / StarOffice documents
Index: src/external/bsd/file/dist/magic/magdir/filesystems
diff -u src/external/bsd/file/dist/magic/magdir/filesystems:1.1.1.1 src/external/bsd/file/dist/magic/magdir/filesystems:1.2
--- src/external/bsd/file/dist/magic/magdir/filesystems:1.1.1.1 Fri May 8 12:35:08 2009
+++ src/external/bsd/file/dist/magic/magdir/filesystems Fri May 8 13:34:35 2009
@@ -1211,6 +1211,9 @@
!:mime application/x-iso9660-image
32776 string CDROM High Sierra CD-ROM filesystem data
+# .cso files
+0 string CISO Compressed ISO CD image
+
# cramfs filesystem - [email protected]
0 lelong 0x28cd3d45 Linux Compressed ROM File System data, little endian
>4 lelong x size %lu
