Changeset 82716

Timestamp:

08/18/11 16:13:42 (4 years ago)

Author:

ricci@…

Message:

file: regen two patches, they failed to apply when variant +with_text_magic_file was used; see #30837

Location:

trunk/dports/sysutils/file/files

Files:

• patch-magic-Magdir-msdos.diff (modified) (1 diff)
• patch-magic-Makefile.in.diff (modified) (3 diffs)

trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff

@@ -1 @@
---- magic/Magdir/msdos.orig     2008-10-22 10:44:44.000000000 -0700
-+++ magic/Magdir/msdos  2008-10-22 10:46:35.000000000 -0700
-@@ -671,8 +671,11 @@
+--- magic/Magdir/msdos.orig     2011-06-06 06:01:41.000000000 -0700
++++ magic/Magdir/msdos  2011-08-18 15:59:01.000000000 -0700
+@@ -833,8 +833,11 @@
  0      string  \224\246\056            Microsoft Word Document
  !:mime application/msword
  
--512    string  R\0o\0o\0t\0\ \0E\0n\0t\0r\0y   Microsoft Word Document
--!:mime application/msword
 +## this is not completely accurate, there are Excel documents that have the same pattern
 +## 512 string  R\0o\0o\0t\0\ \0E\0n\0t\0r\0y   Microsoft Word Document
 +## !:mime      application/msword
-+512    string  R\0o\0o\0t\0\ \0E\0n\0t\0r\0y   Microsoft Office Document
+ 512    string  R\0o\0o\0t\0\ \0E\0n\0t\0r\0y   Microsoft Word Document
+-!:mime application/msword
 +!:mime application/x-msoffice
  

trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff

@@ -1 @@
---- magic/Makefile.in.orig      2010-01-22 13:44:34.000000000 -0800
-+++ magic/Makefile.in   2010-02-08 16:43:06.000000000 -0800
-@@ -175,7 +175,7 @@
+--- magic/Makefile.in.orig      2011-08-03 09:55:56.000000000 -0700
++++ magic/Makefile.in   2011-08-18 16:04:14.000000000 -0700
+@@ -201,7 +201,7 @@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
@@ -10 +10 @@
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
-@@ -606,6 +606,17 @@
-        @mkdir magic && cp -p $(EXTRA_DIST) magic
+@@ -669,6 +669,17 @@
         $(FILE_COMPILE) -C -m magic
         @rm -fr magic
-+
+ 
 +magic: $(EXTRA_DIST) ${MAGIC}
 +       for frag in $(EXTRA_DIST); do \
@@ -25 +24 @@
 +       done >> $@
 +
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.