apply our local patches

This commit is contained in:
christos 2009-05-08 17:34:34 +00:00
parent 7c25ef2346
commit 9132e9e090
8 changed files with 13 additions and 7 deletions

View File

@ -2,4 +2,4 @@
EXTRA_DIST = MAINT
SUBDIRS = src magic tests doc python
SUBDIRS = src magic doc

View File

@ -185,7 +185,7 @@ target_alias = @target_alias@
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 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@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 $@

View File

@ -2163,7 +2163,7 @@ fi
# 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

View File

@ -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 @@ Exclude the test named in
.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).

View File

@ -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

View File

@ -168,7 +168,7 @@ top_srcdir = @top_srcdir@
#
# $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 \

View File

@ -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

View File

@ -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 - russell@coker.com.au
0 lelong 0x28cd3d45 Linux Compressed ROM File System data, little endian
>4 lelong x size %lu