diff options
| -rw-r--r-- | emulators/mtools/Makefile | 4 | ||||
| -rw-r--r-- | emulators/mtools/distinfo | 12 | ||||
| -rw-r--r-- | emulators/mtools/files/patch-a | 24 | ||||
| -rw-r--r-- | emulators/mtools/files/patch-i | 11 | ||||
| -rw-r--r-- | emulators/mtools/files/patch-mformat.c | 18 |
5 files changed, 38 insertions, 31 deletions
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile index a620f5fc6c7b..59de4dd38f02 100644 --- a/emulators/mtools/Makefile +++ b/emulators/mtools/Makefile @@ -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@FreeBSD.org diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo index d439f22ae8f9..34d22688f4c6 100644 --- a/emulators/mtools/distinfo +++ b/emulators/mtools/distinfo @@ -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 diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a index 8d817b9f0672..0d7a41122a56 100644 --- a/emulators/mtools/files/patch-a +++ b/emulators/mtools/files/patch-a @@ -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) diff --git a/emulators/mtools/files/patch-i b/emulators/mtools/files/patch-i deleted file mode 100644 index 79df6b858a6a..000000000000 --- a/emulators/mtools/files/patch-i +++ /dev/null @@ -1,11 +0,0 @@ ---- mdel.c.orig Sat Apr 28 12:47:05 2001 -+++ mdel.c Sat Apr 28 12:47:18 2001 -@@ -118,7 +118,7 @@ - fprintf(stderr, - "Mtools version %s, dated %s\n", mversion, mdate); - fprintf(stderr, -- "Usage: %s [-v] msdosfile [msdosfiles...]", progname); -+ "Usage: %s [-v] msdosfile [msdosfiles...]\n", progname); - exit(1); - } - diff --git a/emulators/mtools/files/patch-mformat.c b/emulators/mtools/files/patch-mformat.c new file mode 100644 index 000000000000..e2a97f25b6a2 --- /dev/null +++ b/emulators/mtools/files/patch-mformat.c @@ -0,0 +1,18 @@ +--- 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) + { |