# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1467316087 -10800
# Node ID 4f122372e6f667d6fac2ff146296289d13a10b59
# Parent  8eea3b2b0ff533a654c9eaa3b279b034fb9fb9c6
Up util-linux* (2.28); use new cook functions here.

diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-blkid-dev/receipt
--- a/util-linux-blkid-dev/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-blkid-dev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,22 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-blkid-dev"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="development"
-SHORT_DESC="The blkid devel files from Util linux NG."
+SHORT_DESC="The blkid from Util Linux, development files"
 MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+LICENSE="LGPL2.1"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="pkg-config util-linux-uuid-dev util-linux-blkid"
+WANTED="util-linux"
+DEPENDS="util-linux-blkid util-linux-uuid-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include
-	cp -a $install/usr/lib/libblkid.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig/blkid.pc $fs/usr/lib/pkgconfig
-	cp -a $install/usr/include/blkid $fs/usr/include
+	cook_copy_files blkid.h blkid.pc libblkid.*a
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-blkid/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-blkid/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,2 @@
+  * `blkid`    - locate/print block device attributes
+  * `lsblk`    - list block devices
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-blkid/receipt
--- a/util-linux-blkid/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-blkid/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,35 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-blkid"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The blkid utility and library from Util linux NG."
+SHORT_DESC="The blkid utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+LICENSE="LGPL2.1"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base util-linux-uuid util-linux-mount"
+WANTED="util-linux"
+DEPENDS="glibc-base udev util-linux-mount util-linux-uuid"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/sbin $fs/bin $fs/usr/lib
-	cp -a $install/sbin/blkid $fs/sbin
-	cp -a $install/bin/lsblk $fs/bin
-	cp -a $install/lib/libblkid.so* $fs/lib
-	cp -a $install/usr/lib/libblkid.so* $fs/usr/lib
-}
-
-# Remove old package
-post_install()
-{
-	[ ! -d "$INSTALLED/util-linux-ng-blkid" ] ||
-		rm -rf $INSTALLED/util-linux-ng-blkid
+	cook_copy_files lsblk lsblk.8* blkid blkid.8* libblkid.so* libblkid.3*
 }
 
 post_remove()
 {
-	ln -s ../bin/busybox "$1/sbin/blkid"
+	ln -s /bin/busybox "$1/sbin/blkid"
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-blockdev/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-blockdev/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `blockdev` - call block device ioctls from the command line
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-blockdev/receipt
--- a/util-linux-blockdev/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-blockdev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,30 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-blockdev"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The blockdev utility from Util linux NG."
+SHORT_DESC="The blockdev utility from Util Linux"
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
-
 DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/blockdev $fs/sbin
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f "$1/sbin/blockdev"
+	cook_copy_files blockdev blockdev.8*
 }
 
 post_remove()
 {
-	ln -s /bin/busybox /sbin/blockdev
+	ln -s /bin/busybox "$1/sbin/blockdev"
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-cfdisk/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-cfdisk/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `cfdisk` - display or manipulate a disk partition table
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-cfdisk/receipt
--- a/util-linux-cfdisk/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-cfdisk/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,21 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-cfdisk"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="system-tools"
-SHORT_DESC="The cfdisk utility from Util linux NG."
+SHORT_DESC="The cfdisk utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base ncursesw"
+WANTED="util-linux"
+DEPENDS="glibc-base libtinfo ncursesw util-linux-blkid util-linux-fdisk \
+util-linux-mount util-linux-smartcols util-linux-uuid"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin $fs/usr/share/applications
-	cp -a $install/sbin/cfdisk $fs/sbin
+	cook_copy_files cfdisk cfdisk.8*
+	mkdir -p $fs/usr/share/applications
 	cp $stuff/cfdisk.desktop $fs/usr/share/applications
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-cfdisk/stuff/cfdisk.desktop
--- a/util-linux-cfdisk/stuff/cfdisk.desktop	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-cfdisk/stuff/cfdisk.desktop	Thu Jun 30 22:48:07 2016 +0300
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Cfdisk Partition Editor
 Name[es]=Editor de particiones Cfdisk
 Name[fi]=Cfdisk levyosioiden muokkain
 Name[fr]=Editeur de partition Cfdisk
-Name[hu]=Cfdisk partíciószerkesztő
+Name[hu]=Cfdisk partíciószerkesztő
 Name[it]=Editor di partizioni Cfdisk
 Name[pt]=Editor de Partições Cfdisk
 Name[pt_BR]=Editor de Partições Cfdisk
+Name[ru]=Редактор разделов Cfdisk
 Name[zh_CN]=Cfdisk分区编辑工具
-Exec=subox xterm -e cfdisk
-Icon=drive-harddisk
+Exec=subox terminal -e cfdisk
+Icon=disk-partition-manager
 Terminal=false
-Type=Application
-Categories=Application;System;
+Categories=System;Filesystem;
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-column/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-column/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `column` - columnate lists
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-column/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-column/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="util-linux-column"
+VERSION="2.28"
+CATEGORY="base-system"
+SHORT_DESC="The column utility from Util Linux"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+HOST_ARCH="i486 arm"
+
+WANTED="util-linux"
+DEPENDS="glibc-base"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files column*
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-cramfs/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-cramfs/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,2 @@
+  * `fsck.cramfs` - fsck compressed ROM file system
+  * `mkfs.cramfs` - make compressed ROM file system
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-cramfs/receipt
--- a/util-linux-cramfs/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-cramfs/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-cramfs"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="system-tools"
-SHORT_DESC="The cramfs utilities from Util linux NG."
+SHORT_DESC="The cramfs utilities from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="zlib"
+WANTED="util-linux"
+DEPENDS="glibc-base zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/*cramfs $fs/sbin
+	cook_copy_files *.cramfs *.cramfs.8*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-eject/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-eject/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `eject` - eject removable media
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-eject/receipt
--- a/util-linux-eject/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-eject/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,32 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-eject"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The eject utility from Util linux NG."
+SHORT_DESC="The eject utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base util-linux-mount"
+WANTED="util-linux"
+DEPENDS="glibc-base util-linux-blkid util-linux-mount util-linux-uuid"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/eject $fs/usr/bin
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f $root/usr/bin/eject
+	cook_copy_files eject*
 }
 
 post_remove()
 {
-	cd $root/usr/bin
-	ln -s ../../bin/busybox eject
+	ln -s /bin/busybox "$1/usr/bin/eject"
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-fdisk-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-fdisk-dev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="util-linux-fdisk-dev"
+VERSION="2.28"
+CATEGORY="development"
+SHORT_DESC="The fdisk utility from Util Linux, development files"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+HOST_ARCH="i486 arm"
+
+WANTED="util-linux"
+DEPENDS="util-linux-fdisk util-linux-blkid-dev util-linux-uuid-dev"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libfdisk.h libfdisk.*a fdisk.pc
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-fdisk/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-fdisk/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `fdisk` - manipulate disk partition table
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-fdisk/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-fdisk/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,24 @@
+# SliTaz package receipt.
+
+PACKAGE="util-linux-fdisk"
+VERSION="2.28"
+CATEGORY="system-tools"
+SHORT_DESC="The fdisk utility from Util Linux"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+HOST_ARCH="i486 arm"
+
+WANTED="util-linux"
+DEPENDS="glibc-base libtinfo readline util-linux-blkid util-linux-uuid"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files fdisk fdisk.8* libfdisk.so*
+}
+
+post_remove()
+{
+	ln -s /bin/busybox "$1/sbin/fdisk"
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-flock/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-flock/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `flock` - manage locks from shell scripts
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-flock/receipt
--- a/util-linux-flock/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-flock/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,30 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-flock"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The flock utility from Util linux NG."
+SHORT_DESC="The flock utility from Util Linux"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
-
 DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/flock $fs/usr/bin
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f "$1/usr/bin/flock"
+	cook_copy_files flock flock.1*
 }
 
 post_remove()
 {
-	ln -s /bin/busybox /usr/bin/flock
+	ln -s /bin/busybox "$1/usr/bin/flock"
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-getopt/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-getopt/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `getopt` - parse command options (enhanced)
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-getopt/receipt
--- a/util-linux-getopt/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-getopt/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,21 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-getopt"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The getopt utility from Util linux NG."
+SHORT_DESC="The getopt utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
+WANTED="util-linux"
 DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/usr/share
-	cp -a $install/usr/bin/getopt $fs/usr/bin
-	cp -a $install/usr/share/doc/util-linux/getopt $fs/usr/share
+	cook_copy_files getopt*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-minix/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-minix/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,2 @@
+  * `fsck.minix` - check consistency of Minix filesystem
+  * `mkfs.minix` - make a Minix filesystem
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-minix/receipt
--- a/util-linux-minix/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-minix/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,17 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-minix"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="system-tools"
-SHORT_DESC="The minix utilities from Util linux NG."
+SHORT_DESC="The minix utilities from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/*minix $fs/sbin
+	cook_copy_files *.minix*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-mkfs/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-mkfs/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,5 @@
+  * `mkfs`        - build a Linux filesystem
+  * `mkfs.bfs`    - make an SCO bfs filesystem
+  * `mkfs.cramfs` - make compressed ROM file system
+  * `mkfs.minix`  - make a Minix filesystem
+  * `mkswap`      - set up a Linux swap area
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-mkfs/receipt
--- a/util-linux-mkfs/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-mkfs/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,21 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-mkfs"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The mkfs utility and library from Util linux."
+SHORT_DESC="The mkfs utilities from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
+WANTED="util-linux"
 DEPENDS="glibc-base util-linux-blkid util-linux-uuid zlib"
-WANTED="util-linux"
-
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/mk* $fs/sbin
+	cook_copy_files mk*
 }
+
+post_remove()
+{
+	ln -s /bin/busybox "$1/sbin/mkswap"
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-mount-dev/receipt
--- a/util-linux-mount-dev/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-mount-dev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,22 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-mount-dev"
-VERSION="2.24"
-CATEGORY="base-system"
-SHORT_DESC="Libmount devel files."
+VERSION="2.28"
+CATEGORY="development"
+SHORT_DESC="The mount utilities from Util Linux, development files"
 MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+LICENSE="LGPL2.1"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="util-linux-blkid-dev util-linux-mount pkg-config"
+WANTED="util-linux"
+DEPENDS="util-linux-mount util-linux-blkid-dev util-linux-uuid-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include
-	cp -a $install/usr/lib/libmount.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig/mount.pc $fs/usr/lib/pkgconfig
-	cp -a $install/usr/include/libmount $fs/usr/include
+	cook_copy_files libmount.h libmount.*a mount.pc
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-mount/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-mount/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,4 @@
+  * `findmnt`    - find a filesystem
+  * `mount`      - mount a filesystem
+  * `mountpoint` - see if a directory or file is a mountpoint
+  * `umount`     - unmount file systems
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-mount/receipt
--- a/util-linux-mount/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-mount/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,23 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-mount"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The mount utilities and libmount library from Util linux."
+SHORT_DESC="The mount utilities from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glibc-base"
+WANTED="util-linux"
+DEPENDS="glibc-base util-linux-blkid util-linux-uuid util-linux-smartcols udev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/bin $fs/usr/lib
-	cp -a $install/bin/findmnt $fs/bin
-	cp -a $install/bin/*mount* $fs/bin
-	cp -a $install/lib/libmount.so* $fs/lib
-	ln -sf ../../lib/libmount.so.1.1.0 $fs/usr/lib/libmount.so
+	cook_copy_files findmnt* mount mount.8* libmount.so* mountpoint* umount*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-partx/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-partx/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,5 @@
+  * `addpart`    - tell the kernel about the existence of a partition
+  * `delpart`    - tell the kernel to forget about a partition
+  * `partx`      - tell the kernel about the presence and numbering of on-disk
+    partitions
+  * `resizepart` - tell the kernel about the new size of a partition
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-partx/receipt
--- a/util-linux-partx/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-partx/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,21 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-partx"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="system-tools"
-SHORT_DESC="The partx utilities from Util linux NG (addpart,delpart,partx)."
+SHORT_DESC="The partx utilities from Util Linux NG"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
-
-DEPENDS="glibc-base"
+DEPENDS="glibc-base util-linux-blkid util-linux-uuid util-linux-smartcols"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/sbin
-	for i in addpart delpart partx; do
-		cp -a $install/usr/sbin/$i $fs/usr/sbin
-	done
+	cook_copy_files addpart* delpart* partx* resizepart*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-setterm/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-setterm/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `setterm` - set terminal attributes
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-setterm/receipt
--- a/util-linux-setterm/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-setterm/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,20 +1,18 @@
 # SliTaz package receipt
 
 PACKAGE="util-linux-setterm"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The setterm utility from Util linux NG."
+SHORT_DESC="The setterm utility from Util Linux"
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
-
-DEPENDS="glibc-base"
+DEPENDS="glibc-base libtinfo"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/setterm  $fs/usr/bin
+	cook_copy_files setterm*
 }
-
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-sfdisk/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-sfdisk/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `sfdisk` - display or manipulate a disk partition table
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-sfdisk/receipt
--- a/util-linux-sfdisk/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-sfdisk/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,19 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-sfdisk"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="system-tools"
-SHORT_DESC="The sfdisk utility from Util linux NG."
+SHORT_DESC="The sfdisk utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
 WANTED="util-linux"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
-
-DEPENDS="glibc-base ncurses"
+DEPENDS="glibc-base libtinfo readline util-linux-blkid util-linux-fdisk \
+util-linux-smartcols util-linux-uuid"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/sfdisk $fs/sbin
+	cook_copy_files sfdisk*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-smartcols-dev/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-smartcols-dev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="util-linux-smartcols-dev"
+VERSION="2.28"
+CATEGORY="development"
+SHORT_DESC="The smartcols library from Util Linux, development files"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="LGPL2.1"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+HOST_ARCH="i486 arm"
+
+WANTED="util-linux"
+DEPENDS="util-linux-smartcols"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libsmartcols.h libsmartcols.*a smartcols.pc
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-smartcols/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-smartcols/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,18 @@
+# SliTaz package receipt.
+
+PACKAGE="util-linux-smartcols"
+VERSION="2.28"
+CATEGORY="system-tools"
+SHORT_DESC="The smartcols library from Util Linux"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="GPL2"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+
+WANTED="util-linux"
+DEPENDS="glibc-base"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libsmartcols.so*
+}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-uuid-dev/receipt
--- a/util-linux-uuid-dev/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-uuid-dev/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,22 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-uuid-dev"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="development"
-SHORT_DESC="The uuid devel files from Util linux NG."
+SHORT_DESC="The uuid utility and library from Util linux, development files"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://freecode.com/projects/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="pkg-config util-linux-uuid"
+WANTED="util-linux"
+DEPENDS="util-linux-uuid"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/pkgconfig $fs/usr/include
-	cp -a $install/usr/lib/libuuid.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig/uuid.pc $fs/usr/lib/pkgconfig
-	cp -a $install/usr/include/uuid $fs/usr/include
+	cook_copy_files uuid.h libuuid.*a uuid.pc
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-uuid/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-uuid/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,2 @@
+  * `uuidgen` - create a new UUID value
+  * `uuidd`   - UUID generation daemon
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-uuid/receipt
--- a/util-linux-uuid/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-uuid/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,35 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-uuid"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The uuid utility and library from Util linux NG."
+SHORT_DESC="The uuid utility and library from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="util-linux"
-WEB_SITE="http://freecode.com/projects/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncursesw"
+WANTED="util-linux"
+DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/lib $fs/usr/bin $fs/usr/sbin
-	cp -a $install/usr/sbin/uuidd $fs/usr/sbin
-	cp -a $install/usr/bin/uuidgen $fs/usr/bin
-	cp -a $install/lib/libuuid.so* $fs/lib
-	cd $fs/usr/lib
-	# Be compatible with /cross/*/sysroot
-	ln -s ../../lib/libuuid.so.1.3.0 libuuid.so
+	cook_copy_files libuuid.so* uuidgen* uuidd* uuid*3*
 }
-
-# Remove old package
-post_install()
-{
-	if [ -d "$1$INSTALLED/util-linux-ng-uuid" ]; then
-		echo "Removing old: util-linux-ng-uuid"
-		rm -rf "$1$INSTALLED/util-linux-ng-uuid"
-	fi
-	true
-}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-whereis/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util-linux-whereis/description.txt	Thu Jun 30 22:48:07 2016 +0300
@@ -0,0 +1,1 @@
+  * `whereis` - locate the binary, source, and manual page files for a command
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux-whereis/receipt
--- a/util-linux-whereis/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux-whereis/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux-whereis"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="base-system"
-SHORT_DESC="The whereis utility and library from Util linux."
+SHORT_DESC="The whereis utility from Util Linux"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://kernel.org/~kzak/util-linux/"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+HOST_ARCH="i486 arm"
 
+WANTED="util-linux"
 DEPENDS="glibc-base"
-WANTED="util-linux"
-HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/whereis $fs/usr/bin
+	cook_copy_files whereis*
 }
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux/receipt
--- a/util-linux/receipt	Thu Jun 30 22:26:22 2016 +0300
+++ b/util-linux/receipt	Thu Jun 30 22:48:07 2016 +0300
@@ -1,20 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="util-linux"
-VERSION="2.24"
+VERSION="2.28"
 CATEGORY="meta"
-SHORT_DESC="Util linux new generation (Meta package to build utility ans libs)."
+SHORT_DESC="Random collection of Linux utilities (meta package)"
 MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-SOURCE="util-linux"
-TARBALL="$SOURCE-$VERSION.tar.xz"
-WEB_SITE="http://freecode.com/projects/util-linux/"
+LICENSE="GPL2 LGPL2.1 BSD PublicDomain"
+WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$VERSION/$TARBALL"
 HOST_ARCH="i486 arm"
-LOCALE=""
 
-DEPENDS="ncurses"
-BUILD_DEPENDS="wget ncurses-dev zlib-dev udev-dev"
+DEPENDS=""
+BUILD_DEPENDS="udev-dev ncursesw-dev libcap-ng-dev readline-dev python-dev"
+SPLIT="util-linux-blkid util-linux-blkid-dev util-linux-blockdev \
+util-linux-cfdisk util-linux-column util-linux-cramfs util-linux-eject \
+util-linux-fdisk util-linux-fdisk-dev util-linux-flock util-linux-getopt \
+util-linux-minix util-linux-mkfs util-linux-mount util-linux-mount-dev \
+util-linux-partx util-linux-setterm util-linux-sfdisk util-linux-smartcols \
+util-linux-smartcols-dev util-linux-uuid util-linux-uuid-dev util-linux-whereis"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -23,17 +27,12 @@
 	case "$ARCH" in
 		arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;;
 	esac
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-		--with-fsprobe=builtin \
-		--enable-partx \
 		$CONFIGURE_ARGS &&
 	make && make install
+
+	cook_compress_manpages
 }
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-}
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux/stuff/fix-findmnt.patch
--- a/util-linux/stuff/fix-findmnt.patch	Thu Jun 30 22:26:22 2016 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-commit a6c90fe597944f68fe49f45f1d8bc0d2e35104d4
-Author: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
-Date:   Sun Jul 4 20:02:57 2010 +0200
-
-    libmount: fix merge_optstr (do not truncate 3 trailing characters)
-    
-    I believe this is the correct fix.
-    
-    Signed-off-by: Petr Uzel <petr.uzel-aRb0bU7PRFPrBKCeMvbIDA@public.gmane.org>
-
-diff --git a/shlibs/mount/src/tab_parse.c b/shlibs/mount/src/tab_parse.c
-index 5dbcfa6..680e1fc 100644
---- a/shlibs/mount/src/tab_parse.c
-+++ b/shlibs/mount/src/tab_parse.c
-@@ -254,7 +254,8 @@ static char *merge_optstr(const char *vfs, const char *fs)
- 	if (!strcmp(vfs, fs))
- 		return strdup(vfs);		/* e.g. "aaa" and "aaa" */
- 
--	sz = strlen(vfs) + strlen(fs) + 2;
-+	/* leave space for leading "r[ow],", "," and trailing zero */
-+	sz = strlen(vfs) + strlen(fs) + 5;
- 	res = malloc(sz);
- 	if (!res)
- 		return NULL;
diff -r 8eea3b2b0ff5 -r 4f122372e6f6 util-linux/stuff/util-linux-ng-cfdisk.patch
--- a/util-linux/stuff/util-linux-ng-cfdisk.patch	Thu Jun 30 22:26:22 2016 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-From 54a0fe298b4d6d948cffbd6fbbbe7dbabc9a6bb1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Mon, 19 Jul 2010 22:52:58 +0200
-Subject: [PATCH] cfdisk: get_string not calculating correct limits
-
-Reported-by: James L. Hammons <jlhamm@acm.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- fdisk/cfdisk.c |   11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
-index 7fa0b19..e7955fe 100644
---- a/fdisk/cfdisk.c
-+++ b/fdisk/cfdisk.c
-@@ -421,6 +421,11 @@ fdexit(int ret) {
-     exit(ret);
- }
- 
-+/*
-+ * Note that @len is size of @str buffer.
-+ *
-+ * Returns number of read bytes (without \0).
-+ */
- static int
- get_string(char *str, int len, char *def) {
-     size_t cells = 0, i = 0;
-@@ -472,7 +477,7 @@ get_string(char *str, int len, char *def) {
- 	    break;
- 	default:
- #if defined(HAVE_LIBNCURSESW) && defined(HAVE_WIDECHAR)
--	    if (i < len && iswprint(c)) {
-+	    if (i + 1 < len && iswprint(c)) {
- 		wchar_t wc = (wchar_t) c;
- 		char s[MB_CUR_MAX + 1];
- 		int  sz = wctomb(s, wc);
-@@ -492,7 +497,7 @@ get_string(char *str, int len, char *def) {
- 			putchar(BELL);
- 	    }
- #else
--	    if (i < len && isprint(c)) {
-+	    if (i + 1 < len && isprint(c)) {
- 	        mvaddch(y, x + cells, c);
- 		if (use_def) {
- 		    clrtoeol();
-@@ -2405,7 +2410,7 @@ change_id(int i) {
- 
-     sprintf(def, "%02X", new_id);
-     mvaddstr(COMMAND_LINE_Y, COMMAND_LINE_X, _("Enter filesystem type: "));
--    if ((len = get_string(id, 2, def)) <= 0 && len != GS_DEFAULT)
-+    if ((len = get_string(id, 3, def)) <= 0 && len != GS_DEFAULT)
- 	return;
- 
-     if (len != GS_DEFAULT) {
--- 
-1.7.2.1
-