ports/97992: [patch] Update emulators/mtools to mtools-3.9.10-20060525
Peter Jeremy
PeterJeremy at optushome.com.au
Fri May 26 22:10:25 UTC 2006
>Number: 97992
>Category: ports
>Synopsis: [patch] Update emulators/mtools to mtools-3.9.10-20060525
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri May 26 22:10:07 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Peter Jeremy
>Release: FreeBSD 6.1-STABLE amd64
>Organization:
n/a
>Environment:
System: FreeBSD turion.vk2pj.dyndns.org 6.1-STABLE FreeBSD 6.1-STABLE #17: Wed May 24 08:27:01 EST 2006 root at turion.vk2pj.dyndns.org:/usr/obj/usr/src/sys/turion amd64
>Description:
mtools 3.9.9 only supports media that has 512 byte sectors.
Whilst it has a 'blocksize' parameter, this is ignored when reading
the bootblocks. The latst 3.9.10 patch includes a work-around for
this.
>How-To-Repeat:
Use mtools with a flash disk with >512 byte sectors (I used an
EM706S MP3 Player).
>Fix:
Remove files/patch-i and add files/patch-mformat.c and the following
patch.
Index: Makefile
===================================================================
RCS file: /usr/ncvs/ports/emulators/mtools/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- Makefile 4 Dec 2005 23:35:14 -0000 1.55
+++ Makefile 26 May 2006 20:49:01 -0000
@@ -6,13 +6,13 @@
#
PORTNAME= mtools
-PORTVERSION= 3.9.9
+PORTVERSION= 3.9.10
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.tux.org/pub/knaff/mtools/ \
http://mtools.linux.lu/
PATCH_SITES= http://mtools.linux.lu/
-PATCHFILES= mtools-3.9.9-20050228.diff.gz
+PATCHFILES= mtools-3.9.10-20060525.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= jmz at FreeBSD.org
Index: distinfo
===================================================================
RCS file: /usr/ncvs/ports/emulators/mtools/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo 22 Jan 2006 09:47:23 -0000 1.22
+++ distinfo 26 May 2006 20:51:32 -0000
@@ -1,6 +1,6 @@
-MD5 (mtools-3.9.9.tar.gz) = 3e68b857b4e1f3a6521d1dfefbd30a36
-SHA256 (mtools-3.9.9.tar.gz) = af083a73425d664d4607ef6c6564fd9319a0e47ee7c105259a45356cb834690e
-SIZE (mtools-3.9.9.tar.gz) = 322805
-MD5 (mtools-3.9.9-20050228.diff.gz) = 58e1eb2a88f84d7286e235f32307e3e5
-SHA256 (mtools-3.9.9-20050228.diff.gz) = 24dff3410c284aee3fe6a0aa9983cdd007a93230e6ad4226a50f88d78e5eb678
-SIZE (mtools-3.9.9-20050228.diff.gz) = 66208
+MD5 (mtools-3.9.10-20060525.diff.gz) = e4f40b3c76cb343bdb9aa18b8523fc27
+MD5 (mtools-3.9.10.tar.gz) = 19bc1f06e9c5865b8ad20b1ddd976f5f
+SHA256 (mtools-3.9.10-20060525.diff.gz) = dc03d7212808e3f91c685b09fabd5fb9b21f2e08bb861cf86d33cd82564ef432
+SHA256 (mtools-3.9.10.tar.gz) = 88d3213a5c9613bc9926e7c968df1c3503266d2e9e8aa2c3da5bd18d673613d6
+SIZE (mtools-3.9.10-20060525.diff.gz) = 10040
+SIZE (mtools-3.9.10.tar.gz) = 387208
Index: files/patch-a
===================================================================
RCS file: /usr/ncvs/ports/emulators/mtools/files/patch-a,v
retrieving revision 1.9
diff -u -r1.9 patch-a
--- files/patch-a 17 Nov 2005 21:34:48 -0000 1.9
+++ files/patch-a 26 May 2006 21:08:01 -0000
@@ -1,5 +1,5 @@
---- Makefile.in.orig Wed Nov 16 12:38:06 2005
-+++ Makefile.in Wed Nov 16 12:40:28 2005
+--- Makefile.in.orig Sat May 27 06:56:01 2006
++++ Makefile.in Sat May 27 07:07:37 2006
@@ -116,7 +116,7 @@
xdf_io.c mkmanifest.c
@@ -9,18 +9,18 @@
LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \
-@@ -258,11 +258,11 @@
- install-scripts: $(bindir)/mtools
- @$(top_srcdir)/mkinstalldirs $(bindir)
+@@ -257,11 +257,11 @@
+ install-scripts: $(DESTDIR)$(bindir)/mtools
+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
@for j in $(SCRIPTS) ; do \
-- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+ $(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
- echo $(bindir)/$$j ; \
+- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
++ $(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
+ echo $(DESTDIR)$(bindir)/$$j ; \
done
-- rm -f $(bindir)/lz
-- $(LN_S) uz $(bindir)/lz
-+ #rm -f $(bindir)/lz
-+ #$(LN_S) uz $(bindir)/lz
+- rm -f $(DESTDIR)$(bindir)/lz
+- $(LN_S) uz $(DESTDIR)$(bindir)/lz
++ #rm -f $(DESTDIR)$(bindir)/lz
++ #$(LN_S) uz $(DESTDIR)$(bindir)/lz
install-man:
@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
Index: files/patch-mformat.c [new]
===================================================================
--- mformat.c~ Sat May 27 07:09:45 2006
+++ mformat.c Sat May 27 07:24:05 2006
@@ -689,6 +689,7 @@
exit(1);
}
+#ifdef OS_linux
static int get_block_geom(int fd, struct MT_STAT *buf, struct device *dev,
char *errmsg) {
struct hd_geometry geom;
@@ -733,6 +734,7 @@
size = dev->tracks * dev->heads * dev->sectors + dev->hidden;
return 0;
}
+#endif
void mformat(int argc, char **argv, int dummy)
{
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list