mtools, maj 4.0.15-1

5 files changed, 18 insertions, 80 deletions

diff --git a/base/mtools/.footprint.i686 b/base/mtools/.footprint.i686
index eb87f03c6..ffec50dae 100644
--- a/base/mtools/.footprint.i686
+++ b/base/mtools/.footprint.i686
@@ -1,3 +1,5 @@
+drwxr-xr-x	root/root	etc/
+-rw-r--r--	root/root	etc/mtools.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/amuFormat.sh
@@ -24,6 +26,7 @@ lrwxrwxrwx	root/root	usr/bin/mmove -> mtools
 lrwxrwxrwx	root/root	usr/bin/mpartition -> mtools
 lrwxrwxrwx	root/root	usr/bin/mrd -> mtools
 lrwxrwxrwx	root/root	usr/bin/mren -> mtools
+lrwxrwxrwx	root/root	usr/bin/mshortname -> mtools
 lrwxrwxrwx	root/root	usr/bin/mshowfat -> mtools
 -rwxr-xr-x	root/root	usr/bin/mtools
 lrwxrwxrwx	root/root	usr/bin/mtoolstest -> mtools
@@ -32,37 +35,3 @@ lrwxrwxrwx	root/root	usr/bin/mtype -> mtools
 lrwxrwxrwx	root/root	usr/bin/mzip -> mtools
 -rwxr-xr-x	root/root	usr/bin/tgz
 -rwxr-xr-x	root/root	usr/bin/uz
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/mtools.info.gz
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/floppyd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/floppyd_installtest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mattrib.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mbadblocks.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mclasserase.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcopy.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdel.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdeltree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdir.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdu.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mformat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/minfo.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mkmanifest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mlabel.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmount.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmove.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mpartition.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mrd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mren.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mshowfat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtools.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtoolstest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtype.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mzip.1.gz
-drwxr-xr-x	root/root	usr/share/man/man5/
--rw-r--r--	root/root	usr/share/man/man5/mtools.5.gz
diff --git a/base/mtools/.footprint.x86_64 b/base/mtools/.footprint.x86_64
index eb87f03c6..ffec50dae 100644
--- a/base/mtools/.footprint.x86_64
+++ b/base/mtools/.footprint.x86_64
@@ -1,3 +1,5 @@
+drwxr-xr-x	root/root	etc/
+-rw-r--r--	root/root	etc/mtools.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/amuFormat.sh
@@ -24,6 +26,7 @@ lrwxrwxrwx	root/root	usr/bin/mmove -> mtools
 lrwxrwxrwx	root/root	usr/bin/mpartition -> mtools
 lrwxrwxrwx	root/root	usr/bin/mrd -> mtools
 lrwxrwxrwx	root/root	usr/bin/mren -> mtools
+lrwxrwxrwx	root/root	usr/bin/mshortname -> mtools
 lrwxrwxrwx	root/root	usr/bin/mshowfat -> mtools
 -rwxr-xr-x	root/root	usr/bin/mtools
 lrwxrwxrwx	root/root	usr/bin/mtoolstest -> mtools
@@ -32,37 +35,3 @@ lrwxrwxrwx	root/root	usr/bin/mtype -> mtools
 lrwxrwxrwx	root/root	usr/bin/mzip -> mtools
 -rwxr-xr-x	root/root	usr/bin/tgz
 -rwxr-xr-x	root/root	usr/bin/uz
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/mtools.info.gz
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/floppyd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/floppyd_installtest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mattrib.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mbadblocks.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mclasserase.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mcopy.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdel.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdeltree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdir.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mdu.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mformat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/minfo.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mkmanifest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mlabel.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmount.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mmove.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mpartition.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mrd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mren.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mshowfat.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtools.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtoolstest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mtype.1.gz
--rw-r--r--	root/root	usr/share/man/man1/mzip.1.gz
-drwxr-xr-x	root/root	usr/share/man/man5/
--rw-r--r--	root/root	usr/share/man/man5/mtools.5.gz
diff --git a/base/mtools/.md5sum.i686 b/base/mtools/.md5sum.i686
index 6c02d5163..6d2fc2315 100644
--- a/base/mtools/.md5sum.i686
+++ b/base/mtools/.md5sum.i686
@@ -1 +1 @@
-0ee77a14e5f113ad8136a867f8ed4c3a  mtools-4.0.12.tar.bz2
+b7550b649af77812cb696a780e853f47  mtools-4.0.15.tar.bz2
diff --git a/base/mtools/.md5sum.x86_64 b/base/mtools/.md5sum.x86_64
index 6c02d5163..6d2fc2315 100644
--- a/base/mtools/.md5sum.x86_64
+++ b/base/mtools/.md5sum.x86_64
@@ -1 +1 @@
-0ee77a14e5f113ad8136a867f8ed4c3a  mtools-4.0.12.tar.bz2
+b7550b649af77812cb696a780e853f47  mtools-4.0.15.tar.bz2
diff --git a/base/mtools/Pkgfile b/base/mtools/Pkgfile
index 0f5a0b077..48e46de10 100644
--- a/base/mtools/Pkgfile
+++ b/base/mtools/Pkgfile
@@ -4,22 +4,22 @@
 # Packager:  thierryn1 at hispeed dot ch
 
 name=mtools
-version=4.0.12
+version=4.0.15
 release=1
 source=(ftp://ftp.gnu.org/gnu/mtools/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
+
+	sed -i '/^SAMPLE FILE$/s:^:# :' mtools.conf
+
 	./configure --prefix=/usr \
-		--datarootdir=$PKG/usr \
-		--sysconfdir=/etc 
+              --mandir=/usr/share/man \
+              --infodir=/usr/share/info \
+	      --sysconfdir=/etc
+
 	make
 	make -j1 prefix=$PKG/usr install
-	mkdir -p $PKG/usr/share
-	mv $PKG/usr/man $PKG/usr/share/man
-	mv $PKG/usr/info $PKG/usr/share/info
-	if [ -f $PKG/usr/share/info/dir ]; then
-		rm $PKG/usr/share/info/dir
-	fi
-	mkdir -p $PKG/usr/share
+	
+	install -Dm644 mtools.conf $PKG/etc/mtools.conf
 }