Update

3 files changed, 51 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc98d6a48f77..5be3dad0727e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fdutils
 	pkgdesc = Utilities for the Linux floppy driver, i.e. for formatting extra capacity disks
-	pkgver = 5.5
-	pkgrel = 5
+	pkgver = 5.6
+	pkgrel = 1
 	url = http://fdutils.linux.lu/index.html
 	install = fdutils.install
 	arch = i686
@@ -17,10 +17,11 @@ pkgbase = fdutils
 	options = !strip
 	options = !makeflags
 	options = !buildflags
-	source = http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.5-20060227.orig.tar.gz
-	source = http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.5-20060227-7.debian.tar.xz
-	md5sums = cccab0f580659b91810a590436f688ee
-	md5sums = 0168d881016bfde31c7f0d0c0667bf30
+	source = http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.6.orig.tar.gz
+	source = http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.6-2.debian.tar.xz
+	source = destdir_fix.patch
+	md5sums = 85efbd7b9a4cf87687d3270ed2a7e7fd
+	md5sums = 734bc4ad5e69014b37c2ed2afe3d8c16
+	md5sums = 22e16c952f64e0a4385db74fc089170b
 
 pkgname = fdutils
-
diff --git a/PKGBUILD b/PKGBUILD
index 472f17279af4..8279501acddb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,50 @@
 # Contributor: Laurent Hilsz <laurent.hilsz@laposte.net> 
 
 pkgname=fdutils
-pkgver=5.5
-pkgrel=5
+pkgver=5.6
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Utilities for the Linux floppy driver, i.e. for formatting extra capacity disks"
 url="http://fdutils.linux.lu/index.html"
 makedepends=('texinfo' 'tcc' 'texlive-bin' 'texlive-core')
 depends=('glibc' 'tcc' 'texinfo')
-source=(http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.5-20060227.orig.tar.gz
-        http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.5-20060227-7.debian.tar.xz)
-md5sums=('cccab0f580659b91810a590436f688ee'
-         '0168d881016bfde31c7f0d0c0667bf30')
+source=(http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.6.orig.tar.gz
+        http://deb.debian.org/debian/pool/main/f/fdutils/fdutils_5.6-2.debian.tar.xz
+        destdir_fix.patch
+)
+md5sums=('85efbd7b9a4cf87687d3270ed2a7e7fd'
+         '734bc4ad5e69014b37c2ed2afe3d8c16'
+         '22e16c952f64e0a4385db74fc089170b')
 install=fdutils.install
 options=('!strip' '!makeflags' '!buildflags')
 license=('GPL')
 
 prepare() {
-  cd "${srcdir}/fdutils-5.5-20060227"
+  cd "${srcdir}/fdutils-5.6"
   while read -r i 
   do
+    if echo "$i" | grep -q fdmount-compilation_linux_2.6.patch
+    then
+      continue
+    fi
     patch -p1 -i "${srcdir}/debian/patches/${i}"
-  done <"${srcdir}/debian/patches/series"
-  sed -i '1i#include "../config.h"' src/*.c
+  done < "${srcdir}/debian/patches/series"
+  patch -p2 -i "${srcdir}/destdir_fix.patch"
 }
 
 build() {
-  cd "${srcdir}/fdutils-5.5-20060227"
+  cd "${srcdir}/fdutils-5.6"
   autoreconf
   export CC=tcc
-  ./configure --prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info
+  # ./configure --prefix=/usr --sysconfdir=/etc --infodir=/usr/share/info
+  ./configure --prefix=/usr --sysconfdir=/etc
   sed -i 's+-c -s -m+-c -m+g' src/Makefile
   make
 }
 
 package() {
-  cd "${srcdir}/fdutils-5.5-20060227"
+  cd "${srcdir}/fdutils-5.6"
   install -d $pkgdir/etc
-  make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir datarootdir=$pkgdir/usr/share install install-doc install-info
   rm "${pkgdir}/usr/share/man/man4/fd.4"
 }
diff --git a/destdir_fix.patch b/destdir_fix.patch
new file mode 100644
index 000000000000..32d77b96697c
--- /dev/null
+++ b/destdir_fix.patch
@@ -0,0 +1,22 @@
+--- src/fdutils-5.6/doc/Makefile.in	2021-09-16 23:04:17.423703401 +0200
++++ Makefile.in	2021-09-16 23:04:06.116908414 +0200
+@@ -9,12 +9,13 @@
+ DESTDIR     =
+ prefix      = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir      = $(DESTDIR)@bindir@
+-infodir     = $(DESTDIR)@infodir@
+-mandir      = $(DESTDIR)@mandir@
+-infodir     = $(DESTDIR)@infodir@
+-sysconfdir  = $(DESTDIR)@sysconfdir@
+-datarootdir = $(DESTDIR)@datarootdir@
++bindir      = @bindir@
++infodir     = @infodir@
++mandir      = @mandir@
++infodir     = @infodir@
++sysconfdir  = @sysconfdir@
++datarootdir = @datarootdir@
++
+ 
+ mandir1     = $(mandir)/man1
+ mandir4     = $(mandir)/man4