[41083] trunk/dports/sysutils/file
ricci at macports.org
ricci at macports.org
Wed Oct 22 11:42:13 PDT 2008
Revision: 41083
http://trac.macports.org/changeset/41083
Author: ricci at macports.org
Date: 2008-10-22 11:42:13 -0700 (Wed, 22 Oct 2008)
Log Message:
-----------
patch the magic information to fix a bogus entry
add a variant that installs the plain-text magic(5) file
Modified Paths:
--------------
trunk/dports/sysutils/file/Portfile
Added Paths:
-----------
trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff
trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff
Modified: trunk/dports/sysutils/file/Portfile
===================================================================
--- trunk/dports/sysutils/file/Portfile 2008-10-22 18:34:52 UTC (rev 41082)
+++ trunk/dports/sysutils/file/Portfile 2008-10-22 18:42:13 UTC (rev 41083)
@@ -5,6 +5,7 @@
name file
version 4.26
+revision 1
categories sysutils
maintainers jay.fm:jay-macports \
openmaintainer
@@ -25,7 +26,8 @@
rmd160 e8b84e01d1f43faedfe676afc92c2cba4a01ecdf
patchfiles patch-lzma.diff \
- patch-src-file.h.diff
+ patch-src-file.h.diff \
+ patch-magic-Magdir-msdos.diff
configure.args --mandir=${prefix}/share/man \
--enable-fsect-man5 \
@@ -36,6 +38,10 @@
configure.args-delete --program-prefix=g
}
+variant with_text_magic_file description (also install the plain-text magic file} {
+ patchfiles-append patch-magic-Makefile.in.diff
+}
+
livecheck.check md5
livecheck.url ftp://ftp.fu-berlin.de/unix/tools/${name}/
livecheck.md5 a2918bbcee8b1ca0225c5358f1801fdb
Added: trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff (rev 0)
+++ trunk/dports/sysutils/file/files/patch-magic-Magdir-msdos.diff 2008-10-22 18:42:13 UTC (rev 41083)
@@ -0,0 +1,16 @@
+--- 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 @@
+ 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
++!:mime application/x-msoffice
+
+ # From: "Nelson A. de Oliveira" <naoliv at gmail.com>
+ # Magic type for Dell's BIOS .hdr files
Added: trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff (rev 0)
+++ trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff 2008-10-22 18:42:13 UTC (rev 41083)
@@ -0,0 +1,27 @@
+--- magic/Makefile.in.orig 2008-10-22 11:35:20.000000000 -0700
++++ magic/Makefile.in 2008-10-22 11:35:57.000000000 -0700
+@@ -167,7 +167,7 @@
+ #
+ MAGIC_FRAGMENT_BASE = Magdir
+ MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
+-pkgdata_DATA = magic.mgc
++pkgdata_DATA = magic magic.mgc
+ EXTRA_DIST = Header Localstuff \
+ $(MAGIC_FRAGMENT_DIR)/acorn \
+ $(MAGIC_FRAGMENT_DIR)/adi \
+@@ -577,6 +577,15 @@
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-pkgdataDATA
+
++magic: $(EXTRA_DIST)
++ for frag in $(EXTRA_DIST); do \
++ if test -f $(srcdir)/$$frag; then \
++ f=$(srcdir)/$$frag; \
++ else \
++ f=$$frag; \
++ fi; \
++ cat $$f; \
++ done >> $@
+
+ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
+ $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081022/b2869528/attachment.html>
More information about the macports-changes
mailing list