2 files changed, 29 insertions, 28 deletions

diff --git a/meta/packages/mtools/files/mtools.patch b/meta/packages/mtools/files/mtools.patch
index 47404c6b33..2abf534731 100644
--- a/meta/packages/mtools/files/mtools.patch
+++ b/meta/packages/mtools/files/mtools.patch
@@ -1,8 +1,14 @@
 $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
 
---- mtools-3.9.9/Makefile.in.orig       2004-02-28 20:06:35.000000000 +0100
-+++ mtools-3.9.9/Makefile.in
-@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html
+---
+ Makefile.in |   74 ++++++++++++++++++++++++++----------------------------------
+ 1 file changed, 33 insertions(+), 41 deletions(-)
+
+Index: mtools-3.9.9/Makefile.in
+===================================================================
+--- mtools-3.9.9.orig/Makefile.in       2007-10-12 11:18:46.000000000 +0100
++++ mtools-3.9.9/Makefile.in    2007-10-12 11:28:14.000000000 +0100
+@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
  
  # Don't cd, to avoid breaking install-sh references.
  install-info: info
@@ -19,16 +25,14 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
 +           $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
           done; \
         fi; \
-        if [ -n "$(INSTALL_INFO)" ] ; then \
-                if [ -f $(infodir)/dir.info ] ; then \
+-       if [ -n "$(INSTALL_INFO)" ] ; then \
+-               if [ -f $(infodir)/dir.info ] ; then \
 -                       $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
-+                       $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \
-                fi; \
-                if [ -f $(infodir)/dir ] ; then \
+-               fi; \
+-               if [ -f $(infodir)/dir ] ; then \
 -                       $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
-+                       $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \
-                fi; \
-        fi
+-               fi; \
+-       fi
  
  uninstall-info:
         cd $(infodir) && rm -f mtools.info*
@@ -40,37 +44,34 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
  
  uninstall:     uninstall-bin uninstall-man uninstall-links \
                 uninstall-scripts
-@@ -228,52 +228,52 @@ distclean: clean texclean
+@@ -228,52 +220,52 @@ distclean: clean texclean
  maintainer-clean: distclean
  
  
 -$(bindir)/floppyd: floppyd
 -       $(top_srcdir)/mkinstalldirs $(bindir)
 -       $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
--
--$(bindir)/floppyd_installtest: floppyd_installtest
--       $(top_srcdir)/mkinstalldirs $(bindir)
--       $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
--
--$(bindir)/mtools: mtools
--       $(top_srcdir)/mkinstalldirs $(bindir)
--       $(INSTALL_PROGRAM) mtools $(bindir)/mtools
--
--$(bindir)/mkmanifest: mkmanifest
--       $(top_srcdir)/mkinstalldirs $(bindir)
--       $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
 +${DESTDIR}$(bindir)/floppyd: floppyd
 +       $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 +       $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
-+
+ 
+-$(bindir)/floppyd_installtest: floppyd_installtest
+-       $(top_srcdir)/mkinstalldirs $(bindir)
+-       $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
 +${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
 +       $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 +       $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
-+
+ 
+-$(bindir)/mtools: mtools
+-       $(top_srcdir)/mkinstalldirs $(bindir)
+-       $(INSTALL_PROGRAM) mtools $(bindir)/mtools
 +${DESTDIR}$(bindir)/mtools: mtools
 +       $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 +       $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
-+
+ 
+-$(bindir)/mkmanifest: mkmanifest
+-       $(top_srcdir)/mkinstalldirs $(bindir)
+-       $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
 +${DESTDIR}$(bindir)/mkmanifest: mkmanifest
 +       $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
 +       $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb
index 112fff8f37..7c872a144f 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/packages/mtools/mtools_3.9.9.bb
@@ -5,7 +5,7 @@
 DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
 HOMEPAGE="http://mtools.linux.lu"
 LICENSE="GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
         file://mtools-makeinfo.patch;patch=1 \